Tusooa Zhu
|
4edc867b87
|
Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'
# Conflicts:
# lib/pleroma/constants.ex
|
2022-07-03 22:24:57 +00:00 |
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 |
Tusooa Zhu
|
44613db853
|
Show original status at the first of history
|
2022-06-11 19:52:07 -04:00 |
Tusooa Zhu
|
27f3d802f2
|
Expose history and source apis to anon users
|
2022-06-11 10:35:36 -04:00 |
Tusooa Zhu
|
c3593639ad
|
Fix incorrectly cached content after editing
|
2022-06-09 11:39:51 -04:00 |
Tusooa Zhu
|
aafd7a687d
|
Return the corresponding object id in attachment view
|
2022-06-08 11:45:24 -04:00 |
Tusooa Zhu
|
b613a9ec6b
|
Implement mastodon api for editing status
|
2022-05-31 14:32:28 -04:00 |
Tusooa Zhu
|
393b508846
|
Implement viewing source
|
2022-05-30 00:59:23 -04:00 |
Tusooa Zhu
|
c004eb0fa2
|
Implement mastodon api for showing edit history
|
2022-05-29 23:50:31 -04:00 |
Tusooa Zhu
|
7d1dae3bef
|
Restrict mastodon api announcements to logged-in users only
|
2022-04-02 02:25:13 -04: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 |
Tusooa Zhu
|
0c78ab4a88
|
Use utc_datetime in db schema
|
2022-03-18 11:17:22 -04: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
|
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
|
e644f8dea5
|
Allow user to register with custom language
|
2022-03-02 01:41:13 -05:00 |
Sean King
|
17aa3644be
|
Copyright bump for 2022
|
2022-02-25 23:11:42 -07:00 |
Alex Gleason
|
7c044a1841
|
FilterControllerTest: tag erratic test
|
2022-02-02 13:10:39 -06:00 |
Alex Gleason
|
aaa9314f4c
|
Merge remote-tracking branch 'origin/develop' into birth-dates
|
2022-01-22 14:24:50 -06:00 |
Alex Gleason
|
66e8c6f90f
|
Birthdays: birth_date --> birthday
|
2022-01-22 13:21:55 -06:00 |
NEETzsche
|
7a015b1fe2
|
Make test less erratic by adding five second tolerance
|
2022-01-22 12:07:54 -07:00 |
Alex Gleason
|
f5d4ef50b4
|
FilterTest: tag erratic test
|
2022-01-22 12:13:09 -06:00 |
Alex Gleason
|
00523bdf5e
|
Test pinned private statuses in AccountController
|
2022-01-20 16:54:43 -06:00 |
marcin mikołajczak
|
dfb2808535
|
Birth dates: Add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 23:15:31 +01:00 |
marcin mikołajczak
|
eedf551eed
|
Add more tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-12 22:41:34 +01:00 |
marcin mikołajczak
|
0f90fd5805
|
WIP account endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-12 18:15:10 +01:00 |
marcin mikołajczak
|
746c9daa62
|
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:27:27 +01:00 |
marcin mikołajczak
|
f734579965
|
MastoAPI: Add `GET /api/v1/accounts/lookup`
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:11:17 +01:00 |
Alex Gleason
|
2e4a1c56c3
|
AppController: test creating with and without a user
|
2021-12-27 18:14:15 -06:00 |
marcin mikołajczak
|
de006443f0
|
MastoAPI: Profile directory
|
2021-12-26 02:35:17 +00:00 |
Alex Gleason
|
73609211a4
|
Merge branch 'account-notes' into 'develop'
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
|
2021-12-25 01:41:12 +00:00 |
Alex Gleason
|
b96a58ff28
|
Merge branch 'account-subscriptions' into 'develop'
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
|
2021-12-25 01:34:27 +00: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 |
marcin mikołajczak
|
c96e52b88c
|
Add 'notifying' to relationship for compatibility with Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-06 21:24:12 +01:00 |
marcin mikołajczak
|
3892bd353b
|
Add test for following with subscription
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-06 21:15:03 +01:00 |
Alex Gleason
|
e5a7547fbe
|
v2 Suggestions: also filter out users you follow
|
2021-11-26 21:46:08 -06:00 |
Alex Gleason
|
437c1a5a52
|
v2 Suggestions: actually flter out dismissed suggestions
|
2021-11-26 21:09:37 -06:00 |
Alex Gleason
|
aee55b9a8b
|
v2 Suggestions: dismiss a suggestion
|
2021-11-26 20:19:29 -06:00 |
Alex Gleason
|
b17360cd7c
|
v2 Suggestions: rudimentary API response
|
2021-11-26 14:34:10 -06:00 |
Alex Gleason
|
7e1caddc58
|
v2 Suggestions: return empty array
|
2021-11-25 14:57:36 -06:00 |
marcin mikołajczak
|
cb76faece9
|
Update test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 17:51:00 +01:00 |
marcin mikołajczak
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 16:56:26 +01:00 |
lain
|
e2772d6bf1
|
Merge branch 'block-behavior' into 'develop'
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
|
2021-11-15 14:27:59 +00: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 |
Haelwenn
|
6b3842cf50
|
Merge branch 'remove/mastofe' into 'develop'
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
|
2021-09-07 16:41:53 +00:00 |
Alex Gleason
|
62bf6d67e3
|
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
|
2021-07-18 11:49:22 -05:00 |
Alex Gleason
|
0114754db2
|
MastodonAPI: Support poll notification
|
2021-07-17 22:19:38 -05:00 |
Sean King
|
5d279a22b1
|
Merge develop branch upstream
|
2021-07-10 11:04:16 -06:00 |