kaniini
|
29dd8ab9c0
|
Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
|
2019-09-23 22:42:34 +00:00 |
|
Steven Fuchs
|
e1d2d69c87
|
Clean up views
|
2019-09-23 22:33:59 +00:00 |
|
Maxim Filippov
|
6f25668215
|
Admin API: Add ability to force user's password reset
|
2019-09-22 16:08:07 +03:00 |
|
rinpatch
|
b0ec82d24a
|
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
|
2019-09-18 21:57:49 +00:00 |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
2019-09-18 23:21:11 +02:00 |
|
Alex S
|
4faf2b1555
|
post for creating invite tokens in admin api
|
2019-09-18 10:49:14 +03:00 |
|
Maxim Filippov
|
219dca1b00
|
Merge branch 'develop' into feature/return-total-for-reports
|
2019-09-16 14:40:17 +03:00 |
|
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
2019-09-14 16:11:44 +03:00 |
|
Alex S
|
a1f2dfb10a
|
expanding regex sigils to use modifiers
|
2019-09-11 09:25:33 +03:00 |
|
Maxim Filippov
|
af746fa4a8
|
Return total for reports
|
2019-09-04 20:08:13 +03:00 |
|
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
2019-08-31 14:25:43 +03:00 |
|
Maxim Filippov
|
c338224c93
|
Fix sporadic test
|
2019-08-26 17:24:22 +03:00 |
|
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
2019-08-25 19:39:37 +00:00 |
|
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
2019-08-24 16:04:19 +00:00 |
|
Ivan Tashkinov
|
71700ea6d4
|
[#1149] Updated docs & tests.
|
2019-08-24 09:27:32 +03:00 |
|
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
2019-08-19 15:34:29 +00:00 |
|
Alexander Strizhakov
|
de0f3b73dd
|
Admin fixes
|
2019-08-03 18:16:09 +00:00 |
|
Egor Kislitsyn
|
f98235f2ad
|
Clean up tests output
|
2019-08-01 16:33:36 +07:00 |
|
Alexander Strizhakov
|
51b3b6d816
|
Admin changes
|
2019-07-30 16:36:05 +00:00 |
|
Maxim Filippov
|
f46805bb40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-24 02:42:28 +03:00 |
|
Maxim Filippov
|
03471151d6
|
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
|
2019-07-24 01:51:36 +03:00 |
|
Alexander Strizhakov
|
5e72554f3c
|
Admin config fix
|
2019-07-23 19:17:00 +00:00 |
|
Sergey Suprunenko
|
05b5af8075
|
Add tests for users tasks and PleromaAuthenticator
|
2019-07-22 02:43:15 +00:00 |
|
Maxim Filippov
|
9570a5be40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-18 23:38:38 +03:00 |
|
Alex S
|
c66044b923
|
atom keys with leading :
|
2019-07-15 11:00:55 +03:00 |
|
Maxim Filippov
|
a9459ff98f
|
Admin API: Endpoint for fetching latest user's statuses
|
2019-07-14 00:37:26 +03:00 |
|
Alexander Strizhakov
|
846ad9a463
|
admin api configure changes
|
2019-07-11 13:02:13 +00:00 |
|
Sergey Suprunenko
|
ff55e3c16f
|
Create mentions only for explicitly mentioned users
|
2019-07-10 13:29:50 +00:00 |
|
feld
|
93a0eeab16
|
Add license/copyright to all project files
|
2019-07-10 05:13:23 +00:00 |
|
Eugenij
|
ab50c6b3ca
|
Add fallback value to the admin report view.
This is to avoid 500 error when the reported user no longer exists
in the database.
|
2019-07-02 01:27:00 +00:00 |
|
Maxim Filippov
|
90927e6a9a
|
Kowalski, analysis!
|
2019-06-28 15:27:18 +03:00 |
|
Maxim Filippov
|
452ca5250d
|
Merge admin and mastodon user views for reports
|
2019-06-28 15:15:32 +03:00 |
|
Alex S
|
982cad0268
|
support for config groups
|
2019-06-23 08:16:16 +03:00 |
|
Alex S
|
410add1c30
|
support for tuples with more than 2 values
|
2019-06-22 17:30:53 +03:00 |
|
Alex S
|
f0fccb7578
|
fix for int and modules
|
2019-06-22 09:01:30 +03:00 |
|
Alexander Strizhakov
|
32320c1ee9
|
Fixes for dynamic configuration
|
2019-06-20 17:43:57 +00:00 |
|
rinpatch
|
bf6aa6f1a8
|
Fix report content stopping to be nullable
|
2019-06-16 13:06:12 +03:00 |
|
rinpatch
|
44de34d170
|
Credo fixes
|
2019-06-16 01:35:45 +03:00 |
|
rinpatch
|
e943905bd7
|
Add tests for report view
|
2019-06-16 01:30:14 +03:00 |
|
Alexander Strizhakov
|
c2ca1f22a2
|
it is changed in compile time
we can't change module attributes and endpoint settings in runtime
|
2019-06-14 15:45:05 +00:00 |
|
Sachin Joshi
|
e394fc2eef
|
fix the flaky test for users creation by admin
|
2019-06-02 09:49:59 +05:45 |
|
Sachin Joshi
|
ad5263c647
|
Merge remote-tracking branch 'upstream/develop' into admin-create-users
|
2019-06-01 11:42:37 +05:45 |
|
Sachin Joshi
|
5534d4c676
|
make bulk user creation from admin works as a transaction
|
2019-06-01 11:17:53 +05:45 |
|
Maksim
|
db94294dfb
|
[#936] fix tests
|
2019-05-29 14:04:58 +00:00 |
|
Aaron Tinio
|
f76268135c
|
Fix failing test
|
2019-05-22 07:16:11 +08:00 |
|
Sachin Joshi
|
5c028b8f92
|
user creation admin api will create multiple users
|
2019-05-17 12:21:58 +05:45 |
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
|
Sachin Joshi
|
f01f995816
|
make url uniform in admin api
|
2019-05-11 14:46:00 +05:45 |
|
Alexander Strizhakov
|
bfeb33e951
|
Merge develop
Merge conflict in lib/pleroma/activity.ex
|
2019-05-08 14:34:36 +00:00 |
|
Egor
|
b9cdf6d3b9
|
Use `User.get_cached*` everywhere
|
2019-04-22 07:20:43 +00:00 |