Commit graph

1401 commits

Author SHA1 Message Date
Angelina Filippova bb36813490 Align label on top on MRF tab 2020-04-22 01:28:40 +03:00
Angelina Filippova 08f96d5881 Merge branch 'feature/generate-invite-link' into 'develop'
Generate invite link

Closes #100

See merge request pleroma/admin-fe!123
2020-04-20 22:53:34 +00:00
Angelina Filippova a806a06107 Generate invite link 2020-04-20 22:53:34 +00:00
Angelina Filippova a54d09c486 Merge branch 'fix/reports-shows-up-blank' into 'develop'
Fix blank reports page

Closes #99

See merge request pleroma/admin-fe!121
2020-04-18 23:30:03 +00:00
Angelina Filippova 1f7d78406c Update Reports for cases when actor or account is missing 2020-04-19 02:25:04 +03:00
Angelina Filippova 992d07b1c4 Merge branch 'develop' into fix/reports-shows-up-blank 2020-04-19 00:24:47 +03:00
Angelina Filippova f1e1832c7e Merge branch 'feature/show-reboot-button' into 'develop'
Show reboot button on every page

Closes #98

See merge request pleroma/admin-fe!122
2020-04-17 22:27:00 +00:00
Angelina Filippova 655584c877 Show reboot button on every page 2020-04-17 22:27:00 +00:00
Angelina Filippova ac6799211d Exclude cases when length can be called on null or undefined 2020-04-08 23:16:14 +03:00
Angelina Filippova d5e11e279f Update displaying accounts in reports and statuses 2020-04-08 18:56:01 +03:00
Angelina Filippova 66c5a85821 Merge branch 'fix/disable-invites' into 'develop'
Hide Invites from menu when invites are disabled

Closes #69, #54, and #96

See merge request pleroma/admin-fe!119
2020-04-05 14:44:01 +00:00
Angelina Filippova d0af7e4907 Hide Invites menu item if invites are disabled 2020-04-05 16:58:54 +03:00
Angelina Filippova 9010cbbf3f Remove excess files 2020-04-05 03:31:45 +03:00
Angelina Filippova 3314a0eace Put invitesDisabled in app state 2020-04-05 03:25:01 +03:00
Angelina Filippova d8cff84bf5 Update changelog 2020-04-04 22:24:04 +03:00
Angelina Filippova c517f13545 Merge branch 'develop' into fix/disable-invites 2020-04-04 22:22:42 +03:00
Angelina Filippova be3372518d Merge branch 'master' into develop 2020-04-04 22:20:31 +03:00
Angelina Filippova 8f5d36ee20 Merge branch 'fix/changelog' into 'master'
Update Changelog for 2.0.2 release

See merge request pleroma/admin-fe!118
2020-04-04 18:45:45 +00:00
Angelina Filippova e4dcbed6ea Update Changelog for 2.0.2 release 2020-04-04 21:39:04 +03:00
Angelina Filippova 9567695186 Update Changelog 2020-04-04 21:25:36 +03:00
Angelina Filippova 86777defc7 Merge branch 'fix/link-registrations-and-invites' into 'develop'
Link enabling registrations and invites in settings

Closes #97

See merge request pleroma/admin-fe!117
2020-04-04 17:49:06 +00:00
Angelina Filippova e2f3860544 Remove Fetch initial post setting 2020-04-04 20:43:05 +03:00
Angelina Filippova 79afa08f53 Add input for registrations and invites with confirmations 2020-04-02 22:33:12 +03:00
feld b4bff4df4a Merge branch 'release/2.0.2' into 'master'
AdminFE 2.0.2 release

See merge request pleroma/admin-fe!116
2020-04-01 17:15:09 +00:00
feld 2a0aced674 Merge branch 'cherry-pick-ce3d3387' into 'release/2.0.2'
Merge branch 'feature/display-status-counts-by-scope' into 'master'

See merge request pleroma/admin-fe!115
2020-03-31 17:53:22 +00:00
feld ea79c92e0c Merge branch 'cherry-pick-747dc65e' into 'release/2.0.2'
Merge branch 'user-edit' into 'master'

See merge request pleroma/admin-fe!114
2020-03-31 17:53:08 +00:00
feld 1785b178c1 Merge branch 'cherry-pick-d021c77a' into 'release/2.0.2'
Merge branch 'fix/emails-with-symbols' into 'master'

