Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
lain
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
2021-01-07 11:09:18 +00:00
Alex Gleason
20af025c65
AdminAPI: return user email
2021-01-06 11:30:32 -06:00
lain
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
4c5f75f4e9
Support pagination in AdminAPI for user statuses
2020-12-30 15:18:54 -06:00
lain
9d5ce82221
Test: More async/sync tweaks.
2020-12-21 15:05:56 +01:00
lain
9ba60f70d2
Tests: Make as many tests as possible async.
...
In general, tests that match these criteria can be made async:
- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer.
2020-12-21 12:21:40 +01:00
lain
b4b68b71fc
Tests: Remove unneeded explicit cachex use.
...
Only use cachex when we're actually testing it.
2020-12-18 13:18:17 +01:00
Ivan Tashkinov
c8e7ace812
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
...
# Conflicts:
# CHANGELOG.md
2020-12-07 21:45:04 +03:00
lain
ed76323776
Merge branch 'feature/configdb-mix-tasks' into 'develop'
...
Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174
2020-12-07 18:06:06 +00:00
Ivan Tashkinov
e00c667145
[ #3174 ] Refactoring: ConfigDB fetching functions, ConfigDB tests.
...
Minor fixes.
2020-12-06 18:02:30 +03:00
Ivan Tashkinov
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-12-06 13:59:35 +03:00
Ivan Tashkinov
e9859b68fc
[ #3112 ] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
2020-12-06 13:59:10 +03:00
Maksim Pechnikov
66f411fba0
added subject actor to moderation log
2020-11-19 22:13:45 +03:00
lain
bb9650f3c2
FrontendController: Return error on installation error.
2020-11-17 16:43:07 +01:00
Egor Kislitsyn
d26a449396
Change endpoint path
2020-11-11 20:39:57 +04:00
Egor Kislitsyn
435bf1f945
Remove FrontendInstallerWorker
2020-11-11 20:12:35 +04:00
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
lain
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
2020-11-04 13:23:18 +01:00
Mark Felder
53dd048590
Test the note is returned when fetching a single report
2020-11-02 15:49:07 -06:00
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
Egor Kislitsyn
a2a7a1f2ff
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-31 00:17:33 +04:00
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
Egor Kislitsyn
1a98476f48
Remove unused aliases
2020-10-30 18:42:43 +04:00
Egor Kislitsyn
d83c2bd330
Add support for install via file and build_url params
2020-10-29 16:37:50 +04:00
Egor Kislitsyn
03e306785b
Add an API endpoint to install a new frontend
2020-10-27 19:20:21 +04:00
Maksim Pechnikov
ef627b9391
fix module name
2020-10-22 12:04:23 +03:00
Maksim Pechnikov
cf4f393794
added AdminApi.UserController
2020-10-22 11:50:49 +03:00
Maksim Pechnikov
9ef46ce410
added 'unconfirmed' filter to admin/users
2020-10-22 11:50:49 +03:00
Egor Kislitsyn
ad605e3e16
Rename Pleroma.Backup to Pleroma.User.Backup
2020-10-20 17:16:58 +04:00
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
Alexander Strizhakov
5f2071c458
changes after rebase
2020-10-13 16:44:03 +03:00
Alexander Strizhakov
7acf09beb8
more tests
2020-10-13 16:38:18 +03:00
Alexander Strizhakov
7dffaef479
tests consistency
2020-10-13 16:35:09 +03:00
