Commit graph

957 commits

Author SHA1 Message Date
Maxim Filippov 8956e68fa1 mailerEnabled must be set to true in order to require password reset (password reset currently only works via email) 2019-09-27 19:23:42 +03:00
Maxim Filippov 6290d06e20 Merge branch 'feature/moderation-log' into 'master'
Add moderation log

* [x]  filtering by specific admin/moderator
* [x]  filtering by date range
* [x]  searching by log message
* [x]  pagination

See merge request pleroma/admin-fe!38
2019-09-27 12:41:54 +00:00
Maxim Filippov a30a795b44 Add moderation log 2019-09-27 12:41:54 +00:00
Maxim Filippov 234672a5c3 Merge branch 'feature/require-user-password-reset' into 'master'
Ability to require user's password reset

See merge request pleroma/admin-fe!49
2019-09-24 22:55:42 +00:00
Maxim Filippov ada2de9733 Ability to require user's password reset 2019-09-24 22:55:42 +00:00
Maxim Filippov 21a7aa0de5 Merge branch 'remote-listing' into 'master'
More annoying fixes for the emoji packs

See merge request pleroma/admin-fe!48
2019-09-24 20:05:27 +00:00
Ekaterina Vaartis e9060cd8ba Add baseName to some remote instance requests 2019-09-24 20:15:44 +03:00
Ekaterina Vaartis 2662210063 Make baseName check if http is already in the name 2019-09-24 20:15:39 +03:00
Ekaterina Vaartis 10d3f3f0a0 Use the remote pack listing endpoint 2019-09-24 19:39:06 +03:00
Maxim Filippov f2c2a95989 Merge branch 'report-errors-from-json' into 'master'
Report errors from requests with the error json property

See merge request pleroma/admin-fe!47
2019-09-24 10:53:38 +00:00
Ekaterina Vaartis acfdb3ae6f Report errors from requests with the error json property 2019-09-24 09:38:18 +03:00
Maxim Filippov 47e60b11a7 Merge branch 'emoji-double-links' into 'master'
Emoji double links

See merge request pleroma/admin-fe!46
2019-09-23 21:47:00 +00:00
Ekaterina Vaartis 8899157dc8 Fix emoji having double http(s) in their links 2019-09-24 00:34:14 +03:00
Maxim Filippov b7c8ebecd3 Merge branch 'feature/invites' into 'master'
Generate invite tokens from admin-fe

See merge request pleroma/admin-fe!45
2019-09-23 19:00:28 +00:00
Angelina Filippova 81510916b5 Generate invite tokens from admin-fe 2019-09-23 19:00:28 +00:00
Maxim Filippov 7e159ac147 Merge branch 'master' into 'master'
Add configuration for sharing emoji packs

See merge request pleroma/admin-fe!32
2019-09-23 18:42:19 +00:00
vaartis 2841de76cf Add configuration for sharing emoji packs 2019-09-23 18:42:18 +00:00
Maxim Filippov 795800e974 Merge branch 'fix/readme-typo' into 'master'
Readme typo

See merge request pleroma/admin-fe!44
2019-09-14 22:26:00 +00:00
Maxim Filippov 67f2f617b5 Readme typo 2019-09-15 01:20:23 +03:00
Maxim Filippov 42c07f8dd6 Merge branch 'feature/disable-settings-reports' into 'master'
Add ability to disable settings/reports during compile time

See merge request pleroma/admin-fe!43
2019-09-14 22:17:24 +00:00
Maxim Filippov c2a33da65c Add ability to disable settings/reports during compile time 2019-09-14 22:17:24 +00:00
Maxim Filippov eeb68bafee Merge branch 'feature/make-404-default-in-english' into 'master'
Show 404 page in English by default

Closes #38

See merge request pleroma/admin-fe!42
2019-09-14 17:43:31 +00:00
Maxim Filippov 3f52ba1d47 Show 404 page in English by default 2019-09-14 20:38:27 +03:00
Maxim Filippov 433bd2d1db Merge branch 'feature/add-login-pleroma-link' into 'master'
Add "login-pleroma" link

