lain
|
7637ef4203
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-08 13:13:37 +02:00 |
|
Maksim Pechnikov
|
b078e0567d
|
Merge branch 'develop' into issue/1276-2
|
2020-05-08 08:51:09 +03:00 |
|
rinpatch
|
bef08b85e5
|
Merge branch 'feature/undo-validator-reduced' into 'develop'
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
|
2020-05-07 14:28:10 +00:00 |
|
lain
|
516ff945ce
|
Merge branch 'openapi/search' into 'develop'
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
|
2020-05-07 13:38:34 +00:00 |
|
rinpatch
|
eb1f2fcbc6
|
Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
|
2020-05-07 16:13:24 +03:00 |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-07 15:05:40 +02:00 |
|
lain
|
f0c22df226
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
|
2020-05-07 14:45:20 +02:00 |
|
Egor Kislitsyn
|
dc4a448f48
|
Add OpenAPI spec for SearchController
|
2020-05-07 14:04:48 +04:00 |
|
lain
|
4c92dfb73e
|
Merge branch 'openapi/polls' into 'develop'
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
|
2020-05-07 09:19:45 +00:00 |
|
href
|
9491ba3e49
|
Streamer rework
|
2020-05-07 09:13:32 +00:00 |
|
Maksim Pechnikov
|
bd261309cc
|
added unread_notifications_count for /api/v1/accounts/verify_credentials
|
2020-05-06 15:08:38 +03:00 |
|
Maksim Pechnikov
|
8b97b6f5ba
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 14:47:50 +03:00 |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 11:44:30 +02:00 |
|
lain
|
a716543267
|
Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
|
2020-05-06 09:10:17 +00:00 |
|
lain
|
61ea8f1f5a
|
Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
|
2020-05-06 09:06:50 +00:00 |
|
lain
|
0a88bf6a9d
|
Merge branch 'openapi/follow_requests' into 'develop'
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
|
2020-05-06 09:00:39 +00:00 |
|
lain
|
957172a307
|
Merge branch 'openapi/filters' into 'develop'
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
|
2020-05-06 08:51:10 +00:00 |
|
lain
|
1ee34d4acb
|
Merge branch 'openapi/instance' into 'develop'
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
|
2020-05-06 08:46:14 +00:00 |
|
lain
|
7fdc7078ae
|
Merge branch 'openapi/lists' into 'develop'
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
|
2020-05-06 08:43:21 +00:00 |
|
lain
|
76c1a7a34b
|
Merge branch 'openapi/conversations' into 'develop'
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
|
2020-05-06 08:40:04 +00:00 |
|
Maksim Pechnikov
|
fb38b7339c
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 05:55:39 +03:00 |
|
Egor Kislitsyn
|
332e016bcd
|
Add OpenAPI spec for ScheduledActivityController
|
2020-05-05 23:42:24 +04:00 |
|
Egor Kislitsyn
|
0a1394cc1a
|
Add OpenAPI spec for PollController
|
2020-05-05 20:14:22 +04:00 |
|
lain
|
92caae5923
|
Undoing: Move undoing blocks to the pipeline everywhere.
|
2020-05-05 18:02:24 +02:00 |
|
lain
|
a3bb2e5474
|
Undoing: Move undoing announcements to the pipeline everywhere.
|
2020-05-05 16:42:34 +02:00 |
|
Egor Kislitsyn
|
3a45952a3a
|
Add OpenAPI spec for ConversationController
|
2020-05-05 17:44:46 +04:00 |
|
Egor Kislitsyn
|
32ca9f2c59
|
Render mastodon-like errors in FilterController
|
2020-05-05 17:41:16 +04:00 |
|
Egor Kislitsyn
|
46aae346f8
|
Move single used schemas to Filter operation schema
|
2020-05-05 17:41:01 +04:00 |
|
Egor Kislitsyn
|
7e7a3e1544
|
Add OpenAPI spec for FilterController
|
2020-05-05 17:41:01 +04:00 |
|
Egor Kislitsyn
|
ec1e4b4f1a
|
Add OpenAPI spec for FollowRequestController
|
2020-05-05 17:40:00 +04:00 |
|
Egor Kislitsyn
|
88a14da817
|
Add OpenAPI spec for InstanceController
|
2020-05-05 17:24:16 +04:00 |
|
lain
|
a3071f0231
|
Undoing: Move undoing likes to the pipeline everywhere.
|
2020-05-05 15:08:41 +02:00 |
|
Egor Kislitsyn
|
5ec6aad567
|
Add OpenAPI spec for ListController
|
2020-05-05 17:05:34 +04:00 |
|
Egor Kislitsyn
|
babcae7130
|
Move single used schemas to Marker operation schema
|
2020-05-05 16:45:34 +04:00 |
|
Egor Kislitsyn
|
8096565653
|
Add OpenAPI spec for MarkerController
|
2020-05-05 16:44:16 +04:00 |
|
Egor Kislitsyn
|
d861b0790a
|
Add OpenAPI spec for SubscriptionController
|
2020-05-05 16:43:00 +04:00 |
|
Egor Kislitsyn
|
d08c63500b
|
Ignore unexpected query params
|
2020-05-04 20:16:44 +04:00 |
|
lain
|
c40afe5ba0
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-04 10:43:20 +02:00 |
|
Maksim Pechnikov
|
fe7a0d660e
|
Merge branch 'develop' into issue/1276-2
|
2020-05-04 06:08:49 +03:00 |
|
rinpatch
|
3126f8a334
|
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
|
2020-05-02 16:44:55 +00:00 |
|
lain
|
3370bb0e46
|
Merge branch 'openapi/notifications' into 'develop'
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
|
2020-05-01 13:09:36 +00:00 |
|
lain
|
607e06c245
|
Merge branch 'openapi/reports' into 'develop'
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
|
2020-05-01 12:48:56 +00:00 |
|
Maksim Pechnikov
|
a92c713d9c
|
Merge branch 'develop' into issue/1276-2
|
2020-05-01 06:21:59 +03:00 |
|
Egor Kislitsyn
|
9c1adb35de
|
Merge branch 'develop' into openapi/notifications
|
2020-04-30 13:52:07 +04:00 |
|
Egor Kislitsyn
|
1898054da4
|
Merge branch 'develop' into openapi/reports
|
2020-04-30 13:51:27 +04:00 |
|
Egor Kislitsyn
|
7b0c8f0fde
|
Add tests for account registration with captcha enabled and improve errors
|
2020-04-29 21:26:07 +04:00 |
|
lain
|
0c491b904d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-29 13:19:04 +02:00 |
|
Egor Kislitsyn
|
5238ae3dd3
|
Add OpenAPI spec for NotificationController
|
2020-04-28 21:27:54 +04:00 |
|
Ivan Tashkinov
|
908cf22a6c
|
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
|
2020-04-28 19:56:20 +03:00 |
|
Egor Kislitsyn
|
560f2c1979
|
Add OpenAPI spec for ReportController
|
2020-04-28 16:50:37 +04:00 |
|