| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
|
|
|
|
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
|
|
* Improve design of account statuses admin UI (consistent with reports)
* Make account moderation notes look consistent with report notes
* i18n-tasks remove-unused
* Fix code style issues
* Fix tests
|
|
|
|
* Improve admin page
* Fix test
* Add spec
* Improve select style
|
