Brenda Wallace
2460f73673
Merge branch 'dev' into fix/coverage
2018-04-02 10:21:22 +12:00
Brenda Wallace
324dcfc821
Merge pull request #1598 from Growstuff/bundle-update-2018-03-22-131347
...
Bundle Update on 2018-03-22
2018-04-02 10:21:04 +12:00
Brenda Wallace
e3bb43477b
Adding counter caches and ownable concern
2018-04-02 10:13:19 +12:00
Brenda Wallace
2d309b7645
Removing jasmine, we have no jasmine specs
2018-04-02 09:58:02 +12:00
Brenda Wallace
a59f7dd137
Merge branch 'dev' into fix/coverage
2018-04-02 09:50:11 +12:00
Brenda Wallace
1fb3c4e0f9
Regnerated and secured code climate key
2018-04-02 09:47:04 +12:00
Brenda Wallace
b64a294245
Removed duplicate margins in css
2018-04-01 18:45:35 +12:00
Brenda Wallace
31d2aa052a
More bundle updates
2018-04-01 14:16:50 +12:00
Brenda Wallace
b7f78d5dc9
Fix ordering of recent plantings on crops#show
2018-04-01 13:05:23 +12:00
Brenda Wallace
f1afe1ca79
Expanding layout to use full screen
2018-04-01 12:44:59 +12:00
Brenda Wallace
e029ef17ab
Merge remote-tracking branch 'upstream/dev' into dev
2018-04-01 09:21:37 +12:00
Brenda Wallace
d5c8b9ae27
Merge branch 'dev' into bundle-update-2018-03-22-131347
2018-03-31 18:15:25 +13:00
Brenda Wallace
f907ba9e4b
Merge pull request #1599 from Growstuff/dev
...
Release 43
2018-03-30 16:14:06 +13:00
Brenda Wallace
25070f73d7
Merge pull request #1591 from Br3nda/feature/photos-helper
...
Use photos helpers to find photos
2018-03-26 18:14:32 +13:00
Brenda Wallace
2fe6012342
Merge branch 'dev' into feature/photos-helper
2018-03-23 15:03:01 +13:00
deppbot
61468b3587
Bundle Update on 2018-03-22
2018-03-22 13:13:48 +08:00
Brenda Wallace
58c4d82087
Merge pull request #1590 from Growstuff/dev
...
Release 42
2018-03-22 15:01:52 +13:00
deppbot
c80685bf0d
Security Update on 2018-03-20 ( #1597 )
...
* Security Update on 2018-03-20
* Ordered gems, to please rubocop
2018-03-22 14:14:19 +13:00
Brenda Wallace
69018f2c5c
Merge remote-tracking branch 'upstream/dev' into dev
2018-03-22 11:53:29 +13:00
Brenda Wallace
00ea96a73e
Can't rename GROWSTUFF_ELASTICSEARCH
2018-03-20 11:35:01 +13:00
Brenda Wallace
a1e33ae36e
Only set up database and assets in test run, not linter run
2018-03-20 11:13:11 +13:00
Brenda Wallace
7f24927dc9
Clean up errors on undefined shell vars
2018-03-20 11:06:37 +13:00
Brenda Wallace
a178d3d42a
Fix ES install on travis
2018-03-19 18:02:26 +13:00
Brenda Wallace
6089198f5c
fixed path to scripts
2018-03-19 17:52:25 +13:00
Brenda Wallace
715ff4d41d
Merge branch 'dev' into fix/coverage
2018-03-19 17:47:01 +13:00
Brenda Wallace
5992c974c7
Adding codeclimate coverage
2018-03-19 17:08:04 +13:00
Brenda Wallace
511e89fa58
Merge branch 'dev' into feature/photos-helper
2018-03-19 13:39:02 +13:00
Daniel O'Connor
13d8a29773
Merge pull request #1592 from Br3nda/fix/layout
...
Layout fixes for mobile and smaller screens
2018-03-19 10:38:12 +10:30
Brenda Wallace
dc09a6ea91
Merge branch 'dev' into fix/layout
2018-03-16 14:55:03 +13:00
Brenda Wallace
f8e83cdb9c
Merge branch 'dev' into feature/photos-helper
2018-03-16 14:54:53 +13:00
deppbot
64a8cfb59f
Security Update on 2018-03-16 ( #1593 )
2018-03-16 14:54:36 +13:00
Brenda Wallace
2f81d6c78d
Layout fixes for mobile and smaller screens
2018-03-15 23:01:51 +13:00
Brenda Wallace
ece7113c89
DRY photo helper spec
2018-03-15 22:56:32 +13:00
Brenda Wallace
8941c577e4
Specs for photos helper
2018-03-14 22:25:30 +13:00
Brenda Wallace
1bf1076076
Photos helper
2018-03-14 19:28:18 +13:00
Brenda Wallace
8906fd38ae
For seeds, use planting photo if no seeds photo
2018-03-14 15:21:40 +13:00
Daniel O'Connor
d5be92ac8b
Merge pull request #1588 from Br3nda/fix/photo-order-1547
...
Fix/photo order 1547
2018-03-13 00:22:35 +10:30
Brenda Wallace
40d71ae070
Merge branch 'dev' into fix/photo-order-1547
2018-03-12 11:41:12 +13:00
Brenda Wallace
2f45041f8c
Fixed ordering of photos on crops#show
2018-03-12 08:56:39 +13:00
Brenda Wallace
f9d4e1d6ae
Ancestry of food. Seeds -> Planting -> Seeds -> Planting ( #1550 )
...
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
2018-03-12 08:39:32 +13:00
Brenda Wallace
80203ad215
Merge pull request #1585 from Growstuff/dev
...
Release 41
2018-03-11 14:03:50 +13:00
Brenda Wallace
8c51d7bdd5
Merge branch 'master' into dev
2018-02-18 13:09:56 +13:00
Cesy
64e3b3b4d4
Merge pull request #1565 from Growstuff/awesomecode-style/andor-8234
...
Auto corrected by following Style/AndOr
2018-02-16 08:47:02 +00:00
Brenda Wallace
978523fd94
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-11 08:50:50 +13:00
Brenda Wallace
97f63d1147
Merge pull request #1583 from Growstuff/dev
...
Production hotfix
2018-02-11 08:42:49 +13:00
Brenda Wallace
1a9ff5eb4c
Merge branch 'master' into dev
2018-02-11 08:14:44 +13:00
Brenda Wallace
72b1494db9
Merge pull request #1582 from Br3nda/hotfix-migration
...
Don't update flickr photos in migration
2018-02-11 08:14:00 +13:00
Brenda Wallace
83bba916a4
Don't update flickr photos in migration
2018-02-10 18:41:11 +13:00
Brenda Wallace
64179850ff
Merge pull request #1563 from Growstuff/dev
...
Release 40
2018-02-10 09:04:55 +13:00
Brenda Wallace
9cdf2e899f
Merge pull request #1569 from Br3nda/remove/paid-accounts
...
Removing shop, products, accounts, orders
2018-02-09 11:09:36 +13:00
Brenda Wallace