Brenda Wallace
cf0485c448
fix mobile display
2019-11-19 14:25:14 +13:00
Brenda Wallace
72e348cdf6
Fix up specs
2019-11-19 14:16:50 +13:00
Brenda Wallace
8fb4725f46
Merge remote-tracking branch 'upstream/dev' into api-docs
...
Conflicts:
app/resources/api/v1/planting_resource.rb
2019-11-18 10:26:05 +13:00
Brenda Wallace
0823e971ed
Tidy up indexes and add links to data/api
2019-11-18 10:23:07 +13:00
Brenda Wallace
df55a5b0a8
Add marker for leaflet maps, and use asset pipeline to serve file
2019-11-16 10:42:22 +13:00
Brenda Wallace
69d9e1e76e
Merge pull request #2271 from Br3nda/jump-to-garden
...
Link to jump to garden
2019-11-15 12:16:39 +13:00
Brenda Wallace
cfef6f5eb2
Link to jump to garden
2019-11-15 11:47:32 +13:00
Brenda Wallace
75037c7e21
Order the garden names
2019-11-15 11:32:13 +13:00
Brenda Wallace
d0bee45c0c
show all varieties (including grandchildren)
2019-11-01 21:33:43 +13:00
Brenda Wallace
b214f7ad8d
linking existing plantings to their parent seeds
2019-11-01 02:23:14 +00:00
Brenda Wallace
2f2169f89a
tidy up display of seeds
2019-10-28 22:12:08 +13:00
Brenda Wallace
b2e90cddc6
Merge branch 'dev' into weeks
2019-10-25 13:41:30 +13:00
André Aubin
66045866b3
Switch to HTTPS for Gravatar urls
2019-10-24 23:51:52 +00:00
Brenda Wallace
9d232e26cb
Update app/views/crops/_predictions.html.haml
2019-10-25 06:42:00 +13:00
Brenda Wallace
2d6d02d0b3
added in_weeks helper
2019-10-24 21:03:30 +13:00
Brenda Wallace
95ae4d41ba
rounding on weeks
2019-10-24 20:58:13 +13:00
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
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
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
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
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
35c9b70bc9
Remove email from display in admin/members
2019-10-19 10:23:39 +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
b0c8b11246
📝 Inline editing and display tidy ups ( #2200 )
...
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13: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
