476 Commits

Author	SHA1	Message	Date
Shiho Takagi	35f8c126b6	using scope for searching only approved records	2015-02-18 15:38:28 +11:00
Shiho Takagi	506e3e550c	update sql search to excludes unapproved crops	2015-02-18 11:26:14 +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
Shiho Takagi	023333b15f	exclude unapproved crops from search	2015-02-17 23:52:02 +11:00
Skud	d0f856d389	Fixed various problems with search matching	2015-02-17 19:20:25 +11:00
Shiho Takagi	3ed7edbfbf	merge	2015-02-12 21:09:42 +11:00
Shiho Takagi	e09f050088	updated the crop search query for more accurate search	2015-02-12 16:42:36 +11:00
Taylor Griffin	623dbdd418	fix search deleting crops	2015-02-10 19:58:43 +11:00
Taylor Griffin	b81e034254	tweak permissions for alternate names just like sci names	2015-02-10 18:38:32 +11:00
Taylor Griffin	cbb4f9d7ac	add rejection notes	2015-02-09 22:17:32 +11:00
Taylor Griffin	0dbc2e1964	prevent users from seeing sci names of crops unless approved	2015-02-09 21:52:52 +11:00
Taylor Griffin	319fc12ebb	add crop must be approved validation	2015-02-09 21:13:25 +11:00
Savant Krishna	49a5a26f17	Functionality to sort members by recently joined : Issue #550	2015-02-09 17:47:25 +11:00
Skud	f7a2ec2054	Merge pull request #676 from pozorvlak/seed_properties ... New seed properties: days until maturity, organic, GMO, heirloom	2015-02-09 14:07:20 +11:00
Taylor Griffin	076a6cc1df	catch up with upstream dev	2015-02-04 21:41:42 +11:00
Taylor Griffin	b842bff9cb	wip: fix misc tests	2015-02-04 18:36:14 +11:00
Taylor Griffin	80a28085f1	make pending crops unviewable to regular members	2015-02-04 14:44:12 +11:00
Taylor Griffin	0dd8cbccf0	refactor default scope on crop	2015-02-04 14:21:35 +11:00
Taylor Griffin	abece6473b	make rejected and pending crops viewable on wrangle crops page	2015-02-04 14:18:10 +11:00
Taylor Griffin	ff1b941690	validate that a crop hasn't already been rejected or approved	2015-02-04 06:56:51 +11:00
Taylor Griffin	0993917dc6	define approval status options in model	2015-02-03 13:28:44 +11:00
Taylor Griffin	d6cb20e2c4	make reasons for rejection a select input	2015-02-03 13:27:41 +11:00
Taylor Griffin	47dc94f820	reason_for_rejection is required if marked as rejected	2015-02-03 13:18:59 +11:00
Miles Gould	c1870d46a2	Merge branch 'dev' into seed_properties ... Conflicts: db/schema.rb	2015-02-02 17:45:49 +00:00
Shiho Takagi	656b0e44d8	fixing issue with elasticsearch option false in dev	2015-02-02 18:40:24 +11:00
Skud	af39df5e0c	Fixed test failure if elasticsearch isn't present in test env	2015-02-02 18:20:16 +11:00
Mackenzie Morgan	7ca89908cd	merge from upstream	2015-02-01 22:00:52 -05:00
Mackenzie Morgan	2c94f61843	use %0.3f instead of %0.2f so we get to gram-granularity, and don't duplicate code	2015-02-01 21:59:33 -05:00
Taylor Griffin	2f67ffd2f8	fix regressions	2015-02-02 00:01:49 +11:00
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