See merge request pleroma/admin-fe!113
2020-03-31 17:52:47 +00:00
Angelina Filippova 65af72bd04 Merge branch 'fix/settings-submit-button' into 'master'
Fix settings submit button position on wide screens

See merge request pleroma/admin-fe!106
2020-03-31 12:52:04 -05:00
Angelina Filippova e34b173b54 Merge branch 'feature/display-status-counts-by-scope' into 'develop'
Display status counts by scope

Closes #54

See merge request pleroma/admin-fe!104

(cherry picked from commit ce3d3387cf)

4f61344c Add api function and action that fetches statuses count by scope
1d21dc51 Update header margin
85664ffb Display status count by visibility scope
2020-03-31 17:45:56 +00:00
Angelina Filippova 46658b8fd0 Merge branch 'user-edit' into 'develop'
Add the ability to set user password and email

Closes #69

See merge request pleroma/admin-fe!92

(cherry picked from commit 747dc65e9b)

9395cc78 Add the Security Settings modal for setting the user's email and password
2020-03-31 17:45:26 +00:00
Angelina Filippova 9572981486 Merge branch 'fix/emails-with-symbols' into 'develop'
Fix parsing emails with symbols

See merge request pleroma/admin-fe!105

(cherry picked from commit d021c77a3e)

88b5abc6 Fix parsing emails with symbols
2020-03-31 17:08:35 +00:00
Mark Felder 54e32f7ad6 Leave emoji packs disabled in master branch for now.
This ensures a build doesn't get accidentally produced with it enabled.
2020-03-31 11:59:48 -05:00
Angelina Filippova 34f14c93f7 Merge branch 'fix/login-add-link' into 'develop'
Add link to the docs when a non-admin user logs in

See merge request pleroma/admin-fe!111
2020-03-29 19:58:38 +00:00
Angelina Filippova 2c8270f24c Put message in a variable 2020-03-29 22:52:32 +03:00
Angelina Filippova b5aba2cc81 Link to docs when a non-admin user tries to log in 2020-03-29 22:21:09 +03:00
Angelina Filippova 0ac84426f7 Merge branch 'fix/uploading-remote-emoji' into 'develop'
Fix fetching remote emoji packs

Closes #95

See merge request pleroma/admin-fe!110
2020-03-29 18:18:23 +00:00
Angelina Filippova 2a38907ebe Load emoji packs that are open in collapse 2020-03-29 20:42:24 +03:00
Angelina Filippova ca9e84ad4b Add loading when fetching remote packs 2020-03-28 01:52:53 +03:00
Angelina Filippova 759dab4729 Split Emoji pack component into local and remote emoji pack 2020-03-28 01:31:07 +03:00
Angelina Filippova c7ebd70069 Merge branch 'fix/login-without-roles' into 'develop'
Make error message more user-friendly when non-admin user tries to log in

Closes #87

See merge request pleroma/admin-fe!109
2020-03-26 19:46:51 +00:00
Angelina Filippova e7167b88f3 Make error message more user-friendly when non-admin user tries to log in 2020-03-26 22:29:41 +03:00
Angelina Filippova 2e22228dd2 Merge branch 'fix/styles-for-resetting-password' into 'develop'
Update security settings dialog on user's page

See merge request pleroma/admin-fe!108
2020-03-25 23:21:26 +00:00
Angelina Filippova 6d11e30b65 Update security settings dialog on user's page 2020-03-25 23:21:26 +00:00
Angelina Filippova 05bc582512 Merge branch 'fix/download-emoji-pack-url' into 'develop'
Fix links for downloading remote emoji packs

Closes #91

See merge request pleroma/admin-fe!107
2020-03-25 00:00:47 +00:00
Angelina Filippova b30d2553c5 Update Changelog 2020-03-25 02:23:36 +03:00
Angelina Filippova 05abaf1916 Fix link for downloading emoji pack to instance 2020-03-25 02:20:56 +03:00
Angelina Filippova 1bcf33abdc Change link for downloading emoji packs 2020-03-25 01:53:50 +03:00
Angelina Filippova 747dc65e9b Merge branch 'user-edit' into 'develop'
Add the ability to set user password and email

Closes #69

See merge request pleroma/admin-fe!92
2020-03-24 20:59:12 +00:00
Angelina Filippova cdb922fa19 Merge branch 'fix/settings-submit-button' into 'develop'
Fix settings submit button position on wide screens

See merge request pleroma/admin-fe!106
2020-03-24 16:22:54 +00:00
Angelina Filippova c99e47e098 Update Changelog 2020-03-24 19:18:07 +03:00