Commit Graph
13034 Commits
Author SHA1 Message Date
AELOGICA 87f1c6c26d Added an alert for empty string search. 2015-06-23 14:33:13 +08:00
gabrielsandoval 0e2a5fd205 Added search form on the places index page. 2015-06-21 15:24:07 +08:00
Miles Gould 5bb04dc1a4 Merge branch 'pr/745' into dev 2015-06-16 19:54:33 +01:00
Mackenzie 7cedd98b71 Merge pull request #746 from achalc/fix-fb-thumbnail
added growstuff-apple-touch-icon-precomposed.png to meta partial
2015-06-13 00:22:45 -04:00
Mackenzie 2209d65aa6 Merge pull request #748 from wingyu/dev
Issue #713:  Added flash message when photos deleted
2015-06-12 23:50:11 -04:00
Mackenzie ba906868d8 Merge pull request #747 from mauricio-gonzalez/add_autofocus_post_field
[#478] autofocus subject input
2015-06-12 23:38:41 -04:00
Andrey 4cb3444dcd Adding myself to contributors 2015-06-09 17:47:21 +10:00
Vincent Wong 60df62f3fa added flash message when deleting messages 2015-06-06 14:36:03 +10:00
Mauricio e3a620a109 [#478] autofocus subject input 2015-06-02 23:21:18 -06:00
Achal Channarasappa 3476d58642 added growstuff-apple-touch-icon-precomposed.png to meta partial 2015-06-02 20:52:03 -05:00
pozorvlak a7feac3740 Merge pull request #742 from maco/dev
Moving myself to the committers section
2015-06-01 15:55:03 +01:00
Andrey ad5730a81c Removed excessive example from notification controller specs 2015-05-27 12:08:30 +10:00
Andrey e35ebab380 Reply to notification action 2015-05-27 11:56:24 +10:00
Shiho Takagi 3b42806b77 Modified wordings 2015-05-22 13:46:19 +10:00
Mackenzie Morgan c5fbda0223 cleaning up inadvertent schema change 2015-05-20 17:10:22 -04:00
Mackenzie Morgan 38dbdc8307 Moving myself (maco) to the committer section, since I was given commit bit a couple months back 2015-05-20 17:08:21 -04:00
Skud f830ed1cf2 Merge pull request #706 from tygriffin/deprecated-test-warning
add deprecation notice to all controller and view specs
2015-05-20 10:17:15 +10:00
Skud 66402e5471 Merge pull request #731 from oshiho3/578-database-seeding-improvement
#578 More extensive database seeding - bulk creating members, gardens and plantings
2015-05-20 10:10:48 +10:00
Skud 8410b6db1e Merge pull request #700 from sksavant/photo_linkback
Linkbacks in photo view page to harvest and gardens
2015-05-20 10:08:33 +10:00
Skud aef4800ad3 Merge pull request #737 from soborok/issue-610-solved
resolved issue-610 to display only active planting
2015-05-20 10:08:11 +10:00
Skud a3b9c50fea Merge pull request #723 from cesy/moretests
More tests
2015-05-20 10:06:18 +10:00
Skud add275e772 Merge pull request #710 from cesy/secrets
Switching to new secrets format
2015-05-20 10:05:46 +10:00
Skud 9a2818baa9 Merge pull request #729 from oshiho3/621-crop-varieties-sidebar
#621 Crop varieties sidebar
2015-05-20 10:05:04 +10:00
Skud c47a1bc361 Merge pull request #740 from yez/feature/robots-dissalow-on-staging
Feature/robots dissalow on staging
2015-05-20 09:57:28 +10:00
Skud e04f78d42d Merge pull request #741 from pozorvlak/upgrade_poltergeist
Upgrade poltergeist to v1.6.
2015-05-20 09:56:24 +10:00
Skud d6b83454fe Merge pull request #732 from Growstuff/dev
Production push (release 8): request crops, search sci/alt names, garden photos, and more
release8
2015-05-20 09:55:34 +10:00
Miles Gould 8ce7c25374 Upgrade poltergeist to v1.6.
Poltergeist v1.5.1 is nearly a year old, and relies on PhantomJS 1.8,
which is 2.5 years old and increasingly hard to find in OS package
managers.
2015-05-06 12:15:22 +01:00
Jake Yesbeck c1ab161b89 Added self to Contributors.md per guidelines 2015-05-05 09:18:32 -07:00
Jake Yesbeck 0d55b54371 Use a constant for the default robots.txt filename 2015-05-05 09:05:00 -07:00
Jake Yesbeck 46ac06698a Additional test for nonsense subdomain 2015-05-05 09:02:42 -07:00
Jake Yesbeck 81ce6ed8a3 Make sure file exists before attempting to render it 2015-05-05 08:58:33 -07:00
Jake Yesbeck 0f8d1e7db1 Change the render to render the file directly
Also assert that the response is the actual file contents
instead of mocking the method call
2015-05-04 23:37:40 -07:00
Jake Yesbeck 507e5a0ebc Robots controller and custom robots.txt files
New route to /robots.txt and some specific logic to switch
on if the subdomain is staging or not.

Staging will not allow any crawlers at all, production does not
have any current limitations
2015-05-04 23:11:41 -07:00
soborok 76608a981c resolved issue-610 to display only active planting 2015-04-07 13:10:33 -05:00
Gabrielle DeWitt 81d2f9829e Updated Contributors 2015-04-04 12:01:51 -07:00
Gabrielle DeWitt b7d7f6896e Updated Helper Spec to Match Coding Standards
Replaced before and should with let and
expect, respectively.

Issue #633
2015-04-04 12:01:43 -07:00
Gabrielle DeWitt 88e8e3a59e Added Helper for See Who's Planted Link Text
Quantity and planted_from are not required
to add a planting. This change handles
the cases where one or both attributes are
missing.

Fixes #633
2015-04-04 11:51:59 -07:00
Shiho Takagi d95bd0e063 Skip all user confirmation 2015-04-04 23:22:21 +11:00
Shiho Takagi 0c80a00f31 Pupulate sunniness and planted_from field on planting. 2015-04-04 22:56:35 +11:00
Shiho Takagi 1fe9a7d5e0 Merge branch 'dev' of https://github.com/Growstuff/growstuff into 578-database-seeding-improvement 2015-04-04 09:12:20 +11:00
Korab Hoxha bfb4053bb4 Change to "img-rounded" 2015-03-25 16:05:30 +01:00
Korab Hoxha 2aad8a0ed0 Change to "img-rounded" 2015-03-25 16:05:07 +01:00
Korab Hoxha 7c1cce40b2 Update leaflet_overrides.css.less 2015-03-25 15:50:43 +01:00
Skud d7ef598654 Merge pull request #726 from maco/approved_crops
Crop accept/reject notification improvements
2015-03-18 12:42:06 +11:00
Mackenzie Morgan bd0da36d63 reverse the rejection_explanation logic to not use != 2015-03-17 21:23:54 -04:00
Mackenzie Morgan 6dedf1b030 add test for crop.rejection_explanation function 2015-03-16 23:07:17 -04:00
Shiho Takagi c253c86787 minor improvements 2015-03-17 11:40:32 +11:00
Shiho Takagi 59d823ff8b bulk creating members, gardens and plantings 2015-03-17 02:07:43 +11:00
Korab Hoxha c8903ba25f "img-circle" for users 2015-03-15 02:43:43 +01:00
Korab Hoxha 3a5cf37dc0 "img-circle" class for members gravatar 2015-03-13 12:58:06 +01:00