2092 Commits

Author	SHA1	Message	Date
Mackenzie	36768cf384	Merge pull request #1194 from Br3nda/bw/grand-haml-cleanup-of-2017 ... More haml clean up	2017-02-08 22:46:34 -05:00
Brenda Wallace	c8405830c7	Added strip_tags before processing markdown	2017-02-09 03:29:18 +00:00
Shiny	6bc9f775c2	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-09 10:23:01 +13:00
Brenda Wallace	6f74566d47	Truncate, escape, and DRY og:description fields	2017-02-08 09:49:19 +13:00
Brenda Wallace	82ce6c8222	Haml clean up for seeds views	2017-02-08 08:52:46 +13:00
Brenda Wallace	f96f459595	Moved title logic into application helper ... For harvests, plantings, and seeds	2017-02-08 07:25:59 +13:00
Brenda Wallace	096146cb84	Fix: @owner -> owner in harvests_title	2017-02-08 07:25:59 +13:00
Brenda Wallace	ba1c40702b	DRY up gardens and plantings helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	e6254da3f1	Haml clean up for Roles views	2017-02-08 07:25:59 +13:00
Brenda Wallace	acbb610e05	Haml clean up for posts views	2017-02-08 07:25:59 +13:00
Brenda Wallace	338265d9e9	Haml cleanup for plantings views	2017-02-08 07:25:59 +13:00
Brenda Wallace	706922cacf	Haml clean up for plantparts views	2017-02-08 07:25:59 +13:00
Brenda Wallace	08f2877f8e	Haml clean up for places views	2017-02-08 07:25:59 +13:00
Brenda Wallace	2c3d1848d5	Haml clean up for photos	2017-02-08 07:25:59 +13:00
Brenda Wallace	17e88778c8	Haml clean up for orders	2017-02-08 07:25:59 +13:00
Brenda Wallace	bafb0123da	Haml cleanup for notifier	2017-02-08 07:25:59 +13:00
Brenda Wallace	e1e9c32652	Moved havests#index title to a helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	48c3cbb3d1	Change to hash attributes syntax in harvests#show	2017-02-08 07:25:59 +13:00
Brenda Wallace	740b8587f2	Moved complex parts of garden/nav into helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	900de8a615	Fixed Read more link in harvests	2017-02-08 07:25:59 +13:00
Brenda Wallace	d73aa98309	Cleaned up most of Home's haml	2017-02-08 07:25:59 +13:00
Brenda Wallace	ac7d44cb72	Cleaned up most of harvest's haml	2017-02-08 07:25:59 +13:00
Brenda Wallace	1db30d98ce	Haml clean up for members	2017-02-07 15:35:34 +13:00
Brenda Wallace	23f8c24ef4	Haml clean up for notifications	2017-02-07 14:33:20 +13:00
Brenda Wallace	c8fa54591a	Haml clean for shop	2017-02-07 07:53:34 +13:00
Brenda Wallace	64f11793c9	Fixed typo in link	2017-02-06 16:31:57 +13:00
Brenda Wallace	05a9d498a7	More forums haml clean up	2017-02-06 14:50:49 +13:00
Brenda Wallace	16145599ce	Haml clean up for (most) garden views	2017-02-06 14:46:19 +13:00
Brenda Wallace	af8527aa5b	Haml clean up of forum views	2017-02-06 14:46:19 +13:00
Brenda Wallace	8408fdc845	Moved popular plant plarts calculation into sql	2017-02-06 13:22:18 +13:00
Brenda Wallace	f37c9152af	Simplified the "grown for" view	2017-02-06 11:21:33 +13:00
Brenda Wallace	4ee789ca06	Popular plant parts are now sorted by popularity	2017-02-06 10:59:40 +13:00
Brenda Wallace	80371c835c	Moved long line (ebay url) to helper	2017-02-06 10:40:58 +13:00
Brenda Wallace	6478d9cb1b	Haml clean up for crops views	2017-02-06 10:31:45 +13:00
pozorvlak	f8b84f390d	Calculate "count_uses_of_property" using DB query (#1183) ... * Refactor 'count_uses_of_property' method in crop model * Add check for nil column value * Add @alran to CONTRIBUTORS.md * Reformat Crop#count_uses_of_property * Remove unnecessary string interpolation	2017-02-05 13:23:47 +13:00
Shiny	9deed09d36	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-05 11:01:46 +13:00
Brenda Wallace	2b7144c1fd	Fixed trailing quote in haml	2017-02-04 15:07:18 +13:00
Brenda Wallace	8ddf36fed9	Haml clean up for (some of) crops views	2017-02-04 15:04:07 +13:00
Brenda Wallace	785ae33a42	Haml clean up for comments views	2017-02-04 14:07:59 +13:00
Brenda Wallace	c43c1686a3	Haml clean up for alternate_names views	2017-02-04 13:50:04 +13:00
Brenda Wallace	65a8bde467	Haml clean up for admin views	2017-02-04 12:00:42 +13:00
Brenda Wallace	3647f67538	Haml clean up for accounts views	2017-02-04 11:52:15 +13:00
Brenda Wallace	6c4f7eff92	Haml clean up for account_types views	2017-02-04 11:50:33 +13:00
Brenda Wallace	e5d826e8c3	Further simplified newsletter subscription logic	2017-02-04 11:28:37 +13:00
Brenda Wallace	77c01d4f66	BUGFIX: Added missing if	2017-02-04 11:23:27 +13:00
Brenda Wallace	33b7952ed3	Simplified OmniauthCallbacksController	2017-02-04 11:21:15 +13:00
Brenda Wallace	1217ba5b48	Reduce complexity of ApplicationController.store_location	2017-02-04 11:19:11 +13:00
Brenda Wallace	ffee6ada83	Simplify member.update_newsletter_subscription	2017-02-04 11:18:00 +13:00
pozorvlak	3e81419e78	Merge branch 'dev' into bw/plantingshelper-simplify	2017-02-03 12:08:54 +00:00
Brenda Wallace	19aa3a1ca4	PlantingsHelper simplification	2017-02-03 20:42:15 +13:00