1091 Commits

Author	SHA1	Message	Date
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
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	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	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
pozorvlak	c404d8220d	Merge pull request #791 from cesy/cachethumbnails ... Cache thumbnails	2015-08-19 15:11:16 +01:00
Cesy	48409698ab	Merge pull request #787 from twconquest/show-roles ... Show roles in member profile page	2015-08-19 14:13:32 +01:00
twconquest	24df32ba7f	Merge upstream/dev into show-roles and re-add myself to CONTRIBUTORS.md ... Conflicts: CONTRIBUTORS.md	2015-08-17 17:48:50 +00:00
Cesy	b6dfeb980c	i18n example	2015-08-12 14:56:36 +00:00
Cesy	e784ec9b33	Making it trigger the crop thumbnail cache properly	2015-08-12 11:45:18 +00:00
Cesy	1df0c36e72	Keying the cache correctly	2015-08-12 10:49:48 +00:00
Cesy	a5e7a8d315	Cache crop thumbnails	2015-08-12 10:49:48 +00:00
Cesy	12a1484a26	Merge pull request #800 from CloCkWeRX/fix_all_checkbox_labels ... Fix more checkbox labels in registration and email editing	2015-08-11 09:51:05 +01:00
Daniel O'Connor	97cf1347d5	Fix clickable area for checkboxes in email editing	2015-08-11 13:45:47 +09:30
Daniel O'Connor	367e298d48	Fix clickable area for checkboxes in registration	2015-08-11 13:44:17 +09:30
Daniel O'Connor	b788cb44ef	Remember that we're working in haml, not slim.	2015-08-11 10:23:50 +09:30
Daniel O'Connor	f61e2438e8	Style checkbox for 'remember me' and allow it to be clickable (minor usability/mobile UI annoyance)	2015-08-10 16:08:09 +09:30
pozorvlak	e503b1079d	Merge pull request #796 from cesy/issue677 ... Fix #677 by adding organic/GMO/heirloom to CSV and RSS	2015-08-06 14:54:10 +01:00
pozorvlak	ccca343959	Merge pull request #795 from cesy/issue788 ... Fix issue #788 with uncaught nil	2015-08-06 14:46:53 +01:00
Cesy	17c5fd61a3	Fix #677 by adding organic/GMO/heirloom to CSV and RSS	2015-08-06 12:23:00 +00:00
Cesy	44b8500fa8	Fix issue #788 with uncaught nil	2015-08-06 12:12:29 +00:00
Cesy	5a12b47c7c	Revert "Revert "Fixing relative caching of post summary on homepage, fixed #789""	2015-08-06 12:37:59 +01:00
Cesy	1ec188c793	Revert "Fixing relative caching of post summary on homepage, fixed #789"	2015-08-06 12:36:21 +01:00
Cesy	438b2444df	Merge pull request #790 from cesy/homepagetests ... Fixing relative caching of post summary on homepage, fixed #789	2015-08-06 12:34:15 +01:00
Cesy	9682300b85	Merge pull request #785 from sha1sum/notification_pagination ... Resolved #562 - Pagination of notifications.	2015-08-06 10:40:02 +01:00
Cesy	6f95f1fecf	Clarifying comment	2015-08-06 09:20:06 +00:00
Cesy	43fe29f113	Fixing relative caching of post summary on homepage, fixed #789	2015-08-06 09:18:32 +00:00
Cesy	5b19d236d0	Merge pull request #783 from pozorvlak/remove_last_count_calls ... Replace the last few .count and .length calls with .size where possible	2015-08-05 18:57:04 +01:00
Anthony Atkinson	bc9a025788	Merge branch 'dev' into notification_pagination	2015-08-01 11:38:01 -04:00
pozorvlak	de63fdc952	Merge pull request #786 from sha1sum/open_service_in_footer ... Resolves #617 - Open Service graphic link in footer	2015-07-28 22:00:19 +01:00
twconquest	1019834c41	Merge branch 'dev' into show-roles ... Conflicts: spec/features/member_profile_spec.rb	2015-07-28 19:42:55 +00:00
twconquest	362f7a78b1	Add feature test for showing roles	2015-07-28 19:33:05 +00:00
Anthony Atkinson	9d62c012f1	Resolves #617 - Open Service graphic link in footer	2015-07-25 13:34:16 -04:00
Anthony Atkinson	cbb50df8d0	Resolved #562 - Pagination of notifications.	2015-07-25 13:18:30 -04:00
Miles Gould	d9dd797c33	Merge branch 'pr/782' into dev	2015-07-24 11:09:35 +01:00
Miles Gould	8873986562	Merge branch 'pr/779' into dev	2015-07-24 11:05:21 +01:00
Miles Gould	96b0198d41	Replace remaining calls to count() with size() ... The couple that aren't removed are required: for instance, there's a Crop.count method, but no Crop.size method.	2015-07-23 23:05:39 +01:00
Mackenzie Morgan	b0d4f9c731	switch homepage and members/ page member thumbnails to be a flexbox layout so it's more responsive. Fixes #780	2015-07-23 13:56:07 -04:00
Anthony Atkinson	bc058b9152	Missed a few optional field placeholders on Seed form.	2015-07-23 11:36:40 -04:00
AELOGICA	aa3cf729c8	Added feature tests for on gardens, seeds and harvests for the card based thumbnails	2015-07-23 15:44:27 +08:00