moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,266 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

89 Commits

Author SHA1 Message Date
Haelwenn 6b937d1473 Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' 
Server announcements (1st pass)

See merge request pleroma/pleroma!3643
 2022-07-03 20:58:20 +00:00
Ilja 5f37db330f Fix eratic test for POST /api/pleroma/admin/reports/:id/notes 
It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote.

I made the test on the content more generic
 2022-04-05 13:21:09 +02:00
Tusooa Zhu 0c78ab4a88
Use utc_datetime in db schema 2022-03-18 11:17:22 -04:00
Tusooa Zhu eb1a29640f
Add pagination to AdminAPI.AnnouncementController.index 2022-03-08 21:26:05 -05:00
Tusooa Zhu 11a1996bf5
Implement update announcement admin api 2022-03-08 20:55:41 -05:00
Tusooa Zhu cf8334dbc1
Add starts_at, ends_at and all_day parameters 2022-03-08 19:12:01 -05:00
Tusooa Zhu d7af67012f
Implement first pass of announcement admin api 
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
 2022-03-08 01:01:27 -05:00
Sean King 17aa3644be
Copyright bump for 2022 2022-02-25 23:11:42 -07:00
Alex Gleason bd81af731e
Tag erratic test 2022-02-02 12:29:53 -06:00
Alex Gleason bd853199d9 Merge branch 'v2-suggestions' into 'develop' 
V2 suggestions

See merge request pleroma/pleroma!3547
 2021-12-19 17:31:17 +00:00
Alex Gleason 6519f59d91
v2 Suggestions: return `is_suggested` through the API 2021-11-26 23:10:01 -06:00
Alex Gleason aee55b9a8b
v2 Suggestions: dismiss a suggestion 2021-11-26 20:19:29 -06:00
Alex Gleason 6c0484d571
AdminAPI: suggest a user through the API 2021-11-26 15:19:01 -06:00
lain 4d341f51e1 Merge branch 'fix-tests' into 'develop' 
Test fixes

See merge request pleroma/pleroma!3532
 2021-11-15 14:31:27 +00:00
lain 6e3df11693 Merge branch 'instance-deletion' into 'develop' 
AdminAPI: endpoint to delete all content from a remote instance

See merge request pleroma/pleroma!3483
 2021-11-15 14:24:13 +00:00
Lain Soykaf 871936b3ca MediaProxyCacheControllerTest: Fix unstable tests. 
Cachex order isn't stable, so we can not depend on the order in
tests. This adds some sorting to make the tests stable.
 2021-11-14 11:45:38 +01:00
Haelwenn (lanodan) Monnier a17910a6c6
CI: Bump lint stage to elixir-1.12 
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
 2021-10-06 08:11:05 +02:00
Ilja 53b0dd4ecc
List available frontends also when no static/frontends folder is present yet 
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510
 2021-08-28 18:23:49 +02:00
Ilja f9bafc17fb List available frontends also when no static/frontends folder is present yet 
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
 2021-08-14 18:42:12 +00:00
Alex Gleason 44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug 2021-08-04 11:48:57 -05:00
Alex Gleason 3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion 2021-07-17 15:03:43 -05:00
Alex Gleason bad79f79e6
AdminAPI.InstanceController: clean up tests, rename actions 2021-07-17 15:00:15 -05:00
Alex Gleason 54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance 2021-07-17 14:55:05 -05:00
Alex Gleason 25676c84be
Create AdminAPI.InstanceController 2021-07-17 13:05:25 -05:00
feld 3f58213646 Merge branch 'admin-api-users-sort' into 'develop' 
AdminAPI: sort new users at the top

Closes #2709

See merge request pleroma/pleroma!3481
 2021-07-14 14:39:14 +00:00
Alex Gleason 1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date 2021-07-14 09:02:55 -05:00
Alex Gleason 167e14416b
AdminAPI: add date to users 2021-07-14 08:54:59 -05:00
Alex Gleason deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort 2021-07-13 22:47:47 -05:00
Alex Gleason 5e88796784
AdminAPI: sort user results by ID descending 2021-07-13 22:47:02 -05:00
Alex Gleason 1f093cb216
Moderators: reorganize :admin_api pipeline in Router 2021-07-12 22:11:32 -05:00
Mark Felder f5ef7fe43b Fix test warnings 2021-06-07 16:06:53 -05:00
Mark Felder ff00b354fa Rename the non-federating Chat feature to Shout 2021-06-01 11:49:14 -05:00
Alex Gleason f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url 2021-05-31 16:49:46 -05:00
Alex Gleason 51a9f97e87
Deprecate Pleroma.Web.base_url/0 
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
 2021-05-31 16:48:03 -05:00
Mark Felder f95b52255b Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test 2021-04-14 09:39:57 -05:00
Mark Felder 905efc57e9 Initial test validating the AdminAPI issue 2021-04-13 14:39:28 -05:00
Mark Felder cdd271b065 Fix assignment / assertion 2021-04-13 10:55:54 -05:00
Mark Felder 9fbcdc15b1 Validate custom instance thumbnail set via AdminAPI produces correct URL 2021-04-13 10:52:53 -05:00
Egor Kislitsyn 3aae5231b2
Add OpenAPI spec for AdminAPI.UserController 2021-03-02 20:49:17 +04:00
rinpatch 6d66fadea7 Remove `:auth, :enforce_oauth_admin_scope_usage` 
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
 2021-02-17 20:47:38 +03:00
feld 7b67bf4e97 Merge branch 'fix/configdb-error' into 'develop' 
Improve error message for ConfigDB

See merge request pleroma/pleroma!3289
 2021-02-04 14:33:59 +00:00
feld 8d2ea95402 Merge branch 'feature/2438-users-posts-total-count' into 'develop' 
Feature/2438 users/instances posts total count

Closes #2438

See merge request pleroma/pleroma!3270
 2021-02-03 14:21:57 +00:00
Mark Felder 5fcab23aa3 Improve error message for ConfigDB 2021-01-28 14:59:23 -06:00
Alexander Strizhakov d4158e8bf0
added total 
to the instance adminAPI endpoint
 2021-01-27 07:45:06 +03:00
Alexander Strizhakov 6806c03e85
added total 
to the user statuses adminAPI endpoint
 2021-01-27 07:45:02 +03:00
Mark Felder e854c35e65 Convert tests to all use clear_config instead of Pleroma.Config.put 2021-01-26 11:58:43 -06:00
Mark Felder 28581e03ad Merge branch 'develop' into refactor/deactivated_user_field 2021-01-18 14:58:21 -06:00
Mark Felder 44a86951a3 Merge branch 'develop' into refactor/approval_pending_user_field 2021-01-18 12:05:05 -06:00
Mark Felder 2c0fe2ea9e Remove toggle_confirmation; require explicit state change 
Also cosmetic changes to make the code clearer
 2021-01-15 13:11:51 -06:00
Mark Felder d36182c088 Change user.confirmation_pending field to user.is_confirmed 2021-01-15 12:44:41 -06:00