465 Commits

Author	SHA1	Message	Date
Brenda Wallace	c6413afa67	allow registration and signin/out on the API	2016-09-11 14:23:50 +12:00
Cesy	fe137a11bb	Merge pull request #1031 from CloCkWeRX/queue_mail ... Queue mail in sidekiq	2016-08-24 10:38:13 +01:00
Daniel O'Connor	b91f0e7f63	Whitelist providers to avoid session data being tampered with	2016-08-22 18:59:28 +09:30
Daniel O'Connor	87352b04f1	Refactor to a method to DRY, even if its not 100% the best spot for it to live long term	2016-08-22 18:52:12 +09:30
Daniel O'Connor	20b87e596a	Modern syntax	2016-08-22 18:25:57 +09:30
Daniel O'Connor	4b7cffad04	DEPRECATION WARNING: [Devise] bypass option is deprecated and it will be removed in future version of Devise.	2016-08-22 16:42:08 +09:30
Daniel O'Connor	c7be0f3b0e	Fix redirects and sign the user in if they weren't yet created	2016-08-22 16:35:58 +09:30
Daniel O'Connor	5d70d822eb	#951 Swap to deliver_later implementation	2016-08-16 10:55:40 +09:30
Daniel O'Connor	7f6a1a424d	Merge remote-tracking branch 'upstream/dev' into add_facebook_signup	2016-08-15 23:13:55 +09:30
Daniel O'Connor	6b059cb4f4	Clean up a bit as per #1013 with TODO comments	2016-07-08 17:06:05 +09:30
Daniel O'Connor	c803ed4ee6	Merge pull request #976 from pozorvlak/remove_default_shows ... Remove "show" methods that just do the default	2016-07-08 16:56:25 +09:30
Daniel O'Connor	43e7d6f7c2	Merge remote-tracking branch 'upstream/dev' into add_facebook_signup	2016-07-05 03:09:36 +09:30
Daniel O'Connor	c3d9885525	Merge pull request #987 from CloCkWeRX/upgradazzle_rails ... Upgrade to rails 4.2.0+ (round 2)	2016-06-29 14:47:05 +09:30
Mackenzie	b08a448fdc	hotfix commit: letsencrypt try #2	2016-06-20 13:40:49 -04:00
Mackenzie Morgan	039978357b	letsencrypt verification for staging	2016-06-20 11:48:19 -04:00
pozorvlak	a66a040207	Revert "Handled Issue #950 (Branded Error Pages)"	2016-06-16 12:58:22 +01:00
Prashanth	483143f2fe	Merge branch 'growstuff-dev' into dev ... Conflicts: CONTRIBUTORS.md	2016-06-14 17:09:06 +05:30
Prashanth	b9f40151d8	Handled Issue #950 (Branded Error Pages) ... Moved error related views from public to errors (asset pipeline can be used). Header and footer were included along with the error message.	2016-06-10 18:35:48 +05:30
Daniel O'Connor	7fe75ee52a	Fix DEPRECATION WARNING: #deliver is deprecated.	2016-06-10 15:45:01 +09:30
pozorvlak	f3dc2ff7e5	Replace deprecated Devise for method with permit ... This should eliminate the screens-ful of deprecation warnings when running the test suite.	2016-06-08 15:00:05 +00:00
pozorvlak	e6209a5906	Remove "show" methods that just do the default ... We can just fall back to the default implementation for these.	2016-06-08 15:58:45 +01:00
pozorvlak	a8961c3466	Revert "Show concern"	2016-06-08 12:58:32 +01:00
Mackenzie Morgan	ed468e79fc	Merge branch 'dev' of gitmaco:Growstuff/growstuff into show_concern	2016-06-07 09:57:47 -04:00
Eric Tillberg	3ac42deae5	crop approval flash alert for wranglers upon sign in	2016-05-29 16:13:21 -04:00
Mackenzie Morgan	8c2aa4844f	use CW's case statement idea	2016-05-25 15:15:09 -04:00
Mackenzie Morgan	8648db5518	create SimpleShow concern for models where show's json call is simple	2016-05-25 13:37:01 -04:00
Mackenzie Morgan	b601fe40b3	refactor photo controller create for readability	2016-05-24 16:59:52 -04:00
Daniel O'Connor	083035c924	Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup	2016-05-23 16:58:22 +09:30
Cesy	f5b20c2f32	About is empty, policy won't work without the routes	2016-05-22 16:01:40 +00:00
twconquest	397bfd8bca	Start removing static page references.	2016-05-22 16:01:40 +00:00
Kevin Rio	5a31619b46	If i reply to a notification directly, it's not marked as read. #507	2016-05-19 15:53:11 -04:00
Daniel O'Connor	4b4e0cf69a	$ rubocop --only HashSyntax --auto-correct ... 483 files inspected, 2018 offenses detected, 2018 offenses corrected	2016-05-19 15:53:11 -04:00
Daniel O'Connor	7256c28038	Refactor to a separate class, containing domain logic	2015-09-15 12:13:47 +09:30
Savant Krishna	9e7a80cb86	Fix bug #827 : Error in generating csv file for plantings with owner filter	2015-09-07 04:01:20 -04:00
Daniel O'Connor	8a739b31a1	Minor style	2015-08-27 12:18:09 +09:30
Daniel O'Connor	afec210219	#645 #556 Add facebook links	2015-08-27 12:02:48 +09:30
Daniel O'Connor	dafee90b24	#645 #556 Add facebook auth management	2015-08-27 11:56:37 +09:30
Daniel O'Connor	20b89f0d2f	#556 Default to the oauth provided image on account creation	2015-08-27 11:27:15 +09:30
Daniel O'Connor	9564866f6d	#645 Avoid collisions by using a 20 character random string as a fallback	2015-08-24 17:33:28 +09:30
Daniel O'Connor	994296640b	#645 Implement all of finish signup, fix an edge case of an authentication without a member, fix error messages on failed oauth.	2015-08-24 16:20:39 +09:30
Daniel O'Connor	9a68c7e1c3	#645 Add a 'finish signup' flow	2015-08-24 11:41:36 +09:30
Daniel O'Connor	ec597d4e6e	#645 Fix minor logic error	2015-08-24 11:23:41 +09:30
Daniel O'Connor	86e9cd0ec6	#645 Improve error handling and login_name generation. Annoyingly still a change of collisions.	2015-08-21 13:43:58 +09:30
Daniel O'Connor	34b4d30014	#645 Enable account creation or authorisation from a facebook signin (and should work for others with minimal extra work)	2015-08-21 13:22:49 +09:30
Daniel O'Connor	70f48108b4	#645 Add handling for facebook	2015-08-21 12:21:23 +09:30
Anthony Atkinson	cbb50df8d0	Resolved #562 - Pagination of notifications.	2015-07-25 13:18:30 -04:00
AELOGICA	a581b759a3	Added tests for creating crops with multiple scientific and alternate names	2015-07-17 07:31:53 +08:00
AELOGICA	734b57e395	Fixed feature test errors	2015-07-17 07:31:53 +08:00
AELOGICA	12d151b68c	Added multiple forms for scientific and alternate names on crop creation	2015-07-17 07:31:51 +08:00
Jym Paul A. Carandang	9f3d3b2b8f	Signout redirects to last page visited	2015-07-10 12:51:36 +08:00