Commit graph

1961 commits

Author SHA1 Message Date
6b131e0779 Add options for translation services (#10)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #10
2022-08-29 19:36:36 +00:00
6880744463 display proxy correctly (#9)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #9
2022-08-14 23:16:07 +00:00
2e86ce673b bump version
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-08-12 16:01:58 +01:00
acf4065a75 Merge branch 'user-status-loading' into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-08-09 02:45:37 +01:00
0bdd146319 fix test 2022-08-09 02:45:10 +01:00
a13ec695f7 Merge pull request 'fix loading of user statuses' (#7) from user-status-loading into develop
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Reviewed-on: #7
2022-08-09 01:34:43 +00:00
2c868a42c6 fix loading of user statuses
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed
2022-08-09 02:32:58 +01:00
fc98eea515 Purge defunct settings (#6)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #6
2022-08-09 01:18:54 +00:00
713a833b00 Merge pull request 'Fix asset settings not loading in Frontend, bump node-sass' (#5) from eris/admin-fe:fix-avatar into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #5
2022-08-02 09:22:56 +00:00
4c6d67dde7 Fix asset settings not loading in Frontend
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-08-01 05:19:10 +00:00
c727ba8b18 Merge pull request 'make branch names consistent' (#3) from build-on-stable into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #3
2022-07-15 10:51:00 +00:00
8a555bce21 make branch names consistent
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-07-15 11:49:58 +01:00
e037713fa3 Merge pull request 'include branch in deploy' (#2) from stable into main
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #2
2022-07-15 10:46:48 +00:00
b3ee5a18d1 include branch in deploy
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-07-15 11:46:02 +01:00
e84e6ce40d Merge pull request 'Purge SSH settings' (#1) from purge-ssh into main
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #1
2022-06-27 11:32:56 +00:00
7a815f233d Purge SSH settings
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-06-27 12:27:46 +01:00
c4e16b1e15 add explanations to rate limit input
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-06-21 17:09:58 +01:00
eed89a24ad use 16 for release
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-06-17 14:24:42 +01:00
adf60bdeb1 use node14
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2022-06-17 14:12:16 +01:00
f8ce0dee55 ensure always github config
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/tag/woodpecker Pipeline failed
2022-06-17 14:02:15 +01:00
c8b39ed1ef correct github connection
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/tag/woodpecker Pipeline failed
2022-06-17 13:58:47 +01:00
9a8b3b0c13 add woodpecker config
Some checks failed
ci/woodpecker/tag/woodpecker Pipeline failed
2022-06-17 13:54:54 +01:00
9baa356f56 apply fixes 2022-06-14 19:05:19 +01:00
Haelwenn (lanodan) Monnier
4406dce589
CHANGELOG.md: Release 2.4.0 2021-08-01 08:36:29 +02:00
Haelwenn
a57925fce9 Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into 'develop'
Make MRF and Quarantine work with tuples

See merge request pleroma/admin-fe!187
2021-07-23 03:41:04 +00:00
Ilja
3b7bcea826 Make MRF and Quarantine work with tuples
* I added the keys to normaliser.js
2021-07-23 03:41:03 +00:00
Angelina Filippova
bc5dcfbafb Merge branch 'fix/revert-mod-log' into 'develop'
Revert including links in moderation log messages

Closes #187

See merge request pleroma/admin-fe!204
2021-04-12 22:26:59 +00:00
Angelina Filippova
8b2acaceb5 Revert including links in moderation log messages 2021-04-13 01:18:17 +03:00
Angelina Filippova
b1ce85fd33 Merge branch 'feature/reduce-nav-sidebars' into develop 2021-03-19 20:50:14 +03:00
Angelina Filippova
4d7a07815a Support new menu if BE does not return tabs 2021-03-19 19:48:24 +03:00
Angelina Filippova
1e5f128a56 Merge branch 'feature/install-switch-frontends' into 'develop'
Ability to install frontends

Closes #164

See merge request pleroma/admin-fe!197
2021-03-14 11:58:27 +00:00
Angelina Filippova
a50dc39354 Merge branch 'develop' into 'feature/install-switch-frontends'
# Conflicts:
#   CHANGELOG.md
2021-03-14 11:52:49 +00:00
Angelina Filippova
dfc00d9aa4 Update changelog 2021-03-14 14:49:44 +03:00
Angelina Filippova
ab73b3facb Update styles for mobile 2021-03-14 14:48:04 +03:00
Angelina Filippova
e9bd9444b3 Create component for frontends table, add button loading while frontend is installing 2021-03-14 14:08:59 +03:00
Angelina Filippova
d3929fc008 Merge branch 'develop' into 'feature/reduce-nav-sidebars'
# Conflicts:
#   CHANGELOG.md
2021-03-11 20:25:20 +00:00
Angelina Filippova
87e1ee4e21 Merge branch 'feature/hide-proxy-remote' into 'develop'
Ability to set rules and conditions for rendering settings

See merge request pleroma/admin-fe!190
2021-03-11 20:06:27 +00:00
Angelina Filippova
411606dc69 Merge branch 'develop' into 'feature/hide-proxy-remote'
# Conflicts:
#   CHANGELOG.md
2021-03-11 19:57:05 +00:00
Angelina Filippova
841340caa9 Merge branch 'fix/moderation-log-render' into 'develop'
Fix rendering moderation log messages

See merge request pleroma/admin-fe!199
2021-03-11 19:40:40 +00:00
Angelina Filippova
24af70ff6b Merge branch 'feature/update-invite-token-dialog' into 'develop'
Ability to copy invite link from dialog window

See merge request pleroma/admin-fe!200
2021-03-11 19:40:18 +00:00
Angelina Filippova
b068b74a10 Merge branch 'feature/update-error-pages' into 'develop'
Update 401 and 404 error pages

See merge request pleroma/admin-fe!201
2021-03-11 19:39:17 +00:00
Angelina Filippova
3cdb2d012c Update changelog 2021-03-11 22:32:43 +03:00
Angelina Filippova
9fd486dee2 Update icons on login page 2021-03-11 16:40:08 +03:00
Angelina Filippova
78571918fd Rename Moderation log component 2021-03-11 15:21:47 +03:00
Angelina Filippova
e4a82cee72 Add ability to copy invite link from dialog window 2021-03-11 15:02:01 +03:00
Angelina Filippova
0f295495ed Remove setting font-size for h1 and h2 2021-03-09 01:55:53 +08:00
Angelina Filippova
3377ec883f Remove unused view files 2021-03-09 01:54:36 +08:00
Angelina Filippova
1a268b5912 Remove unused guide view 2021-03-09 01:53:54 +08:00
Angelina Filippova
c8688007a6 Remove unused Dashboard and Documentation views 2021-03-09 01:52:46 +08:00
Angelina Filippova
686bc1d162 Remove unused components 2021-03-09 01:43:00 +08:00