mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-06 23:27:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
43bb606a2b Cleaning up small screen presentation 2019-03-29 15:48:47 +13:00
Brenda Wallace
830b554dc9 Test updates 2019-03-29 11:28:17 +13:00
Brenda Wallace
e4d4cdc3fa Fix up seed description helper 2019-03-29 10:45:51 +13:00
Brenda Wallace
cb91b43d25 Fix deprecation warning 2019-03-29 10:29:05 +13:00
Brenda Wallace
bab9c01bf5 Updating tests 2019-03-29 10:25:30 +13:00
Brenda Wallace
9be4c4179f Updating specs 2019-03-28 15:49:39 +13:00
Brenda Wallace
5722859a24 Move notes higher 2019-03-28 10:01:05 +13:00
Brenda Wallace
2bc12570c4 Consistent display of seeds/harvests 2019-03-27 22:38:28 +13:00
Brenda Wallace
0c9702e1a4 Move photo query, so we use eager loading 2019-03-27 22:28:06 +13:00
Brenda Wallace
562a7b1a10 Merge remote-tracking branch 'origin/plantings-show' into plantings-show 2019-03-27 21:19:43 +13:00
Brenda Wallace
626d5f8d7c Move harvest and seeds to the right on plantings#show 2019-03-27 21:19:35 +13:00
Brenda Wallace
d35dfeea21 Show date taken, not data the database record was created 2019-03-27 21:19:22 +13:00
Brenda Wallace
984da54534 Merge branch 'dev' into plantings-show 2019-03-27 21:13:28 +13:00
Brenda Wallace
3ced3da682 Merge branch 'dev' into feature/memcachier 2019-03-27 21:06:23 +13:00
Brenda Wallace
9c231703ab Merge pull request #1888 from Growstuff/dependabot/bundler/devise-4.6.2 
Bump devise from 4.6.1 to 4.6.2
 2019-03-27 21:06:00 +13:00
Brenda Wallace
e7b0b6f18e Remove table display on plantings#show, replace with boxes 2019-03-27 21:04:56 +13:00
dependabot[bot]
2126863632 Bump devise from 4.6.1 to 4.6.2 
Bumps [devise](https://github.com/plataformatec/devise) from 4.6.1 to 4.6.2.
- [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.6.1...v4.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 07:46:45 +00:00
dependabot[bot]
566308a49d Merge pull request #1887 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.6 2019-03-26 10:00:26 +00:00
Brenda Wallace
1e0f308db2 Merge branch 'dev' into UTFGardenNames 2019-03-26 22:43:56 +13:00
Brenda Wallace
0717e0a00d Merge branch 'dev' into feature/memcachier 2019-03-26 22:42:45 +13:00
dependabot[bot]
9222782808 Bump jsonapi-resources from 0.9.5 to 0.9.6 
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.5 to 0.9.6.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.5...v0.9.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 09:39:24 +00:00
Brenda Wallace
dcbc0ecdff Merge branch 'master' into dev 2019-03-26 22:36:54 +13:00
Brenda Wallace
c059c46833 Merge pull request #1747 from brandonbaker40/bb-track-types-of-gardens 
tracks types of gardens
 2019-03-26 22:34:48 +13:00
Brenda Wallace
8d579a4616 Gardens have descriptions 2019-03-26 22:27:10 +13:00
Brenda Wallace
1e240cf4b8 replace a rubocop ignore 2019-03-26 22:12:09 +13:00
Brenda Wallace
2d2304d8c0 Rubocop lint 2019-03-26 22:07:54 +13:00
Brenda Wallace
5d32bc8010 don't allow spaces in slug 2019-03-26 22:07:47 +13:00
Brenda Wallace
e369b93384 Pass params to garden spec - for rails 5 2019-03-26 22:07:35 +13:00
Brenda Wallace
09dc928250 Update model specs to not use should 2019-03-26 22:07:07 +13:00
Brenda Wallace
95d2aa221f Removed plot spec 2019-03-26 22:06:53 +13:00
Brenda Wallace
55f6636da5 change "required" to "optional" 2019-03-26 22:06:41 +13:00
Brenda Wallace
8a900b2e87 Update garden_Types controller spec for rails 5 2019-03-26 21:48:38 +13:00
Brenda Wallace
e5ee89c865 garden_types.description becomes garden_type.name 2019-03-26 21:43:34 +13:00
Brenda Wallace
48022fb541 nullify gardens.garden_type when garden_type is destroyed 2019-03-26 21:18:14 +13:00
Brenda Wallace
1fe5f67aa1 Update garden_type model spec 2019-03-26 21:14:31 +13:00
Brenda Wallace
63edfa36df Gardens have garden_Types in specs 2019-03-26 21:13:12 +13:00
Brenda Wallace
c71da41d43 Update controller spec 2019-03-26 21:12:20 +13:00
Brenda Wallace
cc88f5c6c7 Update subtitler 2019-03-26 21:11:25 +13:00
Brenda Wallace
629ffa1982 Update translations 2019-03-26 21:10:40 +13:00
Brenda Wallace
721a8694a0 Removing plots 2019-03-26 21:09:26 +13:00
Brenda Wallace
b51072fd00 Update test from containers to garden_types 2019-03-26 21:06:22 +13:00
Brenda Wallace
b446e44ac0 Moved garden types to admin menu 2019-03-26 21:02:48 +13:00
Brenda Wallace
5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace
02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens 2019-03-26 19:35:16 +13:00
Brenda Wallace
de2fa81aae Remove staging env from bundle 2019-03-26 15:57:30 +13:00
Brenda Wallace
8e8c9d179b Added growstuff prefix to env variables 2019-03-26 15:57:29 +13:00
Brenda Wallace
607f0e3887 Rename to mapbox map id 2019-03-26 15:57:29 +13:00
Brenda Wallace
875fa49d44 Remove distinct staging env file 2019-03-26 15:57:29 +13:00
Brenda Wallace
ba27e14226 Move mapbox config to env 2019-03-26 15:57:29 +13:00
Brenda Wallace
59b3a68fc3 Configure memcachier for production 2019-03-26 15:57:29 +13:00