|
6500965fb3
|
Add short_description field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-29 14:01:03 +02:00 |
|
Alex Gleason
|
9cbd2406cc
|
Merge branch 'feed-routes' into 'develop'
Add /@:nickname route, redirect /users/:nickname.rss to /users/:nickname/feed.rss instead of .atom
See merge request soapbox-pub/soapbox-be!120
|
2022-03-28 21:58:48 +00:00 |
|
|
ae2646453b
|
Add /@:nickname route, redirect /users/:nickname.rss to /users/:nickname/feed.rss instead of .atom
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-28 22:26:55 +02:00 |
|
Alex Gleason
|
fc25b626da
|
Merge branch 'merge-upstream' into 'develop'
Merge upstream
See merge request soapbox-pub/soapbox-be!108
|
2022-03-23 20:37:40 +00:00 |
|
|
7bc95acca0
|
Add "status" notification type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-22 20:29:28 +01:00 |
|
Haelwenn
|
d7c53da77a
|
Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
Translate backend-rendered pages
See merge request pleroma/pleroma!3634
|
2022-03-20 18:14:37 +00:00 |
|
Haelwenn
|
e63d49d238
|
Merge branch 'caddyfile-v2' into 'develop'
Update Caddyfile to Caddy v2
Closes #2764
See merge request pleroma/pleroma!3641
|
2022-03-20 18:14:00 +00:00 |
|
Haelwenn
|
b76340511d
|
Merge branch 'delete_report_notifs_when_demoting_from_superuser' into 'develop'
Delete report notifs when demoting from superuser
Closes #2840
See merge request pleroma/pleroma!3642
|
2022-03-20 18:13:19 +00:00 |
|
Tusooa Zhu
|
0c78ab4a88
|
Use utc_datetime in db schema
|
2022-03-18 11:17:22 -04:00 |
|
Haelwenn (lanodan) Monnier
|
83338c25a5
|
Transmogrifier: Use validating regex for "mediaType"
|
2022-03-17 22:37:26 +01:00 |
|
Haelwenn (lanodan) Monnier
|
030183b35f
|
AttachmentValidator: Use custom ecto type and regex for "mediaType"
|
2022-03-17 22:37:26 +01:00 |
|
Haelwenn (lanodan) Monnier
|
4ea9886faa
|
EctoType: Add MIME validator
|
2022-03-17 22:37:26 +01:00 |
|
Haelwenn
|
2db640632b
|
Merge branch 'bugfix/mix-dotgit' into 'develop'
mix: Check `.git` presence
See merge request pleroma/pleroma!3638
|
2022-03-17 21:21:59 +00:00 |
|
Alex Gleason
|
d7cbaedc86
|
Merge branch 'fix-attachments' into 'develop'
StatusController: deleting a status returns the original media IDs
See merge request soapbox-pub/soapbox-be!114
|
2022-03-17 18:58:19 +00:00 |
|
Alex Gleason
|
552525e954
|
Merge branch 'notification-types' into 'develop'
MastoAPI: Use `types` for filtering notifications
See merge request soapbox-pub/soapbox-be!113
|
2022-03-17 18:57:49 +00:00 |
|
Alex Gleason
|
2a73047406
|
Merge branch 'remove-from-followers' into 'develop'
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers
See merge request soapbox-pub/soapbox-be!112
|
2022-03-17 18:57:07 +00:00 |
|
Alex Gleason
|
1dad6fa107
|
Merge branch 'landing-fe' into 'develop'
Landing FE
See merge request soapbox-pub/soapbox-be!115
|
2022-03-17 18:29:38 +00:00 |
|
Alex Gleason
|
fc7d39fc0c
|
Fix tests
|
2022-03-17 13:15:23 -05:00 |
|
Alex Gleason
|
3e6cf43ec8
|
Add landing-fe, remove Soapbox FE build
|
2022-03-17 13:03:41 -05:00 |
|
Alex Gleason
|
a6598128ca
|
StatusController: deleting a status returns the original media IDs
|
2022-03-16 18:13:35 -05:00 |
|
|
f572a416e7
|
Use types for filtering notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-16 21:16:03 +01:00 |
|
|
31ff467eff
|
Use types for filtering notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-16 21:15:44 +01:00 |
|
|
eb35a54ab8
|
Use reject_follow_request
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-16 19:15:58 +01:00 |
|
|
8157013f0b
|
POST /api/v1/accounts/:id/remove_from_followers
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-16 16:52:09 +01:00 |
|
Alex Gleason
|
66b13c1dba
|
Merge branch 'FIX-cheatsheet-typo' into 'develop'
fixing a typo for user_location_length
See merge request soapbox-pub/soapbox-be!111
|
2022-03-15 17:22:14 +00:00 |
|
Kenneth Zhao
|
2eaf054ef1
|
fixing a typo for user_location_length
|
2022-03-15 08:40:40 -07:00 |
|
Alex Gleason
|
b0b8c89b9a
|
Merge branch 'profile-location' into 'develop'
Support account "location" field
Closes #67
See merge request soapbox-pub/soapbox-be!110
|
2022-03-15 13:22:31 +00:00 |
|
|
d76bfd4e89
|
Location: user_location_length
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-14 22:52:06 +01:00 |
|
|
4c56e0fceb
|
Support account location field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-14 22:41:33 +01:00 |
|
Alex Gleason
|
6e0c349936
|
Merge branch 'status-store-content-type-' into 'develop'
Store status content mime type in the object
See merge request soapbox-pub/soapbox-be!109
|
2022-03-13 19:52:45 +00:00 |
|
|
212080c3e8
|
Store status content mime type in the object
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-13 20:20:39 +01:00 |
|
Alex Gleason
|
b56b0fb4e9
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-03-09 16:34:57 -06:00 |
|
Tusooa Zhu
|
ebcda5265b
|
Format announcements into html
|
2022-03-08 23:00:51 -05:00 |
|
Tusooa Zhu
|
0e0a1758f7
|
Add doc for Admin Announcement APIs
|
2022-03-08 21:48:41 -05: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
|
881179ec72
|
Remove GET /api/v1/announcements/:id
|
2022-03-08 19:22:28 -05:00 |
|
Tusooa Zhu
|
d569694ae9
|
Show only visible announcements in MastodonAPI
|
2022-03-08 19:20:29 -05:00 |
|
Tusooa Zhu
|
cf8334dbc1
|
Add starts_at, ends_at and all_day parameters
|
2022-03-08 19:12:01 -05:00 |
|
Tusooa Zhu
|
fcf3c9057e
|
Implement visibility filtering for announcements
|
2022-03-08 18:21:20 -05:00 |
|
Tusooa Zhu
|
009817c9ee
|
Correct docstring for AnnouncementController.show
|
2022-03-08 17:00:49 -05:00 |
|
Tusooa Zhu
|
2b39b36e49
|
Implement POST /api/v1/announcements/:id/dismiss
|
2022-03-08 16:59:20 -05:00 |
|
Tusooa Zhu
|
aa1fff279e
|
Implement GET /api/v1/announcements/:id
|
2022-03-08 16:19:35 -05:00 |
|
Tusooa Zhu
|
5169ad8f14
|
Implement announcement read relationships
|
2022-03-08 13:09:49 -05:00 |
|
Tusooa Zhu
|
c867d23250
|
Fill properties of announcements from Mastodon API spec
|
2022-03-08 09:35:35 -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 |
|
Ilja
|
cdc5bbe836
|
After code review
Use patern matching to see if someone was superuser before
|
2022-03-07 14:00:42 +01:00 |
|
Haelwenn
|
4458db3201
|
Merge branch 'fix_test_get_user_apps' into 'develop'
Fix test get_user_apps/1
See merge request pleroma/pleroma!3636
|
2022-03-06 18:40:49 +00:00 |
|
Haelwenn
|
ee32e36b01
|
Merge branch 'copyright-bump-2022' into 'develop'
Copyright bump for 2022
See merge request pleroma/pleroma!3593
|
2022-03-06 18:29:37 +00:00 |
|
Tusooa Zhu
|
79ccb6b999
|
Support fallbacking to other languages
|
2022-03-06 11:43:31 -05:00 |
|