mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-30 04:01:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,011 Commits 62 Branches 76 Tags
2f5de1f98e3791870561663dfb4daff2e46a48fc
Commit Graph

6011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
2f5de1f98e Merge branch 'dev' into garden-overview 2019-02-12 11:28:45 +13:00
pozorvlak
378dd52b1f Merge pull request #1818 from Br3nda/contributors-bots 
Fixes checking for github bots in contributors
 2019-02-11 10:38:47 +00:00
pozorvlak
f83b8e71f1 Merge branch 'dev' into contributors-bots 2019-02-11 10:17:09 +00:00
Awesome Code
3efc0caaf7 Auto corrected by following Lint Ruby EmptyLine 2019-02-11 11:02:33 +13:00
Awesome Code
689baa85a3 Auto corrected by following Lint Ruby RSpec/ExampleWording 2019-02-11 10:17:54 +13:00
Awesome Code
29ee362bfa Auto corrected by following Lint Ruby Space 2019-02-11 09:28:43 +13:00
Awesome Code
490db7b342 Auto corrected by following Lint Ruby RSpec/HookArgument 2019-02-11 09:00:34 +13:00
Brenda Wallace
a320826abd Merge pull request #1834 from Growstuff/awesomecode-lint-ruby-rspec-returnfromstub-28915 
Auto corrected by following Lint Ruby RSpec/ReturnFromStub
 2019-02-11 08:02:53 +13:00
Brenda Wallace
db58abc520 Merge branch 'dev' into awesomecode-lint-ruby-rspec-returnfromstub-28915 2019-02-11 07:37:21 +13:00
Brenda Wallace
37b1c17ca9 Merge pull request #1835 from Growstuff/awesomecode-lint-ruby-rspec-sharedcontext-28915 
Auto corrected by following Lint Ruby RSpec/SharedContext
 2019-02-11 07:36:55 +13:00
Brenda Wallace
380b0ffa6c Merge branch 'dev' into awesomecode-lint-ruby-rspec-sharedcontext-28915 2019-02-11 00:24:20 +13:00
Awesome Code
bbd34c5e7b Auto corrected by following Lint Ruby RSpec/SharedContext 2019-02-10 09:24:19 +00:00
Awesome Code
54798190a7 Auto corrected by following Lint Ruby RSpec/ReturnFromStub 2019-02-10 09:24:07 +00:00
Awesome Code
49eed9b208 Auto corrected by following Lint Ruby RSpec/LetBeforeExamples 2019-02-10 09:24:00 +00:00
Awesome Code
e32a8bd6ac Auto corrected by following Lint Ruby RSpec/HooksBeforeExamples 2019-02-10 09:23:43 +00:00
Brenda Wallace
e9d81f7f32 Merge branch 'dev' into garden-overview 2019-02-09 19:13:46 +13:00
Brenda Wallace
29da3f7ff1 Merge branch 'dev' into contributors-bots 2019-02-09 19:13:26 +13:00
Brenda Wallace
3f68131ed1 Merge pull request #1820 from Growstuff/dependabot/bundler/devise-4.6.0 
Bump devise from 4.5.0 to 4.6.0
 2019-02-09 19:13:05 +13:00
Brenda Wallace
9be4bf2685 Merge branch 'dev' into garden-overview 2019-02-09 17:00:07 +13:00
Brenda Wallace
68d9b9c50c Merge branch 'dev' into contributors-bots 2019-02-09 16:59:45 +13:00
Awesome Code
284bb81bbf Auto corrected by following Lint Ruby RSpecEmptyLine 2019-02-09 03:05:40 +00:00
Brenda Wallace
93835b3ee6 Javascript lint 2019-02-09 15:21:30 +13:00
Brenda Wallace
67b23d8e2c Merge branch 'dev' into garden-overview 2019-02-09 15:17:09 +13:00
Brenda Wallace
63b8554435 Added missing semicolon 2019-02-09 15:16:53 +13:00
dependabot[bot]
228253113f Bump devise from 4.5.0 to 4.6.0 
Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.5.0...v4.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-09 01:28:51 +00:00
Brenda Wallace
6902f30bb8 Merge branch 'dev' into contributors-bots 2019-02-09 14:26:53 +13:00
Brenda Wallace
ac577486e1 Merge branch 'master' into dev 2019-02-09 14:26:26 +13:00
Brenda Wallace
6e1972717f Merge pull request #1826 from Growstuff/awesomecode-lint-ruby-emptyline-28892 
Auto corrected by following Lint Ruby EmptyLine
 2019-02-09 14:26:11 +13:00
Brenda Wallace
18d7ae2953 Further tidy up of the planting quick action buttons 2019-02-09 14:24:51 +13:00
Brenda Wallace
95db0f7297 Shortened the text on the badges 2019-02-09 14:18:15 +13:00
Brenda Wallace
ec4b443d8c Tool tips 2019-02-09 14:13:07 +13:00
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
Brenda Wallace
61548e02d1 Merge branch 'dev' into contributors-bots 2019-02-09 11:03:36 +13:00
Awesome Code
404fafd700 Auto corrected by following Lint Ruby EmptyLine 2019-02-08 21:10:48 +00:00
Awesome Code
39a7de8754 Auto corrected by following Lint Ruby EmptyLine 2019-02-08 20:26:29 +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
cde61a1c4f Use Regex to search for author 2019-02-09 09:04:24 +13:00
Brenda Wallace
bffbd94462 Read the file contents in ruby 2019-02-09 09:03:34 +13:00
Brenda Wallace
9a4f1058e1 Adding more attributes and filters to the api 2019-02-09 08:43:59 +13:00
Brenda Wallace
c8e5cecaf6 Fixes checking for github bots in contributors 2019-02-08 09:51:41 +13:00
Brenda Wallace
452007dc5d Merge pull request #1817 from Growstuff/dev 
Release to production
 2019-02-07 18:57:56 +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