alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,155 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

294 Commits

Author SHA1 Message Date
Maxim Filippov 02bbcd6180 Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-22 16:58:39 +03:00
Maxim Filippov 72a01f1350 Use router helper to generate reset password link 2019-09-22 16:36:59 +03: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 df15ed13d1 Merge branch 'develop' into feature/moderation-log-filters 2019-09-16 19:44:06 +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
Maxim Filippov 6c2fd1b78b Fix tests 2019-09-01 21:38:15 +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 f182f0f6bd Add ability to search moderation logs 2019-08-31 00:57:15 +03:00
Maxim Filippov 5e4fde1d3d Filter logs by date 2019-08-27 20:48:16 +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
Alex S c5d0fffeaf naming fix 2019-04-13 14:55:42 +07:00
Alex S fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses 2019-04-10 18:06:54 +07:00
Alex S fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
Ivan Tashkinov 44829d9181 AdminApiControllerTest unused variables fix. 2019-04-08 12:32:55 +03:00
Alex S 012bb5dcc9 renaming expire_at -> expires_at 
keyword style change
 2019-04-08 16:01:28 +07:00
Alex S b810aac117 added docs to docs/api/admin_api.md 
code style and little renamings
 2019-04-07 19:48:52 +07:00
Alex S dcc54f8cfa admin api endpoints for invites 2019-04-06 20:25:19 +07:00
Mark Felder fac76bfa35 We actually want the user id not nickname in the test... 2019-04-05 12:11:19 -05:00
Mark Felder c746087f57 Also remove Repo functions in the tests 2019-04-05 11:59:56 -05:00
Roger Braun 7895ee37fa Add user following / unfollowing to the admin api. 2019-04-05 11:27:07 -05:00
Egor Kislitsyn 1b3d921921 change `Repo.get(User, id)` => `User.get_by_id(id)` 2019-04-02 17:01:26 +07:00
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
Maxim Filippov 3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
Maxim Filippov 76a13bc5a2 Fix test 2019-03-17 13:29:28 +03:00
Maxim Filippov 257d8e78e5 Add tags 2019-03-14 01:52:24 +03:00
Maxim Filippov 4872914d32 Add test when local is false 2019-03-13 17:56:15 +03:00
Maxim Filippov d5edff6ce6 Fix test 2019-03-13 16:14:31 +03:00
Maxim Filippov 490d9cf7b1 Add "local" to users admin API 2019-03-13 16:04:44 +03:00
Maxim Filippov 25eb6cf1cb Add "roles" to users admin API 2019-03-12 22:15:28 +03:00
Maxim Filippov e34710b988 Format & update docs 2019-03-04 21:33:53 +03:00
Maxim Filippov f620199836 Merge search endpoint into /users 2019-03-04 21:26:32 +03:00
Maxim Filippov 2ec8cf5665 Add pagination to search 2019-03-02 17:21:30 +03:00
Maxim Filippov f384a9a256 Format 2019-03-01 20:23:19 +03:00
Maxim Filippov f1a4c3163b Show current user in users list as well 2019-03-01 20:23:03 +03:00
Maxim Filippov 5b08b470f6 Add "local" params to users search 2019-03-01 20:13:02 +03:00
Maxim Filippov 46f29b9da1 Add search users endpoint 2019-02-28 19:04:47 +03:00
Maxim Filippov 70e82a3465 Add test for the second page 2019-02-28 17:54:02 +03:00
Maxim Filippov 2883f75a3a Add pagination to users admin API 2019-02-28 01:11:56 +03:00
Maxim Filippov ed7fd6b47e Add missing docs and tests 2019-02-27 03:08:03 +03:00
eugenijm 25b9e7a8c3 Added admin API for changing user activation status 2019-02-19 19:37:02 +03:00
Haelwenn (lanodan) Monnier 8bb7e19b38
test: de-group alias/es 2019-02-11 03:44:15 +01:00
William Pitcock 3c08d229db tests: add legal boilerplate 2018-12-23 20:57:10 +00:00
Ivan Tashkinov 07e93f9940 [#114] Improved tests. 2018-12-14 13:52:04 +03:00
Ivan Tashkinov a89e3b4b60 [#114] Moved email_invite action to AdminAPIController, adjusted tests. 2018-12-14 12:28:23 +03:00
Maksim Pechnikov 89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
Ivan Tashkinov 6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change). 2018-12-07 11:04:39 +03:00
Ivan Tashkinov 22830c8fc9 [#394] Formatting fix. 2018-12-06 20:13:07 +03:00
Ivan Tashkinov 7b19487389 [#394] Added `users.tags` and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
lain 1c67277c80 Fix admin api. 2018-12-01 09:03:16 +01:00
Haelwenn (lanodan) Monnier 52681f7fd0
Web.AdminAPI.AdminAPIControllerTest: New Test 2018-11-17 22:12:14 +01:00