Thibaut Girka
|
571d219bb9
|
Merge branch 'master' into glitch-soc/merge-upstream
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
|
2019-01-02 15:36:53 +01:00 |
Eugen Rochko
|
6e49907ecf
|
Improve admin UI for account view (#9643)
|
2018-12-28 03:38:41 +01:00 |
|
Thibaut Girka
|
1c9c0167b7
|
Merge branch 'master' into glitch-soc/master
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
|
2018-05-10 00:03:28 +02:00 |
|
Eugen Rochko
|
c7d1a2e400
|
Improve admin UI for accounts (#7360)
* 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
|
2018-05-05 23:06:29 +02:00 |
kibigo!
|
bdbbd06dad
|
Finalized theme loading and stuff
|
2017-11-20 22:13:37 -08:00 |
abcang
|
4d42a38954
|
Improve admin page (#4121)
* Improve admin page
* Fix test
* Add spec
* Improve select style
|
2017-07-18 16:38:22 +02:00 |