See merge request pleroma/admin-fe!41
2019-09-13 20:50:21 +00:00
Maxim Filippov 0aee17e9a2 Add "login-pleroma" link 2019-09-13 20:50:21 +00:00
Maxim Filippov a4cecca07f Merge branch 'feature/login-via-pleroma-fe' into 'master'
Login via PleromaFE

See merge request pleroma/admin-fe!40
2019-09-13 16:38:13 +00:00
Maxim Filippov f8fe580e16 Login via PleromaFE 2019-09-13 01:55:50 +03:00
Maxim Filippov f86358d4ae Merge branch 'feature/login-improvements' into 'master'
Get instance from window.location if it is not provided in the username field

Closes #27

See merge request pleroma/admin-fe!39
2019-09-02 23:58:18 +00:00
Angelina Filippova 210d19314e Get instance from window.location if it is not provided in the username field 2019-09-02 23:58:17 +00:00
Angelina Filippova 19e728bfa0 Merge branch 'fix/objects-in-config' into 'master'
Add new settings to config

See merge request pleroma/admin-fe!37
2019-08-24 11:55:47 +00:00
Angelina Filippova e79b4bfd9f Add new settings to config 2019-08-24 11:55:47 +00:00
Angelina Filippova 8df49caf8f Merge branch 'fix-config-object-parse' into 'master'
Fix parse object type config

See merge request pleroma/admin-fe!29
2019-08-21 17:48:30 +00:00
kPherox c6dcc94626 Fix parsing objects in config 2019-08-21 17:48:30 +00:00
Angelina Filippova 5670be0e3a Merge branch 'fix-config-value-type' into 'master'
Fix config value type

See merge request pleroma/admin-fe!31
2019-08-21 11:37:55 +00:00
kPherox e504d8264b Converts maps and structs from config to JS objects, not array of tuples when wrapping config 2019-08-21 11:37:55 +00:00
Maxim Filippov c6f7060bd6 Merge branch 'fix/remove-dashboard' into 'master'
Remove "dashboard" from menu

Closes #25

See merge request pleroma/admin-fe!36
2019-08-15 12:22:15 +00:00
Maxim Filippov 1987475752 Remove "dashboard" from menu 2019-08-15 12:22:14 +00:00
Maxim Filippov 35e155ec91 * fixes inputs for renders_errors and rewrite_policy settings
* removes unnecessary computed properties
* enables source maps for production build
2019-08-15 12:13:14 +00:00
Angelina Filippova 30c15dbc62 [1.0.1] Server config fixes 2019-08-15 12:13:14 +00:00
Angelina Filippova c9684059ca Merge branch 'fix-setting-error' into 'master'
Fixed there can't be submitted settings

See merge request pleroma/admin-fe!28
2019-08-14 23:51:51 +00:00
Maxim Filippov b573d6bdbb Merge branch 'chore/readme' into 'master'
Add README

See merge request pleroma/admin-fe!34
2019-08-14 21:49:37 +00:00
Maxim Filippov ee998c6c40 Add README 2019-08-14 21:49:37 +00:00
Maxim Filippov d2deb02605 Merge branch 'fix/linter' into 'master'
Linter fixes

See merge request pleroma/admin-fe!33
2019-08-14 10:24:51 +00:00
Maxim Filippov 64c82c5bca Linter fixes 2019-08-14 10:24:51 +00:00
Maxim Filippov 0241c3d0ab Merge branch 'increase-login-timeout' into 'master'
increase login timeout to 60 seconds

See merge request pleroma/admin-fe!25
2019-08-14 09:51:33 +00:00
sierra 09738dc919 Revert "Try 30 seconds to get a passing build"
This reverts commit 06bb4b79ac4a56913d257852e64d88531cd9567c
2019-08-14 09:51:33 +00:00
Maxim Filippov 8dd564d083 Merge branch 'master' into 'master'
[i18n] Adds Occitan language

See merge request pleroma/admin-fe!5
2019-08-14 09:50:46 +00:00
Exilat b875801900 [i18n] Adds Occitan language 2019-08-14 09:50:45 +00:00
kPherox b37aaac9d6
Add null check 2019-08-10 02:05:43 +09:00
Angelina Filippova 7f85e78630 Merge branch 'feature/config-server' into 'master'
Add forms for configuring server-settings

Closes #15

See merge request pleroma/admin-fe!12
2019-08-09 16:45:25 +00:00