1771 Commits

Author	SHA1	Message	Date
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	bcb0a19dea	Merge remote-tracking branch 'upstream/dev' into add_facebook_signup	2016-08-22 16:37:50 +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	9ab79209ef	Adjust TOS url	2016-08-22 16:35:41 +09:30
Daniel O'Connor	044a992d25	Merge pull request #1025 from polveenomials/nav-header ... Enhancement of the navigation bar (header)	2016-08-15 23:30:11 +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	dba6b2a291	Mitigate security concerns with target=_blank via https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/	2016-08-15 21:31:45 +09:30
Daniel O'Connor	7d3991b295	#967 Mitigate security concerns with target=_blank via https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/	2016-08-15 21:30:51 +09:30
Daniel O'Connor	fdb0e842de	#864 Add links to google, gardenate	2016-08-15 21:30:33 +09:30
Kristine Nicole Polvoriza	d1438d1b2e	Fixed the nav header in mobile view	2016-07-28 12:31:50 +08:00
pozorvlak	b6f848ef66	Merge pull request #1021 from CloCkWeRX/picture_improvements ... If a harvest doesn't have any photos, try to look at the crop's default photo	2016-07-21 18:24:58 +01:00
Daniel O'Connor	6911f7b24b	Typo	2016-07-21 12:05:37 +09:30
Daniel O'Connor	4b87977e24	It helps to type properly	2016-07-08 18:12:16 +09:30
Daniel O'Connor	dfa28264c6	#1017 When a crop has no photos, look for harvests of the crop with photos.	2016-07-08 18:09:53 +09:30
Daniel O'Connor	f0c1d6d4c2	#997 Use the harvest photo lookup, not the harvest.crop one	2016-07-08 18:01:53 +09:30
Daniel O'Connor	427b98a157	#997 If a harvest doesn't have any photos, try to look at the crop's default photo	2016-07-08 17:59:32 +09:30
Daniel O'Connor	8f5000443f	Use navbar-right, and reposition search box to fix mobile layout	2016-07-08 17:45:00 +09:30
Daniel O'Connor	7947fd6e91	Clean up link_to as per #1013	2016-07-08 17:08:17 +09:30
Daniel O'Connor	70bf5499b2	Clean up logic a bit as per #1013	2016-07-08 17:07:14 +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	efd112c4b8	And vs && - revised version of b50127c166	2016-07-08 17:01:59 +09:30
Mackenzie Morgan	5c7b760f34	Use array literal [] instead of Array.new	2016-07-08 16:58:34 +09:30
Mackenzie Morgan	81ae473972	space between comma-separated arguments	2016-07-08 16:58:29 +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
Mackenzie Morgan	b28d146de7	use default of info ... add tests	2016-06-19 22:42:20 -04:00
Mackenzie Morgan	55c8be8dc5	merge	2016-06-19 22:27:27 -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	b03ccce575	Merge pull request #980 from lucasnogueira/replace_pluralize ... Replace pluralize calls	2016-06-09 16:39:34 +01:00
Lucas Nogueira	63b8788c80	Change hash syntax	2016-06-09 11:57:56 -03:00
Lucas Nogueira	b911ebfd07	Replace pluralize calls	2016-06-08 22:03:40 -03:00
Lucas Nogueira	905710b6e9	Helper for plural localization	2016-06-08 21:55:33 -03:00
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
Cesy	7885257fae	Merge pull request #943 from CloCkWeRX/adjust_helper ... Deal with .nil quantity of a seed in rendering helper	2016-06-04 12:41:03 +01:00
Daniel O'Connor	a8d22709e6	Add explict test coverage of the helper with nil seeds (page level tests already cover this rendering on crop detail in general)	2016-06-04 20:51:20 +09:30
pozorvlak	980a7d79d3	Merge pull request #963 from CloCkWeRX/add_better_opengraph_squashed ... Various bugfixes for facebook/opengraph	2016-06-02 17:58:05 +01:00
pozorvlak	9c5c07e087	Merge pull request #948 from cesy/issue875 ... Fix #875 edited date on comments on homepage	2016-06-02 17:41:59 +01:00
Daniel O'Connor	faaf07cad8	Render the full size image, as facebook doesn't like smaller thumbnails	2016-06-03 01:58:34 +09:30
Daniel O'Connor	0e83a230b9	Helps not to render excess info	2016-06-03 01:54:26 +09:30
Daniel O'Connor	c278b36858	Up the various opengraph images to 200x200	2016-06-03 01:45:43 +09:30