Brenda Wallace
df5b0499e4
Update spec for api resource
2019-11-16 13:05:40 +13:00
Brenda Wallace
535ddcdcff
Added plantings to places map
2019-11-16 12:16:18 +13:00
Brenda Wallace
b8b579a5ba
rubycop fix up
2019-11-11 17:45:37 +13:00
codefactor-io
e0ea039347
[CodeFactor] Apply fixes to commit a651f07
2019-11-11 04:42:30 +00:00
Brenda Wallace
a651f079d8
Simplify garden.name validation regexp
2019-11-11 17:41:46 +13:00
Brenda Wallace
cfaa18daaf
Merge remote-tracking branch 'upstream/dev' into UTFGardenNames
2019-11-11 14:14:34 +13:00
Brenda Wallace
1a0e30491f
Removed unused methods
2019-10-24 19:04:37 +13:00
Brenda Wallace
6d6d1930d1
Merge branch 'dev' into planting-reminders
2019-10-21 15:53:25 +13:00
Brenda Wallace
94452ee62e
polish up the plantings reminders
2019-10-20 14:12:34 +13:00
Brenda Wallace
21848bf5b4
Merge branch 'dev' into role-admin
2019-10-19 09:42:49 +13:00
Brenda Wallace
fd39d6ef8c
More per page
2019-10-08 15:54:53 +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
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
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
Brenda Wallace
9c0c0eeb18
Merge branch 'dev' into post-comments
2019-09-27 08:13:33 +12:00
Brenda Wallace
66a3b2c52b
If we delete a photo, delete the associations records
2019-09-27 08:13:07 +12:00
Brenda Wallace
99e2ca4920
If a crop is deleted, delete association (gerund) records too
2019-09-27 08:13:07 +12:00
Brenda Wallace
719fec24d0
if someone is destroy, delete all likes
2019-09-27 08:13:07 +12:00
Brenda Wallace
685fddb2be
Merge remote-tracking branch 'origin/post-comments' into post-comments
2019-09-26 21:14:53 +12:00
Brenda Wallace
7acdc6c96f
Merge remote-tracking branch 'upstream/dev' into post-comments
...
Conflicts:
db/schema.rb
2019-09-26 21:14:12 +12:00
Brenda Wallace
fab9560c46
Apply suggestions from code review
2019-09-22 13:22:02 +12:00
Brenda Wallace
90035e79b8
Crop to post relationship made more rails standard
2019-09-22 10:07:50 +12:00
Brenda Wallace
b7321ed46f
Add source to photos
2019-09-20 22:26:39 +12:00
Brenda Wallace
5ded29ef7c
Allow anyone to view followers - and tidy up display
...
fixes #2106
2019-08-31 14:25:31 +12:00
Brenda Wallace
777408a6dc
Merge branch 'dev' into UTFGardenNames
2019-08-29 13:53:04 +12:00
Brenda Wallace
c173d359d8
Split up giant member model
2019-08-12 10:00:21 +12:00
Brenda Wallace
df87a79ab6
Only send email if user wants them
2019-08-12 09:40:53 +12:00
Brenda Wallace
e01b53fd9b
Remove extra validators on notification
...
We are migrating away from here
2019-08-11 15:52:11 +12:00
Brenda Wallace
3c073a950a
Reducing size of member model
2019-08-11 15:50:48 +12:00
Brenda Wallace
031734bb7f
shorten method
2019-08-11 14:24:43 +12:00
Brenda Wallace
3976d1a982
Shorten method
2019-08-11 14:24:17 +12:00
Brenda Wallace
4f74b20565
Migrate from notifications to conversations without sending emails
2019-08-11 14:17:30 +12:00
Brenda Wallace
2a3563f9fd
Migration from notifications to mailboxer
2019-08-11 13:37:56 +12:00
Brenda Wallace
5d7ef7e861
rubocop lint
2019-08-10 17:30:41 +12:00
Brenda Wallace
083d7c09e6
Migration of notifications to mailboxer, without sending new emails
2019-08-10 17:30:24 +12:00
Brenda Wallace
b3807100d1
fixes email sending
2019-08-10 11:47:45 +12:00
Brenda Wallace
d4644ccdf8
Added join to members to fix error caused by discard gem
2019-08-10 11:37:52 +12:00
Brenda Wallace
5226eadfd8
fix crop join to members
2019-08-10 11:07:12 +12:00
Brenda Wallace
86540c3352
Removed feature plantings code and spec
...
because it's not used
2019-08-10 10:52:49 +12:00
Brenda Wallace
bf77f31777
don't show progress bars on annuals
2019-07-28 14:28:08 +12:00
Brenda Wallace
17e3998261
Move from tables to lists
2019-07-23 11:27:53 +12:00
Brenda Wallace
e90d719436
fixed unread count on headers
2019-07-21 20:24:30 +12:00
Brenda Wallace
67ce5265b4
Migrate from paranoia to discard
...
closes #1995
2019-07-21 16:59:06 +12:00
Brenda Wallace
7d9cbe9bf7
Merge branch 'dev' into UTFGardenNames
2019-07-21 10:14:03 +12:00
Brenda Wallace
d91a5bf55f
Rewriting messages functionality to use mail boxer
2019-07-20 19:43:29 +12:00
Brenda Wallace
339b3fd57e
Moving to conversations and messages instead of notifications
2019-07-20 13:21:05 +12:00
Brenda Wallace
629352ef4f
Merge remote-tracking branch 'upstream/dev' into mailbox
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/application.scss
db/schema.rb
2019-07-20 13:20:10 +12:00
Brenda Wallace
548bbf5e57
Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations
...
Conflicts:
db/schema.rb
2019-07-16 12:12:16 +12:00
