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
1297 Commits
Author SHA1 Message Date
Taylor Griffin 3791f4aa6f validate wikipedia url only if crop is approved 2015-02-01 22:43:48 +11:00
Taylor Griffin 4211ebec76 add request notes to crop request 2015-02-01 17:56:51 +11:00
Taylor Griffin c80b42d9bc change from approved boolean to approval_status string 2015-02-01 16:52:31 +11:00
Miles Gould 089a3d5c24 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-01 00:03:10 +00:00
Mackenzie Morgan de5b16e384 back to kg for si weight, also now adding si_weight to the csv correctly 2015-01-31 18:35:29 -05:00
Taylor Griffin a8c203aea0 send emails to all crop wranglers when a new crop is requested 2015-02-01 09:32:50 +11:00
Shiho Takagi 2aa30475e9 merge 2015-02-01 00:14:52 +11:00
Shiho Takagi 9a5e15b292 index when sci name or alt name is updated 2015-01-31 23:59:46 +11:00
Mackenzie Morgan bb9695b272 add check for nil to set_si_weights and the corresponding deploy script and update test 2015-01-31 00:45:31 -05:00
Mackenzie Morgan d436fd86f8 use ruby-units to handle conversion. note: the deploy task isn't working and i don't know why 2015-01-31 00:22:35 -05:00
Taylor Griffin e40fad76fd exclude pending approval crops from default crops scope 2015-01-31 10:39:17 +11:00
Taylor Griffin 41db12d8d7 pending approval crops appear on crops wrangle page 2015-01-31 10:36:02 +11:00
Taylor Griffin 28d29291a7 any member can create a crop at least provisionally 2015-01-31 10:03:44 +11:00
Taylor Griffin 22e0379769 give crops a requester 2015-01-31 09:54:59 +11:00
Mackenzie Morgan 2567e7cd74 adding tests (not passing, need to figure out saving mid-test), fixing before_save, adding CSV column, and adding task to set the si_weight throughout the db 2015-01-29 00:27:53 -05:00
Mackenzie Morgan e2bac619b7 Merge branch 'dev' of github.com:growstuff/growstuff into standard_weights 2015-01-28 23:10:10 -05:00
Mackenzie Morgan 5a474d523c merge from upstream 2015-01-27 22:35:19 -05:00
Mackenzie Morgan c38dc4661d basics of garden photos 2015-01-27 00:54:05 -05:00
Mackenzie Morgan 675ac5a03f add before_save for harvest weight and index for harvest photos 2015-01-26 22:26:21 -05:00
Miles Gould 233f9dfd88 Split "days until maturity" into min and max fields. 2015-01-26 19:20:33 +00:00
Shiho Takagi b414598b07 adding comments for search options 2015-01-26 22:50:47 +11:00
Miles Gould 038192095d Validate all numeric fields as being >= 0. 2015-01-24 11:54:17 +00:00
Miles Gould 9a18b4b62b Add new properties to seeds 
Added days_until_maturity, gmo, organic and heirloom properties; added
validation and tests for the last three.
 2015-01-24 11:31:35 +00:00
Shiho Takagi 018b2b4711 elasticsearch to be turned off as a default in dev and test 2015-01-21 16:47:22 +11:00
Shiho Takagi f910fdfa73 use elasticsearch for auto-suggest 2015-01-20 13:20:13 +11:00
Shiho Takagi 99eb33ccbb clearning up the code 2015-01-18 12:23:54 +11:00
Shiho Takagi ad7cfdabd0 cleaning up the code 2015-01-17 19:11:07 +11:00
Shiho Takagi b4cd151a03 merge from upstream 2015-01-17 14:09:45 +11:00
Skud 17e94e01d0 Tidied up authorization around follows 2015-01-17 00:57:05 +11:00
Shiho Takagi 06c7703628 auto-suggest to use existing search 2015-01-17 00:31:01 +11:00
Shiho Takagi 65814f1ef6 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 23:10:08 +11:00
Shiho Takagi 323f635b7b Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 22:03:01 +11:00
Shiho Takagi 85c3e74cdd Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 10:29:39 +11:00
Shiho Takagi 19dcf6f3d5 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-15 21:44:04 +11:00
Shiho Takagi 59cae7a8ce Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	app/models/crop.rb
 2015-01-15 19:33:27 +11:00
Shiho Takagi ba3a1f6298 Integrate Elasticsearch and implement crop search against scientific_name 2015-01-15 19:28:28 +11:00
Shiho Takagi 10e6e7c3cb Integrate Elasticsearch and implement crop search against scientific_name 2015-01-15 19:05:02 +11:00
Taylor Griffin 007f7112a7 replaced caching using observers with a key-based (and simplified) caching system 2014-12-19 21:17:43 +11:00
Taylor Griffin 849bdac81b include module that holds expire_fragment method 2014-12-15 21:02:44 +11:00
Taylor Griffin d92d22d99c include ActionController::Caching in Sweeper class 2014-12-14 21:03:10 +11:00
Taylor Griffin a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +11:00
pozorvlak 751a66b49b Merge pull request #457 from Skud/multiple_scinames 
Multiple scientific and alternate names
 2014-12-01 10:33:46 +00:00
Skud 593a20c0c5 Load alternate names from CSV 2014-11-30 16:06:43 +11:00
Skud 844791ead9 Allow multiple comma-separated scientific names 2014-11-30 15:48:58 +11:00
Yoong Kang Lim 2036a0f2e9 Used environment variable for site name instead 2014-11-30 15:18:13 +11:00
Yoong Kang Lim 27ad791f67 Merge remote-tracking branch 'upstream/dev' into followerdev 2014-11-30 15:16:48 +11:00
Skud 4e19da56a0 Rearrange fields in crop uploads (sci names last) 2014-11-30 14:51:33 +11:00
Yoong Kang Lim 2ca42bbae3 Slight modification to the notification wording. 2014-11-21 01:05:23 +11:00
Yoong Kang Lim aeb7192f48 Break up tests into different scenarios. Defined cancan ability for follows and updated member profile view 2014-11-20 23:46:15 +11:00
Yoong Kang Lim 996043d8fb Renamed get_follow_id to get_follow as it does not return id. Also added unit tests for the new methods in the member model. 2014-11-20 01:10:28 +11:00