 Awesome Code
|
7fb2690306
|
Auto corrected by following Style/MutableConstant
|
2018-01-13 22:51:04 +00:00 |
|
|
Shiny
|
6efdcb74d3
|
Merge branch 'dev' into charts-with-specs
|
2018-01-13 22:58:57 +13:00 |
|
|
Brenda Wallace
|
3a4443a4fe
|
Permissions (and specs) for charts json
|
2018-01-13 22:15:27 +13:00 |
|
|
Brenda Wallace
|
f4e87a974d
|
Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5
Conflicts:
app/views/gardens/show.html.haml
spec/controllers/photo_associations_controller_spec.rb
|
2018-01-11 16:10:36 +13:00 |
|
|
Daniel O'Connor
|
b172c5f242
|
Merge branch 'dev' into awesomecode-style/orassignment-7269
|
2018-01-11 10:01:38 +10:30 |
|
|
Awesome Code
|
1a4e0bd48a
|
Auto corrected by following Style/RescueStandardError
|
2018-01-10 20:18:17 +00:00 |
|
|
Awesome Code
|
bd32647178
|
Auto corrected by following Style/OrAssignment
|
2018-01-10 20:17:58 +00:00 |
|
|
Brenda Wallace
|
73ffbb0272
|
crop creator is optional
doesn't get set when crop has just been requested
|
2018-01-07 18:44:03 +13:00 |
|
|
Brenda Wallace
|
987400526e
|
Use distinct for plant parts
|
2018-01-06 12:32:04 +13:00 |
|
|
Brenda Wallace
|
e5beb066a0
|
Moved members.create_account_and_garden to private
|
2018-01-06 11:32:49 +13:00 |
|
|
Brenda Wallace
|
7bb49f337f
|
Fixing up member's account model creation, post rails 5 upgrade
|
2018-01-06 11:31:04 +13:00 |
|
|
Brenda Wallace
|
a0fe19651e
|
Plant parts model using distinct query
|
2018-01-06 09:31:39 +13:00 |
|
|
Brenda Wallace
|
62fd16e6b2
|
Notifications don't have a post if they are a message
|
2018-01-06 09:01:18 +13:00 |
|
|
Brenda Wallace
|
090bc02269
|
belongs_to defaults to required. setting some to optional
|
2018-01-04 14:55:36 +13:00 |
|
|
Brenda Wallace
|
d456d045cd
|
Changed order of photo association relationship declarations
|
2018-01-03 17:24:51 +13:00 |
|
|
Brenda Wallace
|
4917ab9ae8
|
Fixed order->member relationship, after change to paranoia gem
|
2018-01-03 17:21:40 +13:00 |
|
|
Brenda Wallace
|
b6c9b13d4d
|
Models inherit from application record
|
2018-01-03 17:16:14 +13:00 |
|
|
Brenda Wallace
|
f4af682d45
|
Updated code for Rail 5
|
2018-01-03 17:12:17 +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 |
|