Commit graph

1073 commits

Author SHA1 Message Date
Maxim Filippov
0cae34b62d Merge branch 'feature/stats' into 'develop'
Add stats page (status counts by scope)

See merge request pleroma/admin-fe!74
2019-12-20 21:42:56 +00:00
Maxim Filippov
53a7ea3eee Merge branch 'fix/duplicated-success-message' into 'develop'
Remove duplicated success message

See merge request pleroma/admin-fe!75
2019-12-20 13:53:59 +00:00
Maxim Filippov
3c9778ff25 Remove duplicated success message 2019-12-20 16:52:11 +03:00
Maxim Filippov
c1de536cc0 Add stats page (status counts by scope) 2019-12-19 19:55:24 +03:00
Maxim Filippov
7731d5c158 Merge branch 'feature/moderate-users-on-status-page' into 'develop'
Ability to moderate users on the statuses page

See merge request pleroma/admin-fe!72
2019-12-18 20:25:37 +00:00
Maxim Filippov
85980b6277 Merge branch 'chore/upd-readme' into 'develop'
Improve build documentation

Closes #42

See merge request pleroma/admin-fe!73
2019-12-15 15:45:33 +00:00
Maxim Filippov
fd74e9ded0 Improve build documentation 2019-12-15 18:42:43 +03:00
Maxim Filippov
55d645394b Merge branch 'develop' into feature/moderate-users-on-status-page 2019-12-14 21:50:36 +03:00
Maxim Filippov
c480850a7e Merge branch 'fix/color-fg-bg' into 'develop'
Fix unusual U-A foreground/background color settings

See merge request pleroma/admin-fe!71
2019-12-14 18:48:58 +00:00
Haelwenn (lanodan) Monnier
bd9b3620b3
styles/index.scss: Set default background&color 2019-12-14 19:45:10 +01:00
Maxim Filippov
3441a4b4f1 Merge branch 'feature/report-notes' into 'develop'
Add report notes

See merge request pleroma/admin-fe!70
2019-12-11 23:47:16 +00:00
Maxim Filippov
44007dc5cd Ability to moderate users on the statuses page 2019-12-11 17:49:11 +03:00
Maxim Filippov
14cdc4aae1 Default page size to 30 2019-12-11 16:10:15 +03:00
Maxim Filippov
fdff6a4d96 Merge branch 'oauth-admin-scope' into 'develop'
Added 'admin' & 'push' OAuth scopes

See merge request pleroma/admin-fe!69
2019-12-11 09:08:32 +00:00
Ivan Tashkinov
e9b62693de Added 'admin' & 'push' OAuth scopes.
Disabled PleromaFE login feature since PleromaFE shouldn't request admin scope.
2019-12-11 09:08:32 +00:00
Maxim Filippov
6d14481fdc fix test 2019-12-08 19:56:27 +03:00
Maxim Filippov
1ba4564b20 Add report notes 2019-12-08 11:26:42 +03:00
Maxim Filippov
4d7889d76a Merge branch 'feature/confirm-user-resend-confirmation' into 'develop'
Confirm user account, resend confirmation email

Closes #49

See merge request pleroma/admin-fe!68
2019-11-30 15:58:17 +00:00
Maxim Filippov
994542631d Changelog 2019-11-29 23:10:45 +09:00
Maxim Filippov
4103faa079 Fix tests 2019-11-29 23:09:59 +09:00
Maxim Filippov
fb9d166f5d Fix status location 2019-11-29 22:48:25 +09:00
Maxim Filippov
f77b0cde90 Confirm user account, resend confirmation email 2019-11-29 22:45:35 +09:00
Maxim Filippov
dd6802bdb6 Move status from views to components folder 2019-11-29 22:45:31 +09:00
Maxim Filippov
fc017e6032 Move element-ui components to the separate folder 2019-11-29 22:45:24 +09:00
Maxim Filippov
0c6c51bbcc Update CHANGELOG with notion of grouped reports 2019-11-29 09:03:40 +00:00
Maxim Filippov
ec9e640dad Update CHANGELOG.md 2019-11-29 08:59:33 +00:00
Maxim Filippov
fed3c93316 Merge branch 'feature/fetch-statuses-from-given-instance' into 'develop'
Add statuses page + fetch statuses from given instance

