357 Commits

Author	SHA1	Message	Date
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
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
Taylor Griffin	ccef46a5cf	add more permitted parameters to member update	2015-01-11 14:32:19 +11:00
Taylor Griffin	c803da3dfa	fix planted_at on planting create bug	2015-01-11 14:00:51 +11:00
Taylor Griffin	8a05a959c3	remove depricated method	2015-01-10 15:46:36 +11:00
Taylor Griffin	e5d407b1ce	replace depricated method	2015-01-10 15:35:54 +11:00
Taylor Griffin	c6cc8ee6bb	configure devise account update for strong parameters	2014-12-31 18:32:37 +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	a35a573b2b	update follow member code to be rails 4 compatible	2014-12-14 14:51:18 +11:00
Yoong Kang Lim	2fc6bfb77f	Merge remote-tracking branch 'upstream/dev' into cancanredirect	2014-12-09 21:32:01 +11:00
Yoong Kang Lim	837121265a	Reversed order of authorization and authentication. Also added tests	2014-12-09 21:27:16 +11:00
Skud	7227c1f330	Merge pull request #455 from yoongkang/cancanredirect ... Redirect to sign-in page for any action that requires authentication	2014-12-09 20:17:58 +11:00
Yoong Kang Lim	81d1189203	Added a before_filter for any action that requires authentication. Will redirect to login page if not logged in	2014-11-24 22:12:42 +11:00
Yoong Kang Lim	5de6759917	Moved number of follows/followers under activity and added pagination.	2014-11-21 00:29:45 +11:00
Taylor Griffin	acbd3f9a9e	implement strong parameters instead of protected attributes	2014-11-18 20:08:54 +11:00
Taylor Griffin	0ffe9adc86	tests are green	2014-11-16 21:40:43 +11:00
Taylor Griffin	56b4f8a221	mimick old FriendlyId behavior when calling find on a model - therefore, Model.find not Model.friendly.find (this probably needs review)	2014-11-16 20:21:34 +11:00
Yoong Kang Lim	77f40a3dc2	Fixed comment + code style	2014-11-13 02:10:54 +11:00
Yoong Kang Lim	b5e1b6bc22	Delete unused views, add feature tests	2014-11-13 00:46:34 +11:00
Yoong Kang Lim	cacc002a01	Added follow/unfollow buttons	2014-11-12 01:47:26 +11:00
Yoong Kang Lim	a9fdab5d7c	Basic follower relationship	2014-11-12 00:23:01 +11:00
pozorvlak	4a8297360c	Merge pull request #434 from Skud/memberprofile ... Member profile	2014-10-19 17:32:27 +01:00
Skud	a79a8dc927	Merge branch 'dev' of https://github.com/Growstuff/growstuff into memberprofile ... Conflicts: app/views/scientific_names/index.html.haml	2014-10-19 16:54:10 +01:00
Miles Gould	6de2112c4d	Display note on successful sciname deletion.	2014-10-19 16:36:10 +01:00
Skud	7595d75d20	Merge pull request #432 from pozorvlak/alternate_crop_names ... Model and CRUD for alternate crop names	2014-10-19 16:34:44 +01:00
Skud	dc1afb8913	Added seeds_by_crop_path routes and stuff	2014-10-19 14:25:47 +01:00
Skud	41566d39f3	Added map to member profile page	2014-10-19 13:50:43 +01:00
Miles Gould	29d53a8f8b	Test for notices in altname CRUD features.	2014-10-19 12:02:31 +01:00
Miles Gould	110ae99d83	Fix and test altname index page.	2014-10-18 17:55:56 +01:00
Miles Gould	96d2fa1cb6	Put alternate names controller in standard order.	2014-10-18 17:41:52 +01:00
Miles Gould	c7c85aaa66	Creation and deletion of alternate names	2014-10-18 17:03:54 +01:00
Miles Gould	eacfadae20	Make editing alternate names actually do something.	2014-10-18 16:51:43 +01:00
Miles Gould	37eb2a0e34	Show alternate names on their own page.	2014-10-18 16:49:27 +01:00
Miles Gould	10f6214c6c	Views for adding/editing alternate names.	2014-10-18 16:34:38 +01:00
Miles Gould	7e4b51d1cb	Add "Edit" link for alternate names on crops page.	2014-10-18 15:18:23 +01:00
Taylor Griffin	a4e7f93421	Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n	2014-10-16 06:39:10 +11:00
Taylor Griffin	6a7c935d43	try setting locale from query parameter first	2014-10-16 06:37:02 +11:00
Shiho Takagi	6e02f40e0a	merging from dev	2014-10-05 13:47:12 +11:00
Shiho Takagi	14d039ee01	Added crops-posts association as well as updated GUI for crop show	2014-10-05 13:32:08 +11:00
Mackenzie Morgan	48ad561b76	convert tabs to spaces	2014-10-01 23:58:54 -04:00
Mackenzie Morgan	fcda8742d8	go back to the nested error handling in the photos controller and add a migration for indexing harvests_photos	2014-10-01 22:52:52 -04:00