Alex Gleason
|
d3df5b0841
|
Merge remote-tracking branch 'origin/develop' into poll-notification
|
2021-07-17 22:25:35 -05:00 |
|
Alex Gleason
|
0114754db2
|
MastodonAPI: Support poll notification
|
2021-07-17 22:19:38 -05:00 |
|
Alex Gleason
|
c2d9a7fd02
|
Merge remote-tracking branch 'origin/develop' into admin-api-users-date
|
2021-07-14 08:56:52 -05:00 |
|
Alex Gleason
|
167e14416b
|
AdminAPI: add date to users
|
2021-07-14 08:54:59 -05:00 |
|
Alex Gleason
|
453bdf4084
|
Merge branch 'admin-api-users-sort' into 'develop'
AdminAPI: sort user results by ID descending
See merge request soapbox-pub/soapbox!40
|
2021-07-14 03:59:59 +00:00 |
|
Alex Gleason
|
4e38957a0e
|
Merge remote-tracking branch 'origin/develop' into admin-api-users-sort
|
2021-07-13 22:47:23 -05:00 |
|
Alex Gleason
|
5e88796784
|
AdminAPI: sort user results by ID descending
|
2021-07-13 22:47:02 -05:00 |
|
Alex Gleason
|
84c9feb2e1
|
Merge remote-tracking branch 'origin/develop' into moderators
|
2021-07-12 22:36:02 -05:00 |
|
Alex Gleason
|
1f093cb216
|
Moderators: reorganize :admin_api pipeline in Router
|
2021-07-12 22:11:32 -05:00 |
|
Alex Gleason
|
9bc1e79c56
|
Moderators: add UserIsStaffPlug
|
2021-07-12 21:57:52 -05:00 |
|
Alex Gleason
|
a423cebcb4
|
Merge remote-tracking branch 'origin/develop' into remote-deletions
|
2021-06-30 02:03:05 -05:00 |
|
Alex Gleason
|
beb1c98ab5
|
Deletions: don't purge keys so Delete/Undo activities can be signed
|
2021-06-30 02:02:24 -05:00 |
|
Alex Gleason
|
43800d83f4
|
Deletions: allow deactivated users to be deleted
|
2021-06-30 01:32:28 -05:00 |
|
Alex Gleason
|
a7929c4d89
|
Deletions: preserve account status fields during purge, fix checks
|
2021-06-29 23:56:19 -05:00 |
|
Alex Gleason
|
be2da95c36
|
Correctly purge a remote user
|
2021-06-29 21:45:38 -05:00 |
|
Alex Gleason
|
04ab689653
|
Merge remote-tracking branch 'origin/develop' into nsfw-api-mrf
|
2021-06-17 15:32:59 -05:00 |
|
Alex Gleason
|
2b3dfbb42f
|
NsfwApiPolicy: add tests
|
2021-06-17 14:36:51 -05:00 |
|
Alex Gleason
|
307f03b97b
|
Merge branch 'frontend-enable' into 'develop'
Refactor Pleroma.Frontend, enable a frontend through the CLI, fixes #16
Closes #16
See merge request soapbox-pub/soapbox!34
|
2021-06-16 16:21:05 +00:00 |
|
Alex Gleason
|
a39ada9bbf
|
Merge remote-tracking branch 'origin/develop' into email-list
|
2021-06-15 13:21:40 -05:00 |
|
Alex Gleason
|
31a510d6a4
|
EmailList: ensure that deactivated, unapproved, and unconfirmed users aren't subscribers
|
2021-06-15 13:19:24 -05:00 |
|
Alex Gleason
|
8c62cc95e6
|
EmailList: add combined.csv view to display all candidates with subscription status
|
2021-06-15 12:27:34 -05:00 |
|
Alex Gleason
|
73ed23e2fd
|
EmailList: add Subscribed? column
|
2021-06-15 12:16:14 -05:00 |
|
Alex Gleason
|
385d432ce7
|
EmailList: export user nickname
|
2021-06-15 12:09:50 -05:00 |
|
Alex Gleason
|
723fd67b26
|
Merge remote-tracking branch 'origin/develop' into frontend-enable
|
2021-06-14 21:26:43 -05:00 |
|
Alex Gleason
|
6e7b220549
|
EmailList: add unsubscribers csv, fix query
|
2021-06-14 21:07:12 -05:00 |
|
Alex Gleason
|
1f3dd2115c
|
EmailList: fix tests
|
2021-06-14 20:29:49 -05:00 |
|
Alex Gleason
|
2f40a92647
|
accepts_newsletter --> accepts_email_list
|
2021-06-14 20:20:08 -05:00 |
|
Alex Gleason
|
9ec3865725
|
MailingList --> EmailList
|
2021-06-14 20:18:57 -05:00 |
|
Alex Gleason
|
90df530dec
|
AdminAPI: get email list subscribers
|
2021-06-14 20:08:13 -05:00 |
|
Alex Gleason
|
784b8b5f83
|
Build CSV from subscriber list
|
2021-06-14 19:24:41 -05:00 |
|
Alex Gleason
|
6109532083
|
Return accepts_newsletter to account owner only
|
2021-06-14 19:24:41 -05:00 |
|
Alex Gleason
|
a0f2cba0d8
|
Add accepts_newsletter field to User, set during registration or account updates
|
2021-06-14 19:24:36 -05:00 |
|
Alex Gleason
|
8527faecf5
|
Enable a frontend automatically with --primary arg
|
2021-06-14 17:55:21 -05:00 |
|
Alex Gleason
|
9a768429a3
|
Frontend: enable CLI task
|
2021-06-14 17:27:29 -05:00 |
|
Alex Gleason
|
a9106e4f13
|
Frontends: refactor with %Frontend{} struct
|
2021-06-14 15:00:00 -05:00 |
|
Alex Gleason
|
1b73ff5ec0
|
Fix apparent Web.base_url() calls
For some reason these weren't changed in this branch
|
2021-06-02 16:57:14 -05:00 |
|
Alex Gleason
|
854b6ce816
|
Merge remote-tracking branch 'origin/develop' into cycles-phase-2
|
2021-06-02 16:12:45 -05:00 |
|
Alex Gleason
|
15c00f51be
|
Merge commit '10dfe814795f16d6c32f5b6a7421e3e7c597f1ad' into cycles-phase-2
|
2021-06-02 14:45:21 -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 |
|
Alex Gleason
|
10dfe81479
|
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
Move as_local_public/0 to stop making modules depend on Web at compile-time
|
2021-05-31 13:39:15 -05:00 |
|
Alex Gleason
|
9c0e2ce345
|
Merge remote-tracking branch 'origin/develop' into cycles-phase-1
|
2021-05-30 12:58:51 -05:00 |
|
Alex Gleason
|
c23b81e399
|
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
Reduce recompilation time by breaking compile-time cycles
|
2021-05-28 13:51:01 -05:00 |
|
Alex Gleason
|
45f68d3f85
|
Merge remote-tracking branch 'origin/develop' into asdf
|
2021-05-16 16:46:25 -05:00 |
|
Alex Gleason
|
ba177d2a4b
|
Simplify mix pleroma.instance gen task
|
2021-05-16 16:46:21 -05:00 |
|
Alex Gleason
|
3bf56a6be4
|
Merge remote-tracking branch 'origin/develop' into link-fixes
|
2021-05-13 14:35:19 -05:00 |
|
Alex Gleason
|
1997473979
|
Rich media: have invalid Rich/Video fall back to Link
|
2021-05-13 14:22:50 -05:00 |
|
Alex Gleason
|
92eb248581
|
Parser: don't be so strict about validating Embeds (leave it up to the Card)
|
2021-05-13 14:03:53 -05:00 |
|
Alex Gleason
|
72cc7b3369
|
Rich media: merge URIs when needed
|
2021-05-13 13:13:17 -05:00 |
|
Alex Gleason
|
7f8396160c
|
Merge remote-tracking branch 'origin/develop' into attachment-meta
|
2021-05-12 19:26:05 -05:00 |
|
Alex Gleason
|
4c060ae733
|
Ingest remote attachment width/height
|
2021-05-12 15:38:49 -05:00 |
|