Brenda Wallace
03c9151ecd
Merge branch 'dev' into feature/ownable
2018-04-03 08:46:34 +12:00
pozorvlak
d0f6d63d36
Merge branch 'dev' into fix/dependents
2018-04-02 15:26:07 +01:00
pozorvlak
a7cfecf82c
Merge branch 'dev' into feature/ownable
2018-04-02 14:47:48 +01:00
Brenda Wallace
106d187e67
Add dependent clauses on crop model
2018-04-02 10:29:10 +12:00
Brenda Wallace
e3bb43477b
Adding counter caches and ownable concern
2018-04-02 10:13:19 +12:00
Brenda Wallace
f1afe1ca79
Expanding layout to use full screen
2018-04-01 12:44:59 +12:00
Brenda Wallace
8941c577e4
Specs for photos helper
2018-03-14 22:25:30 +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
42de726405
Removing shop, products, accounts, orders
2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1
Revert "Auto corrected by following Style/StringLiterals"
...
This reverts commit ab56a3c6b3
2018-02-09 07:58:47 +13:00
Awesome Code
ab56a3c6b3
Auto corrected by following Style/StringLiterals
2018-02-07 10:20:26 +13:00
Brenda Wallace
88da0da616
Re-fetches from flickr
2018-02-05 12:52:59 +13:00
Meir Taffel
a69afd87e7
Add date_taken to photos
2018-02-05 12:52:59 +13:00
Brenda Wallace
7f87ee1018
Fixed default_photo for seeds - uses own photos, not the crop
2018-01-29 09:55:06 +13:00
Awesome Code
46267b2a1d
Auto corrected by following Style/MutableConstant
2018-01-23 09:00:34 +13:00
Brenda Wallace
9db4736229
Permissions (and specs) for charts json
2018-01-23 09:00:34 +13:00
Awesome Code
3391f6c392
Auto corrected by following Style/RescueStandardError
2018-01-23 09:00:34 +13:00
Awesome Code
0c8240d4e8
Auto corrected by following Style/OrAssignment
2018-01-23 09:00:34 +13:00
Brenda Wallace
4c35987cb7
Ignore long method in ability.rb
2017-12-17 17:57:19 +13:00
Brenda Wallace
54e0806f38
don't check role is there's no member
2017-12-17 17:55:14 +13:00
Brenda Wallace
01a7463ae8
Split up ability.rb into methods
2017-12-17 12:47:41 +13:00
Shiny
8c1514bc04
Merge branch 'dev' into feature/photos-1457
2017-12-15 17:13:12 +13:00
Brenda Wallace
3d3a3b669e
Order posts by most recent
2017-12-15 13:28:41 +13:00
Brenda Wallace
8697e56323
Order the plantings on the front page
2017-12-15 13:26:48 +13:00
Brenda Wallace
14551b6ec8
Merge remote-tracking branch 'upstream/dev' into feature/photos-1457
...
Conflicts:
spec/models/crop_spec.rb
2017-12-09 20:59:20 +13:00
Shiny
96bb345ca9
Merge branch 'dev' into ordering
2017-12-08 20:20:27 +13:00
Brenda Wallace
8d03a3ffa8
Most recent photos is a crop's default photo
2017-12-06 21:47:01 +13:00
Brenda Wallace
a6a7f789a3
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
Brenda Wallace
14b16b0d8c
Moved photo.items's item lookup to a class method
2017-11-30 11:23:34 +13:00
Brenda Wallace
ff57176d60
Simplified the photos controller a bit
2017-11-29 22:13:03 +13:00
Brenda Wallace
12700d6268
Added polymorphic relationship to photos
2017-11-29 21:41:22 +13:00
Brenda Wallace
9e00023332
Fixed post ordering
2017-11-29 20:59:37 +13:00
Brenda Wallace
d0b8ae3411
Delete follows records when a member is deleted
2017-11-29 20:59:37 +13:00
Brenda Wallace
33816d4312
Use faker gem, in account types - and add controller specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
00e6aeed5c
seed.tradable was back to front logic. fixed
2017-11-29 20:59:37 +13:00
Brenda Wallace
0205b345d0
A planting's photo is their most recent photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
9f8a32e9f8
Feature plantings need to be ordered
2017-11-29 20:59:37 +13:00
Brenda Wallace
7357524271
Garden's default photo should be the most recent photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
4bed6da422
Crop validation methods can be private
2017-11-29 20:59:37 +13:00
Brenda Wallace
023c870d49
Fix up crop.recent
2017-11-29 20:59:37 +13:00
Brenda Wallace
9aff65e956
Added ordering to finding first photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
7719d1f896
Remote default ordering scopes, and clean up models
2017-11-29 20:59:37 +13:00
Brenda Wallace
17fd6f61a5
Added polymorphic relationship to photos
2017-11-29 20:14:27 +13:00
Brenda Wallace
13e8d1f5a5
Merge remote-tracking branch 'upstream/dev' into api
2017-11-17 21:51:39 +13:00
Brenda Wallace
c1836cc78e
Removed un-used method, to reduce class size
2017-11-17 21:50:59 +13:00
Brenda Wallace
28fdb6e1ed
Reducing class line count
2017-11-17 21:50:59 +13:00
Brenda Wallace
86ea8eab39
Reducing crop class size
2017-11-17 21:50:59 +13:00
Brenda Wallace
8884056ff3
Run existing crop specs with annual crop
2017-11-17 21:50:59 +13:00
Brenda Wallace
d8f5876518
Added predictions to planting api, and added specs
2017-11-13 19:19:18 +13:00
Brenda Wallace
a2ae429f6b
If a harvest has a planting, it must have the same owner
2017-11-13 19:18:14 +13:00
