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
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
e08daa0b2b
Merge branch 'dev' into post-comments
2019-09-26 21:51:17 +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
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
5fab14dc8a
Fixed associations view
2019-09-21 10:28:52 +12:00
Brenda Wallace
60ceef4fce
Only show photo associations if we have any
2019-09-21 09:43:36 +12:00
Brenda Wallace
367377088b
Fix specs for photo sources
2019-09-21 09:37:55 +12:00
Brenda Wallace
b7321ed46f
Add source to photos
2019-09-20 22:26:39 +12:00
Brenda Wallace
3cbb79981e
Merge pull request #2152 from Br3nda/display
...
🗑️ Removing unused styles
2019-09-10 00:25:07 +12:00
Brenda Wallace
f28958be18
Merge branch 'dev' into fix/2106-followers
2019-09-05 12:02:13 +12:00
Brenda Wallace
2d6c022d43
Merge branch 'dev' into display
2019-09-05 10:13:54 +12:00
Brenda Wallace
f16921d994
Remove extra whitespace
2019-09-01 21:22:59 +12:00
Brenda Wallace
4e9ba4f438
Merge css class
2019-09-01 20:50:57 +12:00
Brenda Wallace
f121f7f3fe
Place map on a high zindex, but below the menu
2019-09-01 20:41:12 +12:00
Brenda Wallace
c53015b922
Scss lint
2019-09-01 20:34:34 +12:00
Brenda Wallace
c122aa41d3
Scss lint
2019-09-01 20:30:19 +12:00
Brenda Wallace
2c75f62caf
Avoid using id selectors
2019-09-01 20:23:59 +12:00
Brenda Wallace
017a942a41
Rename classes to name codeclimate happy
2019-09-01 19:58:47 +12:00
Brenda Wallace
e4908fe299
Removing unused styles
2019-09-01 19:15:34 +12:00
Brenda Wallace
2a55f61a4c
Section padding
...
fixes #2105
2019-09-01 16:29:54 +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
e3f32d8bb4
Updated specs
2019-08-20 15:09:39 +00:00
