mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-04 04:04:17 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 98 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shiho Takagi 375f647e2d Merge branch 'dev' of https://github.com/Growstuff/growstuff into 575-one-click-email-unsubscribe 2015-02-25 16:50:30 +11:00
Mackenzie Morgan 1b62c5cb97 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-02-25 00:05:56 -05:00
Shiho Takagi 0f52ea5aad one click unsubscription 2015-02-25 10:26:04 +11:00
Cesy Avon 2740b5e47b Correcting the environment variable name for secret token so Heroku is not impacted 2015-02-23 13:37:43 +00:00
Shiho Takagi 3894127f5c Merge branch 'dev' of https://github.com/Growstuff/growstuff into 629-thumbnails-of-crops-on-post 2015-02-23 21:44:01 +11:00
Shiho Takagi 17ccea4b28 moving photo on posts/show view 2015-02-23 21:43:03 +11:00
Mackenzie 7bca5c8845 Merge pull request #715 from Skud/requestcrops 
Improvements to crop requests
 2015-02-20 22:11:28 -05:00
Mackenzie 017df0484c Merge pull request #716 from oshiho3/PT80956846_crop_search 
exclude unapproved crops from search
 2015-02-20 22:04:53 -05:00
Shiho Takagi d338bab82b travis to test both with and without elasticsearch 2015-02-18 16:18:24 +11:00
Shiho Takagi 35f8c126b6 using scope for searching only approved records 2015-02-18 15:38:28 +11:00
Shiho Takagi eafe90e295 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-02-18 11:37:30 +11:00
Shiho Takagi 7b911034b8 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-02-18 11:37:11 +11:00
Shiho Takagi 798b89db11 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-02-18 11:36:21 +11:00
Shiho Takagi 506e3e550c update sql search to excludes unapproved crops 2015-02-18 11:26:14 +11:00
Shiho Takagi 8ab3167a28 update sql search to excludes unapproved crops 2015-02-18 11:15:15 +11:00
Shiho Takagi 436e7e3c59 Merge branch 'dev' of https://github.com/Growstuff/growstuff into PT80956846_crop_search 2015-02-18 10:33:48 +11:00
Skud 9f1091a1c8 Merge pull request #717 from maco/cms 
change footer section names to generic footer1, footer2, footer3
 2015-02-18 08:20:58 +11:00
Mackenzie Morgan 3b1e855da3 change footer section names to generic footer1, footer2, footer3 because we're going to CMS mode 2015-02-17 13:51:06 -05:00
Savant Krishna da95581099 :using size instead of count 2015-02-17 21:35:57 +05:30
Mackenzie d7f8bff17a Merge pull request #714 from Skud/search_tweaks 
Fixed various problems with searches
 2015-02-17 09:15:25 -05:00
Shiho Takagi a7caa2fbaa Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	spec/models/crop_spec.rb
 2015-02-18 00:49:21 +11:00
Shiho Takagi b215ef03c7 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	spec/models/crop_spec.rb
 2015-02-18 00:47:46 +11:00
Shiho Takagi 3cbbbc79fb Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	spec/models/crop_spec.rb
 2015-02-18 00:39:56 +11:00
Shiho Takagi eb5e9e926b fixing Travis CI error 2015-02-18 00:37:58 +11:00
Shiho Takagi ef2d1eb683 fixing Travis CI error 2015-02-18 00:17:53 +11:00