3516 Commits

Author	SHA1	Message	Date
Brenda Wallace	ec974cdfee	Merge branch 'dev' into following-page	2019-07-09 00:31:32 +12:00
Brenda Wallace	43ba345f4d	Update app/views/devise/registrations/_edit_apps.html.haml ... Co-Authored-By: pozorvlak <miles@assyrian.org.uk>	2019-07-08 23:32:02 +12:00
Brenda Wallace	6ad694cf30	Tidy up member edit	2019-07-08 21:56:37 +12:00
Brenda Wallace	61047df429	Merge branch 'dev' into following-page	2019-07-08 20:02:47 +12:00
Brenda Wallace	8baf8757ca	Merge branch 'dev' into following-page	2019-07-08 17:07:55 +12:00
Brenda Wallace	4845211429	Merge branch 'dev' into post-photos	2019-07-08 17:07:45 +12:00
Brenda Wallace	680111add7	Merge branch 'dev' into post-photos	2019-07-08 17:06:04 +12:00
Brenda Wallace	253c0cb939	Merge branch 'dev' into following-page	2019-07-08 16:44:03 +12:00
ImgBotApp	770c6f45fd	[ImgBot] Optimize images ... /app/assets/images/placeholder_600.png -- 31.66kb -> 29.12kb (8.03%)	2019-07-08 04:43:51 +00:00
Brenda Wallace	6d7b990797	Remove unused rails.png	2019-07-08 04:43:03 +00:00
Brenda Wallace	f7af2bf816	Higher res photo placeholder	2019-07-08 04:43:03 +00:00
Daniel O'Connor	cf0d648b31	Merge branch 'dev' into post-photos	2019-07-08 13:45:26 +09:30
Daniel O'Connor	76c18014e2	Merge pull request #2042 from Br3nda/active-gardens ... only show active gardens on planting form	2019-07-08 13:40:08 +09:30
Brenda Wallace	0a030c56bb	files should end with a new line	2019-07-08 04:08:58 +00:00
Brenda Wallace	bbd43f57bc	Prevent post images going off screen	2019-07-08 04:08:58 +00:00
Brenda Wallace	9c25fd043f	only show active gardens on planting form	2019-07-08 13:24:27 +12:00
Brenda Wallace	5cef4d728c	Adding photos directly to a post	2019-07-08 13:20:57 +12:00
Brenda Wallace	5c6e65cd01	remove quotes in haml	2019-07-08 10:05:53 +12:00
Brenda Wallace	013b388beb	remove quotes in haml	2019-07-08 10:05:36 +12:00
Brenda Wallace	07945e9f69	remove quotes in haml	2019-07-08 10:05:13 +12:00
Brenda Wallace	e6a60e93c9	remove quotes in haml	2019-07-08 10:04:56 +12:00
Brenda Wallace	3859122fa5	tidy	2019-07-08 10:04:08 +12:00
Brenda Wallace	c61f13625c	Moved html into haml instead of html_safe in helper	2019-07-08 09:52:33 +12:00
Brenda Wallace	1c50d9e50d	rename blog_icon to post_icon	2019-07-08 09:42:06 +12:00
Brenda Wallace	b1edf8542e	Removed slug from query	2019-07-08 09:40:21 +12:00
Brenda Wallace	81723d99d9	make comment icon match other icons	2019-07-08 09:36:47 +12:00
Brenda Wallace	b1fdb5242a	simplifying resolving models	2019-07-08 09:34:48 +12:00
Brenda Wallace	e26c6d52a4	Further DRYing	2019-07-08 09:31:50 +12:00
Brenda Wallace	933c78b4e5	DRY members#show view	2019-07-08 09:19:44 +12:00
Brenda Wallace	7a4312f41e	Dry up timeline code	2019-07-08 09:19:26 +12:00
Brenda Wallace	03dfcdcc57	rubocop lint fix ups	2019-07-08 09:04:58 +12:00
Brenda Wallace	fe81923ae1	DRY timeline view	2019-07-08 09:04:19 +12:00
Brenda Wallace	528e4c2c85	button to get to timeline	2019-07-07 22:08:42 +12:00
Brenda Wallace	050dfda77e	Timeline	2019-07-07 22:03:15 +12:00
Brenda Wallace	cc271b2cc3	Back out the max homepage items change	2019-07-06 11:16:21 +00:00
Brenda Wallace	eda77365a5	truncate long locations	2019-07-06 11:16:21 +00:00
Brenda Wallace	8528f80678	Layout fix up on hompage for large screens	2019-07-06 11:16:21 +00:00
Brenda Wallace	f8aff32168	Back out the max homepage items change	2019-07-06 11:04:10 +12:00
Brenda Wallace	1281f78d40	truncate long locations	2019-07-06 11:04:10 +12:00
Brenda Wallace	997a30d1bc	Layout fix up on hompage for large screens	2019-07-06 11:04:10 +12:00
Miles Gould	ba1512a85a	Delete duplicate percentage_grown attribute ... Fixes #2031	2019-07-05 10:49:29 +00:00
Brenda Wallace	cdc3be0414	Merge branch 'dev' into upgrade/bootstrap-43	2019-07-05 10:05:44 +12:00
Brenda Wallace	136aff87ac	Removign empty class in scss	2019-07-04 10:36:25 +00:00
Brenda Wallace	826c8845a2	Removing commented out cruft	2019-07-04 10:36:25 +00:00
Brenda Wallace	904e30c9dd	Merge branch 'dev' into upgrade/bootstrap-43	2019-07-03 22:47:20 +12:00
Brenda Wallace	d53393b0ca	Fix downcase	2019-07-03 09:39:32 +00:00
Brenda Wallace	ea18c722ef	lower caseon pluralizing	2019-07-03 09:39:32 +00:00
Brenda Wallace	ac91450827	Fixes count on members'cards	2019-07-03 09:39:32 +00:00
Brenda Wallace	8b22004066	Merge branch 'dev' into upgrade/bootstrap-43	2019-07-03 09:58:04 +12:00
Miles Gould	a18ff03599	Fix remaining uses of devise_error_messages!	2019-07-02 21:57:43 +00:00