Closes #45

See merge request pleroma/admin-fe!67
2019-11-29 08:57:00 +00:00
Maxim Filippov
60ccdd72cf Merge branch 'develop' into feature/fetch-statuses-from-given-instance 2019-11-29 17:23:19 +09:00
Maxim Filippov
2c806ac77c Add notes on new branches 2019-11-29 16:17:07 +09:00
Maxim Filippov
01ccb43965 Merge branch 'feature/improve-user-profile-interface' into 'master'
Update user profile interface

See merge request pleroma/admin-fe!53
2019-11-28 16:24:27 +00:00
Angelina Filippova
775d7c36f6 Fix styles and add message when there are no statuses 2019-11-29 01:18:33 +09:00
Angelina Filippova
e6a06e929b Merge branch 'feature/improve-user-profile-interface' of git.pleroma.social:linafilippova/admin-fe into feature/improve-user-profile-interface 2019-11-29 00:37:28 +09:00
Angelina Filippova
fca8d44ec0 Add test for rendering user profile 2019-11-29 00:23:32 +09:00
Angelina Filippova
b278f1488d Display role tags 2019-11-29 00:23:32 +09:00
Angelina Filippova
03c1ee19fa Update card with user information 2019-11-29 00:23:32 +09:00
Maxim Filippov
253fa33235 Merge branch 'feature/combine-reports-with-one-topic' into 'master'
Combine reports with one topic and add pagination

See merge request pleroma/admin-fe!52
2019-11-28 11:04:05 +00:00
Angelina Filippova
dc83582629 Combine reports with one topic and add pagination 2019-11-28 11:04:05 +00:00
Maxim Filippov
b305a1e753 Merge branch 'fix/reports-update' into 'master'
Fix reports management

Closes #50

See merge request pleroma/admin-fe!64
2019-11-16 09:46:02 +00:00
Maxim Filippov
b7c83e06a9 Fix reports management 2019-11-16 18:38:07 +09:00
Maxim Filippov
f477dec059 Pagination 2019-11-15 12:54:33 +09:00
Maxim Filippov
6695226e12 Add statuses page 2019-11-14 22:42:56 +09:00
Maxim Filippov
591e30f185 Merge branch 'fix/statuses-page-marging' into 'master'
Quick marging fix

See merge request pleroma/admin-fe!61
2019-11-11 01:56:19 +00:00
Maxim Filippov
b02f330494 Quick marging fix 2019-11-11 10:49:42 +09:00
Maxim Filippov
4d3246a003 Merge branch 'chore/kill-tinymce' into 'master'
Kill tinymce

Closes #47

See merge request pleroma/admin-fe!60
2019-11-01 16:26:51 +00:00
Maxim Filippov
850d2b464c Keep static dir 2019-11-01 19:22:22 +03:00
Maxim Filippov
878e849801 Kill tinymce 2019-11-01 18:55:59 +03:00
Angelina Filippova
9b9f7369e9 Merge branch 'feature/add-try-catch-error-handling' into 'master'
Add try/catch error handling

See merge request pleroma/admin-fe!59
2019-10-28 17:06:39 +00:00
Angelina Filippova
c6ce97c69d Update changelog 2019-10-25 19:09:30 +02:00
Angelina Filippova
ed33b1569e Add translations to emojiPacks module and alphabetize it 2019-10-25 18:48:30 +02:00
Angelina Filippova
c4b13ebb9f Move try/catch error handling from view file to relays module 2019-10-25 18:32:47 +02:00