mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-02 19:24:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 97 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
814 Commits
Author SHA1 Message Date
Brenda Wallace 95db0f7297 Shortened the text on the badges 2019-02-09 14:18:15 +13:00
Brenda Wallace aa8ed5bb3a Fix up translation on badges 2019-02-09 11:47:13 +13:00
Brenda Wallace d2c63db59b Translate planting status 2019-02-04 21:42:54 +13:00
Brenda Wallace 8c03e3f4ab Merge branch 'dev' into bb-track-types-of-gardens 2019-01-30 16:45:14 +13:00
Brenda Wallace 52272550c8 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 2019-01-27 18:25:43 +13:00
Brenda Wallace 02d96bcc51 Removed another mandril reference 2019-01-26 14:02:50 +13:00
Brenda Wallace 986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 
Conflicts:
	app/views/layouts/_header.html.haml
	spec/features/gardens/actions_spec.rb
 2019-01-24 13:48:36 +13:00
Brenda Wallace e66f8298c8 Merge branch 'dev' into remove-mandrill 2019-01-24 12:20:39 +13:00
Brenda Wallace e17e5c9297 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-24 12:20:26 +13:00
Brenda Wallace 449e8da25a Added missing translation for Edit profile button 2019-01-24 12:17:40 +13:00
Brenda Wallace 6e433306f4 Capitalise some translations 2019-01-24 12:17:40 +13:00
Brenda Wallace 655efb26eb Removing some unused translations 2019-01-24 12:17:40 +13:00
Brenda Wallace 313a18db08 Titles of pages consistent with buttons to pages 2019-01-24 12:17:40 +13:00
Brenda Wallace 67e58fe901 Moving buttons to the right of page (with translations) 2019-01-24 12:17:40 +13:00
Brenda Wallace a4f20bff77 More button label translations 2019-01-24 12:17:40 +13:00
Brenda Wallace acc100f744 Adding missing translations for plantings 2019-01-24 12:17:40 +13:00
Brenda Wallace 30255a24d2 Use buttons.* translations for glyphicons titles 2019-01-24 12:17:40 +13:00
Brenda Wallace 7acff05ccc Merge branch 'dev' into bb-track-types-of-gardens 2019-01-23 13:58:31 +13:00
Brenda Wallace 5a2f7dfe25 Merge branch 'dev' into routes-tidy-up 2019-01-23 13:58:01 +13:00
apdarr 58f8a88242 set newrelic to use ssl 2019-01-23 13:57:32 +13:00
Brenda Wallace e1fdc729db Merge branch 'dev' into bb-track-types-of-gardens 2019-01-21 11:36:46 +13:00
Brenda Wallace 45793c1cec Merge branch 'dev' into routes-tidy-up 2019-01-19 12:37:53 +13:00
Brenda Wallace 5b732fedae Remove references to MANDRILL 2019-01-19 12:36:27 +13:00
Brenda Wallace f453682696 Fixing sendgrid 2019-01-19 12:33:58 +13:00
Brenda Wallace 6f23a203a2 Switch to SendGrid (remove sparkhost) 2019-01-19 11:57:50 +13:00
Brenda Wallace cab5986573 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-19 09:00:57 +13:00
Brenda Wallace e296f15981 Merge branch 'dev' into routes-tidy-up 2019-01-19 08:57:19 +13:00
Brenda Wallace b6a7fa0efd Force to redirect to ssl 2019-01-19 08:51:55 +13:00
Brenda Wallace ecb0d0bc0b Merge branch 'dev' into bb-track-types-of-gardens 2019-01-18 14:28:46 +13:00
Brenda Wallace 9a18918b42 Merge branch 'dev' into routes-tidy-up 2019-01-18 14:27:42 +13:00
Brenda Wallace 656510855d Switch to new syntax for initing uglifier 2019-01-18 14:21:11 +13:00
Brandon Baker a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-08 12:03:39 -05:00
Brenda Wallace c0e957b051 Places params is :place 2019-01-06 08:45:42 +13:00
Brenda Wallace 106497c841 Rubocop fix ups 2019-01-06 08:45:42 +13:00
Brenda Wallace c2bcae47d2 Use the admin/members controller 2019-01-06 08:45:42 +13:00
Brenda Wallace 74e30aeb1d move cms into admin scope 2019-01-06 08:45:42 +13:00
Brenda Wallace bf6dd049ae Fixed up admin routes 2019-01-06 08:45:42 +13:00
Brenda Wallace 1381b619be on collection, routes for notification 2019-01-06 08:45:42 +13:00
Brenda Wallace b44b7fdd2e Move follows from members controller to follows controller 2019-01-06 08:45:42 +13:00
Brenda Wallace 1e266a92f6 Members slug used in rotes 2019-01-06 08:45:42 +13:00
Brenda Wallace 387200abf7 Moving garden data under members 2019-01-06 08:45:42 +13:00
Brenda Wallace 57d53a5c0e Fixed naming of member follows/following route 2019-01-06 08:45:42 +13:00
Brenda Wallace 99a69bf192 Tidy up places routes 2019-01-06 08:45:42 +13:00
Brenda Wallace 7a09e20b71 Fixed admin routes. namespace, not a resource 2019-01-06 08:45:42 +13:00
Brenda Wallace 37cba79a52 Fixed newsletters route 2019-01-06 08:45:42 +13:00
Brenda Wallace 5a8bc73099 Simplify places routes 2019-01-06 08:45:42 +13:00
Brenda Wallace 5d8352db08 DRY the routes 2019-01-06 08:45:42 +13:00
Brenda Wallace a65983e1ed Routes for photos and owners 2019-01-06 08:45:42 +13:00
Brenda Wallace 3258694021 Tidy up the routes 2019-01-06 08:45:42 +13:00
Brenda Wallace d89c8f0fbc Merge branch 'dev' into upgrade/rails-5-2 2019-01-03 12:31:37 +13:00