Commit graph

942 commits

Author SHA1 Message Date
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
Angelina Filippova
6846ccf670 Add forms for configuring server-settings 2019-08-09 16:45:25 +00:00
Maxim Filippov
031ae4ce57 Merge branch 'fix/fix-user-deletion' into 'master'
Fix user deletion by changing variable name

See merge request pleroma/admin-fe!27
2019-07-27 12:05:30 +00:00
Angelina Filippova
f1418274dc Fix user deletion by changing variable name 2019-07-27 12:05:30 +00:00
Maxim Filippov
af610f4669 Merge branch 'fix/delete-user' into 'master'
Remove deleted users

See merge request pleroma/admin-fe!26
2019-07-27 11:51:31 +00:00
Angelina Filippova
232d5d8407 Remove deleted users 2019-07-27 11:51:31 +00:00
Maxim Filippov
8b3a6ef4fd Merge branch 'feature/reports-user-moderate-actions' into 'master'
Reporting enhancements

See merge request pleroma/admin-fe!24
2019-07-24 20:50:45 +00:00
Maxim Filippov
1222604703 Reporting enhancements
- User moderate actions
- Don't show closed reports on the main reports dashboard
- User links should link to the user's local (or shadowed) profile *inside* Admin FE so a moderator can do a more "full spectrum" analysis of the situation
2019-07-24 20:50:45 +00:00
feld
205d65f9fe Merge branch 'fix/fix-icons' into 'master'
Fix display of the icons

Closes #24

See merge request pleroma/admin-fe!23
2019-06-21 11:24:39 +00:00
Angelina Filippova
ba66fe02d7 Fix display of the icons 2019-06-21 11:24:39 +00:00
feld
d2deb80096 Merge branch 'feature/add-mobile-ui-to-reports' into 'master'
Render html tags in statuses

Closes #22

See merge request pleroma/admin-fe!22
2019-06-15 19:01:10 +00:00
Angelina Filippova
42f88d0bea Render html tags in statuses 2019-06-15 19:01:10 +00:00
feld
85179c6809 Merge branch 'fix/update-node-sass' into 'master'
Update node-sass and remove deprecated code

See merge request pleroma/admin-fe!21
2019-06-12 15:38:15 +00:00
Angelina Filippova
b602f1fc41 Update node-sass and remove deprecated code 2019-06-12 15:38:15 +00:00
feld
46958a3b3c Merge branch 'feature/create-new-user' into 'master'
Allow to register new user accounts

Closes #17

See merge request pleroma/admin-fe!20
2019-06-11 15:13:48 +00:00
Angelina Filippova
6cca293824 Allow to register new user accounts 2019-06-11 15:13:48 +00:00