4522 Commits

Author	SHA1	Message	Date
Cesy	594e3470b4	Merge pull request #858 from CloCkWeRX/fix_plant_parts ... Fix plant parts / harvests issue #853	2016-04-09 13:25:46 +01:00
Daniel O'Connor	7bb7a18b66	Fixes #850 Refactors percentage grown to model, stops rendering progress bars in situations it doesn't make sense. Adds specs.	2016-04-09 21:45:13 +09:30
hcbviolet	e8d7ed0c2d	Edit display_harvest_description method for no description	2016-04-08 17:34:58 -07:00
Cesy	b69bb219a3	Merge pull request #859 from CloCkWeRX/add_title_validations ... Add title validations	2016-04-03 11:45:10 +01:00
Daniel O'Connor	a9330f2d77	#857 Add length validations to UI	2016-04-03 00:15:45 +10:30
Daniel O'Connor	de8bcc38d3	#857 Add length validations to models	2016-04-03 00:13:38 +10:30
Daniel O'Connor	99a3be08eb	Fixes #853	2016-04-03 00:08:19 +10:30
Daniel O'Connor	d9f04d1fa9	Fixes #853	2016-04-03 00:08:12 +10:30
Daniel O'Connor	668f6d3a2b	Fix 'app/views/harvests/_form.html.haml:39: warning: duplicated key at line 39 ignored: :class'	2016-03-29 00:43:14 +10:30
Mackenzie	90e9017a19	Merge pull request #841 from CloCkWeRX/fix_840_performance ... Eager load photos to reduce the number of queries executed	2016-03-28 09:55:40 -04:00
Daniel O'Connor	b57cb581dd	#840 Eager load photos	2016-03-28 23:08:26 +10:30
Daniel O'Connor	f23cb78dcb	#840 Eager load photos, which are used in the .interesting? call; so we don't have to do a photos.size call on every single crop.	2016-03-28 23:08:20 +10:30
Daniel O'Connor	9fa72fa5f7	Only render a pipe if there are multiple options like edit rights available	2016-03-28 21:41:06 +10:30
Daniel O'Connor	e35b15c868	Only render an edit control if the permission exists	2016-03-28 21:40:58 +10:30
Daniel O'Connor	7256c28038	Refactor to a separate class, containing domain logic	2015-09-15 12:13:47 +09:30
Savant Krishna	346979c640	Merge remote-tracking branch 'upstream/dev' into pr_member_notify	2015-09-09 21:30:45 -04:00
Mackenzie	ec891fc0b2	Merge pull request #821 from CloCkWeRX/fix_empty_garden ... Fix #818 by removing the .thumbnail around the button.	2015-09-09 16:07:02 -04:00
pozorvlak	ef6dd88b1e	Merge pull request #820 from CloCkWeRX/fix_popover_better ... Fix #819 by removing the popover behaviour for a standard avatar	2015-09-09 20:04:55 +00:00
twconquest	b2f3755196	Additional config fix to point to correct list id	2015-09-09 19:48:35 +00:00
Savant Krishna	0c315981df	Merge remote-tracking branch 'upstream/dev' into member_quicklink_md ... Conflicts: lib/haml/filters/growstuff_markdown.rb	2015-09-07 20:08:57 -04:00
Savant Krishna	9e7a80cb86	Fix bug #827 : Error in generating csv file for plantings with owner filter	2015-09-07 04:01:20 -04:00
Savant Krishna	7ef1eb5852	Create a notification to all members mentioned in a post : Feature #505	2015-09-06 14:41:04 +10:00
Savant Krishna	0adb24fa4d	Add quick member link help to markdown help	2015-09-06 09:10:18 +10:00
Jim Stallings	85f7ca4058	GS-658 - internationalize drop down links and page titles	2015-08-29 18:39:38 -04:00
Daniel O'Connor	ff779b6679	Trial rendering as comma separated	2015-08-29 07:51:53 +09:30
Daniel O'Connor	f357916779	For more accurate specs, explicitly target the login-name container	2015-08-29 07:49:55 +09:30
Daniel O'Connor	631747e919	Add a trailing sentence.	2015-08-27 15:26:40 +09:30
Daniel O'Connor	ff00b2c985	Fix #818 and layout of show garden page	2015-08-27 15:25:16 +09:30
Daniel O'Connor	a0cdf3a8b2	Fix #818 by removing the .thumbnail around the button. Also rearrange some of the headings (sizing) and controls (add new garden) to be more clearly not a tab.	2015-08-27 15:12:05 +09:30
Daniel O'Connor	c87a5f2d6b	Fix #819 by removing the popover behaviour for a standard avatar; and putting the stats onto the card.	2015-08-27 14:35:15 +09:30
Daniel O'Connor	c09b0a0341	Merge branch 'dev' into add_facebook_signup	2015-08-27 12:19:48 +09:30
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	f6790a5f9b	#556 When an avatar is set from an oauth provider, don't encourage the user to update gravatar.	2015-08-27 11:52:49 +09:30
Daniel O'Connor	4983a6dfb3	#556 Improve user avatar sizing	2015-08-27 11:42:36 +09:30
Daniel O'Connor	c4c477fdd8	Merge branch 'add_facebook_signup' into dev	2015-08-27 11:31:07 +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	e84aaeb56d	#509 Refactor the rendering of image_with_popover as well (size is *never* defined, so have defaulted it explicitly to 150)	2015-08-26 10:33:12 +09:30
Daniel O'Connor	859cf7f215	#509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic	2015-08-25 00:32:17 +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	e3c52b1a56	#733 Render as a 'website'	2015-08-24 16:56:35 +09:30
Daniel O'Connor	3258a6754c	#733 Render only one image, and do it with a full URL	2015-08-24 16:46:42 +09:30
Daniel O'Connor	db876ff107	#733 Add the correct RDFa prefix	2015-08-24 16:38:00 +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
twconquest	2882e3d1a5	Correct Gibbon list id to point to correct list	2015-08-21 19:29:03 +00:00
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