sam/admin-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1046 commits 2 branches 1 tag 16 MiB
Commit graph

1046 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Angelina Filippova
b2c9308b80 Implement try/catch error handling in invite module 2019-10-25 18:24:52 +02:00
Angelina Filippova
aa9ea40961 Filter users when password reset is required 2019-10-25 00:47:04 +02:00
Angelina Filippova
679c4433d1 Move try/catch and success message from multiple users menu view to action 2019-10-25 00:00:23 +02:00
Angelina Filippova
453cde8435 Move try/catch and success message from view files to action in module 2019-10-24 23:24:56 +02:00
Angelina Filippova
a66bb599ce Add try/catch to actions that moderate users 2019-10-24 23:15:40 +02:00
Angelina Filippova
274ed16d7e Merge branch 'fix/checkmarks-in-moderate-dialog' into 'master' 
Fix checkmarks in dropdown moderation menu

See merge request pleroma/admin-fe!58
 2019-10-24 14:35:58 +00:00
Angelina Filippova
cc1cedc4e7 Update changelog 2019-10-24 16:30:30 +02:00
Angelina Filippova
14b75709ba Dispatch SearchUsers action instead of FetchUsers after moderating users 2019-10-24 16:20:54 +02:00
Angelina Filippova
1807aa81b6 Does not close dropdown menu after action was called 2019-10-23 23:41:38 +02:00
Angelina Filippova
2aba1916c8 Merge branch 'feature/relays-management' into 'master' 
Add ability to manage relays

See merge request pleroma/admin-fe!57
 2019-10-23 19:21:35 +00:00
Angelina Filippova
c559b9c6ec Make follow button primary 2019-10-23 21:15:48 +02:00
Angelina Filippova
83bbf5dd77 Add translations 2019-10-23 21:13:15 +02:00
Angelina Filippova
ab1533028e Add catching error and dispatching FetchRelays 2019-10-23 21:02:21 +02:00
Maxim Filippov
02ea80c756 Merge branch 'master' into feature/relays-management 2019-10-23 19:21:33 +02:00
feld
07a5c005b6 Merge branch 'feature/update-and-move-emoji-packs' into 'master' 
Redesign emoji packs and move it to settings

See merge request pleroma/admin-fe!54
 2019-10-23 13:54:41 +00:00
Angelina Filippova
61d14e1f8f Merge branch 'master' into 'feature/update-and-move-emoji-packs' 
# Conflicts:
#   src/utils/request.js
 2019-10-22 23:29:49 +00:00
Angelina Filippova
7afb327a60 Update changelog 2019-10-23 01:19:02 +02:00
Angelina Filippova
6aab2dd664 Add ability to upload file from an url 2019-10-23 01:07:45 +02:00
Angelina Filippova
f060155fdb Fix displaying errors with html content 2019-10-22 22:19:21 +02:00
Angelina Filippova
0cde91e4ea Add form for displaying remote pask metadata 2019-10-21 23:10:39 +02:00
Angelina Filippova
93f3fca760 Merge branch 'fix/remove-initial-config' into 'master' 
Remove fetching initial data for config

See merge request pleroma/admin-fe!56
 2019-10-20 16:38:43 +00:00
Angelina Filippova
736ec2d7f5 Remove fetching initial data for config 2019-10-20 16:38:43 +00:00
Angelina Filippova
81a9e69ec7 Merge branch 'feature/update-multiple-users-actions' into 'master' 
User actions moderate multiple users at a time

See merge request pleroma/admin-fe!55
 2019-10-20 16:29:07 +00:00
Angelina Filippova
4bd8015dfa Update Changelog 2019-10-18 18:27:46 +02:00
Angelina Filippova
caba7eaefd Return dispatching action that gets node info 2019-10-18 18:12:55 +02:00
Angelina Filippova
fa2410d614 Fix tests for updated user actions 2019-10-18 13:57:48 +02:00
Maxim Filippov
47dd86911f Add ability to manage relays 2019-10-17 22:59:25 +02:00