fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-24 02:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
9491 commits 27 branches 108 tags 316 MiB
Commit graph

9491 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Chvanikov 0c2b09a9ba Add migration for counter_cache table update 2020-05-08 22:08:11 +03:00
Haelwenn 769d95644d Merge branch 'feature/restrict-c2s' into 'develop' 
AP C2S: Restrict creation to `Note`s for now.

See merge request pleroma/pleroma!2472
 2020-05-07 22:29:16 +00: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 9f2bb22e15 Merge branch 'fix/streamer-wrong-arg-order' into 'develop' 
Streamer: Fix wrong argument order when rendering activities to authenticated user

Closes #1747

See merge request pleroma/pleroma!2490
 2020-05-07 13:26:29 +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 d11eea62b1 Credo fixes 2020-05-07 15:09:37 +02:00
lain 788b7e7bbd Merge fixes. 2020-05-07 14:52:37 +02:00
lain cda410adfd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced 2020-05-07 14:45:35 +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
rinpatch b7635bf2b6 Merge branch 'fix/downgraded-deps' into 'develop' 
Restore mix.lock after 2FA merge

See merge request pleroma/pleroma!2487
 2020-05-07 11:47:11 +00:00
rinpatch 9c3c142c32 Restore mix.lock after 2FA merge 
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
 2020-05-07 14:35:29 +03:00
lain 3f867d8e9b Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex 2020-05-07 10:48:09 +00:00
Egor Kislitsyn dc4a448f48
Add OpenAPI spec for SearchController 2020-05-07 14:04:48 +04:00
Egor Kislitsyn cdca62e8d4
Add schema for Tag 2020-05-07 14:04:07 +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
lain 4061841846 Merge branch 'streamer-worker-registry' into 'develop' 
Streamer rework

See merge request pleroma/pleroma!2426
 2020-05-07 09:13:32 +00:00
href 9491ba3e49 Streamer rework 2020-05-07 09:13:32 +00:00
lain f4c2bf0985 Merge branch 'issue/209' into 'develop' 
[#209] 2FA/two_factor_authentication support

See merge request pleroma/pleroma!801
 2020-05-07 08:14:54 +00:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
lain 68a126317d Merge branch 'fix/syslog-compile' into 'develop' 
Fix for syslog compile with updated rebar3

See merge request pleroma/pleroma!2482
 2020-05-06 15:44:21 +00:00
Alexander Strizhakov 4b00eb93fe
fix for syslog compile with updated rebar3 2020-05-06 18:04:16 +03:00
feld a32483f224 Merge branch 'docs/chat-in-cheatsheet' into 'develop' 
Add :chat to cheatsheet

See merge request pleroma/pleroma!2480
 2020-05-06 14:42:55 +00:00
rinpatch 473b0d9f3d Merge branch 'feature/delete-validator' into 'develop' 
Move deletions to the common pipeline

Closes #1497

See merge request pleroma/pleroma!2441
 2020-05-06 14:32:58 +00:00
Mark Felder d7537a37c7 Add :chat to cheatsheet 2020-05-06 08:55:09 -05:00
feld b73b173114 Merge branch 'fix/apache-cert-chain' into 'develop' 
Apache chain issue fix

See merge request pleroma/pleroma!2478
 2020-05-06 13:33:24 +00:00
Alexander Strizhakov 3c42caa85c
apache chain issue fix 2020-05-06 16:20:47 +03:00
Egor Kislitsyn 06c69c0a0a
Fix description 2020-05-06 14:18:19 +04:00
lain 07e7c80bc9 Merge branch 'plug-if-unless-func-options-refactoring' into 'develop' 
Refactoring of :if_func / :unless_func plug options

See merge request pleroma/pleroma!2446
 2020-05-06 09:14:05 +00: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 df846eda71 Merge branch 'bugfix/sensitive_object' into 'develop' 
Transmogrifier.set_sensitive/1: Keep sensitive set to true

Closes #954

See merge request pleroma/pleroma!2470
 2020-05-06 09:04:13 +00:00
lain c3f1ce80eb Merge branch 'fix/1726-user-pagination' into 'develop' 
Pagination fix for service users filters in admin api

Closes #1726

See merge request pleroma/pleroma!2452
 2020-05-06 09:01:42 +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 f84c8f2f0d Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop' 
Webfinger: Request account info with the acct scheme

Closes #1728

See merge request pleroma/pleroma!2465
 2020-05-06 08:46:45 +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
Haelwenn 7612d9403d Merge branch 'openapi/scheduled_activities' into 'develop' 
Add OpenAPI spec for ScheduledActivityController

See merge request pleroma/pleroma!2477
 2020-05-06 01:04:50 +00:00
Egor Kislitsyn 332e016bcd
Add OpenAPI spec for ScheduledActivityController 2020-05-05 23:42:24 +04:00
Egor Kislitsyn 6ba25d1197
Add Attachment schema 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
lain b34debe615 Undoing: Move undoing reactions to the pipeline everywhere. 2020-05-05 16:17:09 +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