396 Commits

Author	SHA1	Message	Date
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
Skud	d0f856d389	Fixed various problems with search matching	2015-02-17 19:20:25 +11:00
Shiho Takagi	70cdab96c4	fixing issue with 1)paginating crop search and 2)crop name autocomplete	2015-02-12 23:00:04 +11:00
Skud	09a78d4661	Merge pull request #701 from Skud/search_tweaks ... Search tweaks	2015-02-10 20:57:32 +11:00
Skud	66fcad69fa	Paginate search results, make sexy subtitles	2015-02-10 20:48:36 +11:00
Skud	78c4fc36b1	Paginate search results ... ... and include total number in subtitle	2015-02-10 19:26:07 +11:00
Skud	0fc4c3cb4d	Made search result page show a suitable title	2015-02-10 19:07:50 +11:00
Taylor Griffin	cbb4f9d7ac	add rejection notes	2015-02-09 22:17:32 +11:00
Taylor Griffin	2db7bf638b	improve copy for new request email	2015-02-09 20:41:28 +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	80a28085f1	make pending crops unviewable to regular members	2015-02-04 14:44:12 +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
Miles Gould	c1870d46a2	Merge branch 'dev' into seed_properties ... Conflicts: db/schema.rb	2015-02-02 17:45:49 +00:00
Mackenzie Morgan	7ca89908cd	merge from upstream	2015-02-01 22:00:52 -05:00
Taylor Griffin	40d13fadb3	write feature spec for requesting a crop	2015-02-01 23:29:31 +11:00
Taylor Griffin	4211ebec76	add request notes to crop request	2015-02-01 17:56:51 +11:00
Taylor Griffin	e86200b942	requester receives a message when crop request is rejected	2015-02-01 17:32:49 +11:00
Taylor Griffin	776b5450f9	requester receives email when crop request is approved	2015-02-01 17:20:48 +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
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
Mackenzie Morgan	fb271633d9	Merge branch 'dev' of github.com:growstuff/growstuff into standard_weights	2015-01-30 22:48:50 -05: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
Mackenzie Morgan	2d55d88db8	fixing harvest csv so it doesn't error	2015-01-29 00:49:23 -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	0bdab0d9fc	basics of harvest standardized weights	2015-01-28 23:00:16 -05:00
Mackenzie Morgan	c38dc4661d	basics of garden photos	2015-01-27 00:54:05 -05:00
Miles Gould	233f9dfd88	Split "days until maturity" into min and max fields.	2015-01-26 19:20:33 +00:00
Miles Gould	b56237115e	Add form and controller for new seed properties	2015-01-24 12:01:11 +00:00
Miles Gould	79a7958519	Don't try to load a Follow before it's been created.	2015-01-23 11:39:20 +00:00
Taylor Griffin	253b5a3f85	define permitted param for nested attribute	2015-01-23 13:20:37 +11:00
Taylor Griffin	0e0c309c15	Revert "Sci names permitted params"	2015-01-23 11:42:42 +11:00
Taylor Griffin	3c360ab1b8	specify permitted params for nested attributes	2015-01-23 09:22:13 +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	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	ce265e281a	cleaning up the code	2015-01-17 00:37:37 +11:00
Shiho Takagi	06c7703628	auto-suggest to use existing search	2015-01-17 00:31:01 +11:00
Shiho Takagi	556ba33172	updated crop search view	2015-01-17 00:09:39 +11:00
Taylor Griffin	36ac0b75e7	decoy commit to test if travis / phantomjs error was spurious	2015-01-15 22:23:27 +11:00
Shiho Takagi	9a3c4e69e8	Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search ... Conflicts: app/models/crop.rb	2015-01-15 21:32:46 +11:00
Shiho Takagi	10e6e7c3cb	Integrate Elasticsearch and implement crop search against scientific_name	2015-01-15 19:05:02 +11:00
Miles Gould	401f3e176e	Remove the authentications index page	2015-01-11 11:57:13 +00:00
Taylor Griffin	86cea2ad9f	add current_password to permitted params	2015-01-11 14:55:12 +11:00