mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 21:22:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 102 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace e6dea31935 Use buttons.* translations for glyphicons titles 2019-01-21 13:40:56 +13:00
Brenda Wallace 47e11c5b7c Put buttons translations under buttons namespace 2019-01-21 13:37:58 +13:00
Brenda Wallace 0914caae88 Move the action buttons to EVERY page 2019-01-21 11:47:25 +13:00
Brenda Wallace 24ead96a71 Call t() on button labels 2019-01-21 11:46:50 +13:00
Brenda Wallace e1fdc729db Merge branch 'dev' into bb-track-types-of-gardens 2019-01-21 11:36:46 +13:00
Brenda Wallace 2b20d32645 Merge branch 'dev' into routes-tidy-up 2019-01-21 11:36:25 +13:00
Brenda Wallace 2bf328be15 Merge branch 'dev' into app-json-heroku 2019-01-21 11:35:31 +13:00
Brenda Wallace 4825cb44ae Merge branch 'dev' into remove-mandrill 2019-01-21 11:35:22 +13:00
Brenda Wallace 2539899934 Fix notification specs 2019-01-21 10:50:22 +13:00
Brenda Wallace 31321fce17 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 2019-01-19 12:52:19 +13:00
Brenda Wallace f07dc1956b Merge branch 'dev' into app-json-heroku 2019-01-19 12:38:39 +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 b28bddaf0c Merge branch 'dev' into app-json-heroku 2019-01-19 09:37:28 +13:00
Brenda Wallace b9471e3a6e Merge branch 'dev' into photos/seeds 2019-01-19 09:35:00 +13:00
dependabot[bot] 4be6169c93 Bump jsonapi-resources from 0.9.4 to 0.9.5 
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.4 to 0.9.5.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.4...v0.9.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-19 09:33:19 +13:00
Brenda Wallace 2bb80746e0 Merge branch 'dev' into routes-tidy-up 2019-01-19 09:32:48 +13:00
Brenda Wallace a690dc1479 Merge branch 'dev' into app-json-heroku 2019-01-19 09:04:04 +13:00
Brenda Wallace cab5986573 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-19 09:00:57 +13:00
Brenda Wallace 2c48596de9 Merge branch 'master' into dev 2019-01-19 09:00:15 +13:00
Brenda Wallace e296f15981 Merge branch 'dev' into routes-tidy-up 2019-01-19 08:57:19 +13:00
Brenda Wallace 2b6645d3b5 Merge branch 'dev' into app-json-heroku 2019-01-19 08:56:57 +13:00
Awesome Code 36765808b9 Auto corrected by following Format Css Code 2019-01-19 08:54:52 +13:00
Brenda Wallace b6a7fa0efd Force to redirect to ssl 2019-01-19 08:51:55 +13:00
pozorvlak 83f3872488 Merge pull request #1761 from Growstuff/dev 
Release 50
 2019-01-18 17:31:10 +00:00
Brenda Wallace b35d13d5e5 Update seeds_controller.rb 2019-01-18 20:05:41 +13:00
Brenda Wallace d1a3f41462 Throw if can't find the @crop 2019-01-18 20:04:19 +13:00
Brenda Wallace 3212f748b4 Update crops_controller.rb 2019-01-18 20:03:22 +13:00
Brenda Wallace cb6a06feb6 find by slug 2019-01-18 20:02:15 +13:00
Brenda Wallace e337fcb7f7 Put displayed member back to using member.slug 2019-01-18 20:00:59 +13:00
Brenda Wallace a06516b80f Put displayed link back to using login_name 2019-01-18 20:00:31 +13:00
Brenda Wallace a69f5bf65f Merge branch 'dev' into UTFGardenNames 2019-01-18 18:54:13 +13:00
Brenda Wallace 1fc70e5a2b Rubocop linting 2019-01-18 14:54:24 +13:00
Brenda Wallace 4ea9dda5e9 Merge branch 'fix/1792-sparkhost-deprecated' into app-json-heroku 
Conflicts:
	app.json
 2019-01-18 14:52:53 +13:00
Brenda Wallace 03c8d75899 Fixing the app.json for Bonsai 2019-01-18 14:48:04 +13:00
Brenda Wallace 6273fa684c Models (plot and container) need to sub class ApplicationRecord 2019-01-18 14:34:47 +13:00
Brenda Wallace f7d989bb61 Squashed migrations and set as Rails4.2 2019-01-18 14:31:35 +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
Brenda Wallace 6c70044a7f Switch to SendGrid (remove sparkhost) 2019-01-18 14:13:21 +13:00
Brenda Wallace 44f4cc621e Merge branch 'dev' into bb-track-types-of-gardens 2019-01-17 12:49:31 +13:00
Brenda Wallace 7a4f6fd512 Merge branch 'dev' into photos/seeds 2019-01-09 20:57:46 +13:00
Brenda Wallace 3145df9153 Merge pull request #1785 from Growstuff/dependabot/bundler/sidekiq-5.2.5 
Bump sidekiq from 5.2.3 to 5.2.5
 2019-01-09 20:57:08 +13:00
dependabot[bot] 51f977fc8f Bump sidekiq from 5.2.3 to 5.2.5 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.3 to 5.2.5.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.3...v5.2.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-09 07:18:00 +00:00
Brandon Baker a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-08 12:03:39 -05:00
Brenda Wallace fb02c187ab Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 
Conflicts:
	.gitignore
 2019-01-08 10:33:50 +13:00
Daniel O'Connor ea2653ecfc Merge pull request #1779 from Br3nda/ignore-extra-files 
Switch to yarn && Ignore extra files
 2019-01-06 15:41:51 +10:30