Commit graph

1522 commits

Author SHA1 Message Date
Angelina Filippova
16c4296274 Fix typo 2020-02-01 16:08:10 +03:00
Angelina Filippova
c5be615923 Merge branch 'develop' into 'feature/move-emojipacks'
# Conflicts:
#   src/views/settings/index.vue
2020-02-01 13:05:48 +00:00
Angelina Filippova
4566725a4e Move statuses state from component data to module 2020-02-01 16:02:12 +03:00
ee659bc984 Merge branch 'update-settings-tab-when-config-is-disabled' into 'develop'
Disable config tabs if config is disabled

Closes #72 and #73

See merge request pleroma/admin-fe!86
2020-02-01 09:10:42 +00:00
Angelina Filippova
74018751e8 Remove checkboxes from statuses where they are not used 2020-01-31 22:12:00 +03:00
Angelina Filippova
643eb55e67 Fix styles for filter container and add mobile UI 2020-01-31 21:54:23 +03:00
Angelina Filippova
7e48a33c4b Create new translation section for emoji and add success messages 2020-01-30 23:37:48 +03:00
Angelina Filippova
abd4ec5867 Adopt emoji packs and settings tabs to wide screens 2020-01-30 22:49:53 +03:00
Angelina Filippova
7e5ba29030 Adapt settings styles to wide screens 2020-01-30 17:36:35 +03:00
Angelina Filippova
9c3d0e05a3 Disable config tabs if config is disabled 2020-01-30 15:40:39 +03:00
Angelina Filippova
0b5f3fb4b1 Implement Grid Layout for displaying emojis 2020-01-30 15:26:53 +03:00
Angelina Filippova
975afeb5c7 Move emoji packs from settings to main menu 2020-01-29 19:58:00 +03:00
Angelina Filippova
68feb67c52 Merge branch 'feature/allow-moderation-on-user-page' into 'develop'
Add ability to moderate user on the user's page

Closes #59

See merge request pleroma/admin-fe!85
2020-01-29 15:38:01 +00:00
Angelina Filippova
760d192c53 Merge branch 'develop' into 'feature/allow-moderation-on-user-page'
# Conflicts:
#   src/api/users.js
#   src/store/modules/users.js
#   src/views/users/components/MultipleUsersMenu.vue
#   src/views/users/index.vue
2020-01-28 18:37:14 +00:00
Angelina Filippova
ece7485a4c Merge branch 'fix-password-reset' into 'develop'
Fix for forced password reset

Closes #70

See merge request pleroma/admin-fe!84
2020-01-28 18:28:10 +00:00
Angelina Filippova
0e4036040e Add reset password dialog to user's page 2020-01-28 19:38:56 +03:00
Angelina Filippova
ad2d487beb Fix forcing password reset 2020-01-28 16:06:49 +03:00
Angelina Filippova
47dbb5b8de Update Changelog 2020-01-27 21:29:20 +03:00
Angelina Filippova
7c57dac917 Refactor actions in users module 2020-01-27 21:07:23 +03:00
Angelina Filippova
b654f7a0d9 Fix styles for moderate user button 2020-01-27 21:01:28 +03:00
Angelina Filippova
1896c00946 Add ability to moderate user from a user's page 2020-01-27 19:41:16 +03:00
Angelina Filippova
23054af57d Extract moderation menu into a separate component 2020-01-27 15:05:51 +03:00
eugenijm
67bffe2887 Password reset fix 2020-01-27 03:22:44 +03:00
fd02cc7505 Merge branch 'feature/config-improvements' into 'develop'
Config improvements

Closes #66, #65, #63, #61, and #60

See merge request pleroma/admin-fe!83
2020-01-26 22:03:21 +00:00
Angelina Filippova
389fbf50a3 Find data in description for settings that don't have a key 2020-01-27 00:23:54 +03:00
Angelina Filippova
fb5bfca562 Hide unused section of settings based on what uploader is selected 2020-01-26 22:54:16 +03:00
Angelina Filippova
9f8112fe32 Fix styles for explanations 2020-01-25 16:23:15 +03:00
Angelina Filippova
635d76a080 Remove uri_schemes settings 2020-01-25 15:03:32 +03:00
Angelina Filippova
f2796a629d Fix partialUpdate 2020-01-25 15:01:13 +03:00
Angelina Filippova
ebb01fab94 Fix styles 2020-01-25 18:47:22 +07:00
Angelina Filippova
cb47592525 Specify styles for buttons with plus icons 2020-01-25 02:43:22 +07:00
Angelina Filippova
c22ebd1bff Format descriptions with marked library 2020-01-25 02:42:09 +07:00
jp
e813cbf7dd Update docker configuration:
- .dockerignore for building
- Dockerfile created usign node-10-alpine and nginx-mainline
- docker/ scripts and templates added
2020-01-24 11:32:49 -05:00
jp
072f31d7f7 Major changes to gitlab-ci.yml:
- Change order to build, test, release
- Add global cache for sharing build between jobs
- Add node build artifacts for future release usage
(https://gitlab.com/gitlab-org/gitlab/merge_requests/19298)
- Add docker image building for container registry
2020-01-24 11:32:01 -05:00
Angelina Filippova
887d4adc71 Remove duplicate instructions from BBS/SSH tab 2020-01-24 14:20:35 +07:00
Angelina Filippova
01b2d6718e Make Submit button sticky 2020-01-22 18:58:12 +07:00
95d6e9e370 Merge branch 'filterable-instance-list' into 'develop'
Make instance list searchable

See merge request pleroma/admin-fe!80
2020-01-21 19:58:31 +00:00
eugenijm
3054ffd736 Make peer list filterable 2020-01-21 22:44:44 +03:00
1448ef4a2d Merge branch 'filterable-peers' into 'develop'
Make instance list searchable

See merge request pleroma/admin-fe!78
2020-01-21 19:36:50 +00:00
f01efc175a Merge branch 'fix-activation-status' into 'develop'
Fix active users being displayed as deactivated in the user view

See merge request pleroma/admin-fe!79
2020-01-21 19:36:27 +00:00
Angelina Filippova
267d59a6d4 Merge branch 'feature/ability-to-remove-settings-from-db' into 'develop'
Ability to remove settings from db

See merge request pleroma/admin-fe!77
2020-01-21 18:16:56 +00:00
Angelina Filippova
2d86e26aea Ability to remove settings from db 2020-01-21 18:16:56 +00:00
eugenijm
330c83797d Fix active users being displayed as deactivated in the user view 2020-01-21 10:29:37 +03:00
eugenijm
629cdfb6ca Make peer list filterable 2020-01-21 10:19:13 +03:00
9206538f61 Merge branch 'feature/update-server-configuration' into 'develop'
Update server configuration

See merge request pleroma/admin-fe!65
2020-01-09 15:57:41 +00:00
Angelina Filippova
306c79eadd Merge branch 'master' into feature/update-server-configuration 2020-01-09 22:37:49 +07:00
Angelina Filippova
58760ac4b0 Add tests for wrapping setting without keys 2020-01-08 20:15:59 +07:00
Angelina Filippova
eabc4464df Add tests for partial update 2020-01-08 15:29:59 +07:00
Angelina Filippova
1b368c7786 Move checking partial update to normalizers and fix bugs 2020-01-08 14:38:56 +07:00
Angelina Filippova
edc8fe58d7 Add tests for proxy_url and args settings, nested tuples and tuples with arrays 2020-01-07 18:58:23 +07:00