Brenda Wallace
a437338961
Fix markers on crops#show map
2019-11-16 11:35:45 +13:00
Brenda Wallace
b214f7ad8d
linking existing plantings to their parent seeds
2019-11-01 02:23:14 +00:00
Brenda Wallace
c6f4eef291
Show more results in searches
2019-10-21 16:24:31 +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
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
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
80b82a99fe
Fix broken spec on dev
2019-10-19 09:41:09 +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
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
5072353293
Only save location (used for post-signin redirect) if this is a format html page
2019-09-26 21:50:42 +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
b3520a1b3f
Search for members in admin/members#index
2019-08-20 15:09:39 +00:00
Brenda Wallace
586bc21e93
Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions
...
Conflicts:
spec/features/members/profile_spec.rb
spec/features/notifications_spec.rb
spec/features/percy/percy_spec.rb
2019-08-17 16:09:32 +12:00
Brenda Wallace
b2d8818ae1
don't notify wranglers if there are none
2019-08-17 14:43:32 +12:00
Brenda Wallace
109f9af0b9
Unread counts
2019-08-11 17:04:52 +12:00
Brenda Wallace
82a3cc35a4
Fix member discarding to match specs
2019-08-10 15:43:06 +12:00
Brenda Wallace
c29f0c15ee
don't join to owners when fetching gardens
...
discard isn't the same
2019-08-10 10:39:40 +12:00
Brenda Wallace
1dfbecfac0
Don't re-look up planting
2019-08-09 22:32:36 +12:00
Brenda Wallace
21b63d9b62
lint
2019-08-07 22:36:43 +12:00
Brenda Wallace
2f0e387646
rubocop lint
2019-08-07 22:33:39 +12:00
Brenda Wallace
83322becb2
Use guard clause
2019-08-07 22:33:01 +12:00
Brenda Wallace
cafbfb349f
Delete and restore buttons
2019-08-07 22:18:24 +12:00
Brenda Wallace
4a8f737bac
Revert "Removed chekcing subject in converation"
...
This reverts commit 6622319466
2019-07-23 09:50:37 +12:00
Brenda Wallace
6622319466
Removed chekcing subject in converation
2019-07-23 09:47:16 +12:00
Brenda Wallace
3db63aeabf
untrash a message
2019-07-21 20:05:06 +12:00
Brenda Wallace
a9b8003ff3
DRY
2019-07-21 19:23:33 +12:00
Brenda Wallace
6b501f13ee
Fixed double negative
2019-07-21 19:22:25 +12:00
Brenda Wallace
0ac243e129
Remove unused methods
2019-07-21 19:21:55 +12:00
Brenda Wallace
6f2e27952c
Remove unused methods
2019-07-21 19:21:34 +12:00
Brenda Wallace
2b9538c407
Use a guard clause
2019-07-21 19:21:13 +12:00
Brenda Wallace
733a8642dd
rubocop lint
2019-07-21 19:19:14 +12:00
Brenda Wallace
754da0777a
preserve which box we're looking at while deleting messages
2019-07-21 19:13:51 +12:00
Brenda Wallace
d382f84f9b
Remove notifications code
2019-07-21 17:28:04 +12:00
Brenda Wallace
eda3639708
Discard members on ban
2019-07-21 17:23:28 +12:00
Brenda Wallace
67ce5265b4
Migrate from paranoia to discard
...
closes #1995
2019-07-21 16:59:06 +12:00
Brenda Wallace
7f16fdfe53
working on display of messages in conversations
2019-07-21 15:29:54 +12:00
