mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-04 14:20:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 63 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Korab Hoxha
8631b1fc99 Add background to thumbnail 2015-03-13 11:33:20 +01:00
Shiho Takagi
0c6b6e0e0e added show all/less toggle button 2015-03-12 13:49:37 +11:00
Shiho Takagi
9f33f497bc improved coding 2015-03-11 13:06:23 +11:00
Mackenzie Morgan
920ca2948b add helper function for crop rejection explanation and use it on both notifier and status message 2015-03-09 00:50:34 -04:00
Shiho Takagi
ad6c1ba2dc tiding up the code 2015-03-08 15:10:30 +11:00
Shiho Takagi
674d78721d Merge branch '575-one-click-email-unsubscribe' of https://github.com/oshiho3/growstuff into 575-one-click-email-unsubscribe 2015-03-08 14:29:56 +11:00
Shiho Takagi
3a1bd78252 Merge branch '575-one-click-email-unsubscribe' of https://github.com/oshiho3/growstuff into 575-one-click-email-unsubscribe 2015-03-08 14:29:28 +11:00
Manmeet Singh
b9b2f4a57e Placing cursor in textarea on page load of write post and write comment views 2015-03-07 16:36:15 +05:30
Marlena Compton
71c0bff3e0 add comments explaining each file per pull request 2015-03-06 07:03:06 -08:00
Shiho Takagi
e4e9b63e4d Merge branch '575-one-click-email-unsubscribe' of https://github.com/oshiho3/growstuff into 575-one-click-email-unsubscribe 2015-03-06 11:13:49 +11:00
Shiho Takagi
40adc379ae Merge branch 'dev' of https://github.com/Growstuff/growstuff into 575-one-click-email-unsubscribe 2015-03-06 10:51:09 +11:00
Mackenzie Morgan
9e53105f43 make language for crop accept/reject friendlier and if reason for rejection is 'other', give the rejection notes 2015-03-04 22:02:35 -05:00
Mackenzie
6505254e6c Merge pull request #724 from tygriffin/pending-rejected-sci-alt-names 
Pending rejected sci alt names
 2015-03-04 20:17:33 -05:00
Mackenzie Morgan
2d73dd2869 remove pending/rejected crops from browse and test that, change links on wrangling page to go directly to crop edit and update tests for that 2015-03-04 13:13:35 +11:00
Shiho Takagi
2abe6d7d12 show thumbnail even when there is no photo 2015-03-04 12:53:08 +11:00
Marlena Compton
c7a71381b7 write test for tooltips 2015-03-03 06:49:16 -08:00
Marlena Compton
5a1fd19abc move bar color into the data 2015-03-03 05:49:13 -08:00
Marlena Compton
a48a6da494 refactored graph scale into width scale and height scale 2015-02-28 15:50:27 -08:00
Taylor Griffin
ead9a250af test that status message appears when rejected / pending 2015-02-27 07:56:30 +11:00
Taylor Griffin
3a9ec8cf6d include crop approval status in sci and alt names 2015-02-27 07:39:07 +11:00
Cesy Avon
8990e803a0 Increasing coverage of plantings controller 2015-02-26 17:28:26 +00:00
Marlena Compton
b0a803a7a5 add h2 for sunniness chart and crop map 2015-02-26 06:41:24 -08:00
Marlena Compton
6e4bb58dfd change color when hovering over a bar 2015-02-26 06:26:38 -08:00
Marlena Compton
66b0f139a9 add tooltip to show data values 2015-02-26 06:07:23 -08:00
pozorvlak
c76e9ccbf6 Merge pull request #722 from maco/approved_crops 
remove pending/rejected crops from browse and test that, change links on...
 2015-02-25 20:18:26 +00:00