Brenda Wallace
627d97155f
Tidy up
2019-10-24 19:59:18 +13:00
Brenda Wallace
329262e2f5
show "finished" when planting is finished
2019-10-24 19:45:08 +13:00
Brenda Wallace
5d4f1abacd
show unknown date when unknown finish date
2019-10-24 19:44:58 +13:00
Brenda Wallace
f7f3ac695f
better name for css class progress-fade
2019-10-24 19:16:41 +13:00
Brenda Wallace
a1479c9126
fixed call to missing method
2019-10-24 19:13:41 +13:00
Brenda Wallace
dfe533dda1
DRY and tidy
2019-10-24 19:13:20 +13:00
Brenda Wallace
f4c4e1c93f
Collapse crop card content
2019-10-24 19:10:44 +13:00
Brenda Wallace
1a0e30491f
Removed unused methods
2019-10-24 19:04:37 +13:00
Brenda Wallace
053a33cd72
Removed commented out code
2019-10-24 18:58:50 +13:00
Brenda Wallace
0cc62c2b98
show planted_at, even when we can't predict finish
2019-10-24 18:57:16 +13:00
Brenda Wallace
38713af603
plantings timeline with icons
2019-10-24 16:36:16 +13:00
Brenda Wallace
ae48844d87
Merge branch 'dev' into search
2019-10-23 15:55:27 +13:00
Brenda Wallace
c6f4eef291
Show more results in searches
2019-10-21 16:24:31 +13:00
Brenda Wallace
6d6d1930d1
Merge branch 'dev' into planting-reminders
2019-10-21 15:53:25 +13:00
Brenda Wallace
798883be1c
Typo/spelling fix
2019-10-21 14:45:21 +13:00
Brenda Wallace
abd91fa37b
Use bang! to indicate method can explode
2019-10-21 14:43:46 +13:00
Brenda Wallace
47be6ad631
Merge branch 'dev' into role-admin
2019-10-21 14:24:31 +13:00
Brenda Wallace
8c694b3dca
Only show companions of active plantings
2019-10-21 14:19:47 +13:00
Brenda Wallace
e1faedfc78
Merge branch 'dev' into planting-reminders
2019-10-20 21:36:42 +13:00
Brenda Wallace
ca11792286
Only show companions of active plantings
2019-10-20 14:13:30 +13:00
Brenda Wallace
94452ee62e
polish up the plantings reminders
2019-10-20 14:12:34 +13:00
Brenda Wallace
e0dc38e7a3
add perennials
2019-10-20 09:49:03 +13:00
Brenda Wallace
4af89d2b2c
Change reminder email into monthly summary
2019-10-20 09:49:03 +13:00
Brenda Wallace
d81df50dc5
Suggest companions for a garden based on existing crops
2019-10-19 18:45:11 +13:00
Brenda Wallace
bb72d2b974
Fix bug showing plantings with no planted_at
2019-10-19 18:20:01 +13:00
Brenda Wallace
f2dc2aeaa0
Merge branch 'dev' into feature-2207
2019-10-19 16:01:11 +13:00
Brenda Wallace
95ec89f6a0
Merge branch 'dev' into role-admin
2019-10-19 13:23:25 +13:00
Brenda Wallace
0965168750
Group previous plantings by year
2019-10-19 11:25:19 +13:00
Brenda Wallace
fc07571ee1
Rename is_admin? to admin?.
2019-10-19 10:25:17 +13:00
Brenda Wallace
35c9b70bc9
Remove email from display in admin/members
2019-10-19 10:23:39 +13:00
Brenda Wallace
5a6d0f6342
Check admin before roles controller runs
2019-10-19 10:22:27 +13:00
Brenda Wallace
2ddddb1652
Updated specs for admin editing roles
2019-10-19 10:16:02 +13:00
Brenda Wallace
dc3bc85777
Remove comments
2019-10-19 09:44:05 +13:00
Brenda Wallace
1a34bfb9a2
Merge remote-tracking branch 'origin/role-admin' into role-admin
2019-10-19 09:43:12 +13:00
Brenda Wallace
21848bf5b4
Merge branch 'dev' into role-admin
2019-10-19 09:42:49 +13:00
Brenda Wallace
a6cb81f4d1
Widen gardens on gardens#index
2019-10-19 09:41:43 +13:00
Brenda Wallace
80b82a99fe
Fix broken spec on dev
2019-10-19 09:41:09 +13:00
Brenda Wallace
88a771459c
Merge branch 'dev' into role-admin
2019-10-18 09:43:44 +13:00
Brenda Wallace
fd39d6ef8c
More per page
2019-10-08 15:54:53 +13:00
codefactor-io
6d472c5d66
[CodeFactor] Apply fixes
2019-10-07 23:35:39 +00:00
Brenda Wallace
f77a0e37b9
Merge branch 'dev' into role-admin
2019-10-08 11:22:13 +13:00
Brenda Wallace
b0c8b11246
📝 Inline editing and display tidy ups ( #2200 )
...
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
bestest-mensch
1e1b9f5ef5
scope conversations delete multiple to current user
2019-10-07 21:38:19 +00:00
bestest-mensch
80fb4f5fe6
add ability to delete multiple conversations at once
2019-10-07 21:38:19 +00:00
bestest-mensch
d39dc65c4e
small ui tweak
2019-10-06 04:08:09 +00:00
Brenda Wallace
3422a0d899
Administer member's roles
2019-10-06 14:19:39 +13:00
Brenda Wallace
f297fdc677
Inline editing and display tidy ups
2019-10-05 20:58:00 +13:00
Brenda Wallace
3eb30a5555
Removed duplicate crop info
2019-09-28 17:44:37 +12:00
Brenda Wallace
7b5698f977
👩🌾 Import openfarm data ( #2177 )
...
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
2019-09-28 17:23:25 +12:00
Brenda Wallace
6a4158ae04
👭 Crop companions ( #2176 )
...
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
2019-09-28 10:38:01 +12:00
