mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-28 19:51:57 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,973 Commits 54 Branches 76 Tags
50751611fa6812ef446c88dc5beb2d165cd034e2
Commit Graph

5973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
50751611fa Tidy up where badges appear 2019-02-09 14:12:45 +13:00
Brenda Wallace
fc95a3c4e1 Moved planting css to own file 2019-02-09 14:12:30 +13:00
Brenda Wallace
dfe67d5308 Move thumbnail title up a bit 2019-02-09 12:13:22 +13:00
Brenda Wallace
aa8ed5bb3a Fix up translation on badges 2019-02-09 11:47:13 +13:00
Brenda Wallace
fcd147412c Tidy up display on gardens#index 2019-02-09 11:47:13 +13:00
Awesome Code
404fafd700 Auto corrected by following Lint Ruby EmptyLine 2019-02-08 21:10:48 +00:00
Brenda Wallace
7a94920966 Merge pull request #1823 from Growstuff/awesomecode-lint-ruby-rspec-layout-28889 
Auto corrected by following Lint Ruby rspec layout
 2019-02-09 09:24:16 +13:00
Awesome Code
c4a3c03c34 Auto corrected by following Lint Ruby rspec layout 2019-02-08 20:23:08 +00:00
Brenda Wallace
1539aaa140 Merge pull request #1821 from Br3nda/api-additions 
Adding more attributes and filters to the api
 2019-02-09 09:20:38 +13:00
Brenda Wallace
9a4f1058e1 Adding more attributes and filters to the api 2019-02-09 08:43:59 +13:00
Brenda Wallace
b29ab46a48 Merge pull request #1808 from Growstuff/dependabot/bundler/rubocop-rspec-1.32.0 
Bump rubocop-rspec from 1.31.0 to 1.32.0
 2019-02-02 23:22:10 +13:00
dependabot[bot]
951076bc85 Bump rubocop-rspec from 1.31.0 to 1.32.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.31.0 to 1.32.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.31.0...v1.32.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-01 20:17:34 +00:00
Brenda Wallace
76f4ffc78a Merge pull request #1805 from Br3nda/fix/recent-harvests 
Fix/recent harvests
 2019-02-02 09:14:27 +13:00
Brenda Wallace
41082b31a9 Merge branch 'dev' into fix/recent-harvests 2019-01-30 16:44:47 +13:00
Brenda Wallace
6ebe853cb3 Merge pull request #1771 from Br3nda/routes-tidy-up 
Routes tidy up
 2019-01-30 16:44:30 +13:00
Brenda Wallace
682de8f815 Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up 2019-01-30 15:25:31 +13:00
Brenda Wallace
4c02a3247e Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 2019-01-30 15:25:19 +13:00
Brenda Wallace
6acc6bd5ee Tell rspec which gardens button to use 2019-01-30 15:25:07 +13:00
Brenda Wallace
0bb483e8eb Merge branch 'dev' into routes-tidy-up 2019-01-30 15:20:41 +13:00
Brenda Wallace
96fc9d9368 Merge branch 'dev' into fix/recent-harvests 2019-01-30 15:20:30 +13:00
Brenda Wallace
02ed494898 Merge pull request #1810 from Growstuff/dependabot/bundler/newrelic_rpm-6.0.0.351 
Bump newrelic_rpm from 5.7.0.350 to 6.0.0.351
 2019-01-30 15:20:14 +13:00
dependabot[bot]
964dbe5e54 Bump newrelic_rpm from 5.7.0.350 to 6.0.0.351 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.7.0.350 to 6.0.0.351.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-29 07:20:30 +00:00
Brenda Wallace
9325f03019 Merge pull request #1788 from Growstuff/dependabot/bundler/newrelic_rpm-5.7.0.350 
Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350
 2019-01-28 16:13:01 +13:00
Brenda Wallace
3d3d1407cd Fixed link in global actions 2019-01-27 18:28:42 +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
6484e4e6e5 Merge branch 'dev' into fix/recent-harvests 2019-01-27 18:25:22 +13:00
Brenda Wallace
10beb65e1a Feature spec to check most recently planted/harvested on crops#show 2019-01-27 18:23:15 +13:00
Brenda Wallace
ea35816654 Fix ordering of recent harvests 2019-01-27 18:12:37 +13:00
dependabot[bot]
9c13064191 Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.6.0.349 to 5.7.0.350.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-26 22:56:56 +00:00
pozorvlak
0664324d29 Merge pull request #1798 from Br3nda/remove-mandrill 
Remove references to MANDRILL
 2019-01-26 22:54:32 +00:00
Brenda Wallace
7f8ae04520 Merge branch 'dev' into remove-mandrill 2019-01-27 11:43:33 +13:00
Brenda Wallace
2057aef0ea Merge pull request #1802 from Growstuff/dependabot/bundler/capybara-3.13.0 
Bump capybara from 3.12.0 to 3.13.0
 2019-01-27 11:42:13 +13:00
Brenda Wallace
02d96bcc51 Removed another mandril reference 2019-01-26 14:02:50 +13:00
dependabot[bot]
5323558204 Bump capybara from 3.12.0 to 3.13.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.12.0...3.13.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-24 07:34:02 +00:00
Brenda Wallace
b892548b12 Merge branch 'dev' into routes-tidy-up 2019-01-24 16:09:39 +13:00
Brenda Wallace
b1d34a7fa2 Merge branch 'dev' into remove-mandrill 2019-01-24 15:52:58 +13:00
Brenda Wallace
60e222d9bb Merge pull request #1796 from Br3nda/app-json-heroku 
Fixing the app.json for Bonsai
 2019-01-24 15:52:38 +13:00
Brenda Wallace
32b2cbd921 Merge branch 'button-translate' into routes-tidy-up 
Conflicts:
	app/views/crops/_search_bar.haml
	app/views/layouts/application.html.haml
 2019-01-24 13:49:53 +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
45890fec59 Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up 2019-01-24 13:47:17 +13:00
Brenda Wallace
fc6183eb52 DRY actions more 2019-01-24 13:46:35 +13:00
Brenda Wallace
e66f8298c8 Merge branch 'dev' into remove-mandrill 2019-01-24 12:20:39 +13:00
Brenda Wallace
9f3b757d2b Merge branch 'dev' into app-json-heroku 2019-01-24 12:20:01 +13:00
Brenda Wallace
f6deaffb94 Fixed nested row on layout, that was breaking photo add page 2019-01-24 12:17:40 +13:00
Brenda Wallace
449e8da25a Added missing translation for Edit profile button 2019-01-24 12:17:40 +13:00
Brenda Wallace
d73f8716c0 Include font awesome (so specs pass) 2019-01-24 12:17:40 +13:00
Brenda Wallace
e202c73584 Update buttons_helper.rb 2019-01-24 12:17:40 +13:00
Brenda Wallace
8bfe3278cc Include icon helper from button helper 2019-01-24 12:17:40 +13:00
Brenda Wallace
a54db7d5ff Tidied up the planting actions on gardens#index 2019-01-24 12:17:40 +13:00
Brenda Wallace
80e0d964e1 indentation clean up 2019-01-24 12:17:40 +13:00