alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,999 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

7999 Commits

Author SHA1 Message Date
rinpatch 34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop' 
Emoji Reactions: In the API, sort them by first emoji insertion date

See merge request pleroma/pleroma!2126
 2020-01-22 14:11:01 +00:00
lain 043cd5aa54 Emoji reactions: Document changes 2020-01-22 13:58:02 +01:00
lain dd3fc50ea4 Emoji reactions: Change cache and reply format 2020-01-22 13:57:42 +01:00
feld 71bffbf0b7 Merge branch 'fix/attachments-cleanup' into 'develop' 
Delete attachments in queue with infinite timeout and ensure object.data.url is an array

See merge request pleroma/pleroma!2103
 2020-01-21 22:44:04 +00:00
feld 66c6f8f6ec Merge branch 'update/adminfe-20200121-part2' into 'develop' 
AdminFE update, again

See merge request pleroma/pleroma!2125
 2020-01-21 21:15:32 +00:00
Mark Felder 2860bee604 Last AdminFE update was accidentally built from master, not develop 2020-01-21 15:09:16 -06:00
feld 6f26937647 Merge branch 'update/adminfe-20200121' into 'develop' 
Update AdminFE build

See merge request pleroma/pleroma!2124
 2020-01-21 19:49:02 +00:00
Mark Felder bc2ebdcfd6 Update AdminFE build 2020-01-21 13:41:22 -06:00
Roman Chvanikov 92c8825515 Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma into fix/attachments-cleanup 2020-01-21 19:48:27 +03:00
Roman Chvanikov 795a5fe441 Add delete_attachments queue to config 2020-01-21 19:48:14 +03:00
Roman Chvanikov 22e94bb2c7 Merge branch 'develop' into fix/attachments-cleanup 2020-01-21 19:45:13 +03:00
rinpatch 04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop' 
StatusView: Add `emoji_reactions`

See merge request pleroma/pleroma!2120
 2020-01-21 13:13:17 +00:00
lain fa47a71990 Merge branch 'issue/1484' into 'develop' 
[#1484] excludes posts of blocked users from search results

Closes #1484

See merge request pleroma/pleroma!2122
 2020-01-21 13:07:07 +00:00
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results 2020-01-21 07:40:13 +03:00
Mark Felder 390bf9b097 Merge branch 'develop' into fix/attachments-cleanup 2020-01-20 12:55:51 -06:00
lain 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions 2020-01-20 18:10:55 +01:00
lain ab36459464 Merge branch '1521-admin-report-test-fix' into 'develop' 
[#1521] AdminApiControllerTest fix: fixed create report test (OAuth)

Closes #1521

See merge request pleroma/pleroma!2121
 2020-01-20 17:10:23 +00:00
Ivan Tashkinov ca3b4de2c9 [#1521] AdminApiControllerTest: fixed create report test (OAuth). 2020-01-20 20:04:25 +03:00
rinpatch 00d08c9231 Merge branch 'favoritng-responses' into 'develop' 
Mastodon API: Align favoriting / repeating behavior with Mastodon

See merge request pleroma/pleroma!2119
 2020-01-20 16:31:43 +00:00
lain 7518f3877f Update changelog 2020-01-20 16:31:12 +01:00
lain 4c5b5f14dc StatusView: Add `emoji_reactions` 2020-01-20 16:24:20 +01:00
lain 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop' 
Bump credo to 1.1.5

See merge request pleroma/pleroma!2115
 2020-01-20 14:42:43 +00:00
lain 2199d63ddc StatusControllerTest: Fix typo 2020-01-20 15:31:14 +01:00
lain 42ea480e95 Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop' 
Pleroma API: `emoji_reactions_by` does not need authorization

See merge request pleroma/pleroma!2117
 2020-01-20 13:49:06 +00:00
lain 510776ba31 CommonAPI: Don't error out on double favs/repeats 2020-01-20 14:27:59 +01:00
lain c814f22030 Merge branch 'fix-admin-api-scope' into 'develop' 
fix oauth scopes for AdminApi#reports_update

See merge request pleroma/pleroma!2087
 2020-01-20 12:07:12 +00:00
lain 5fddf988ea Pleroma API: `emoji_reactions_by` does not need authorization 2020-01-20 13:05:35 +01:00
Haelwenn e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop' 
Hashtag benchmarks

See merge request pleroma/pleroma!2116
 2020-01-20 11:26:07 +00:00
lain 271afcd940 Add benchmark of any/all tag options 2020-01-20 12:19:15 +01:00
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
rinpatch 9367b70f37 Merge branch 'features/cleanup-incoming-actor' into 'develop' 
transmogrifier.ex: simplify handle_incoming of actors

See merge request pleroma/pleroma!2114
 2020-01-20 10:25:17 +00:00
lain 7731f9a447 Merge branch 'feat/startup-migration-check' into 'develop' 
Check for unapplied migrations on startup

Closes #1328

See merge request pleroma/pleroma!2112
 2020-01-20 09:56:16 +00:00
rinpatch dc0498ab2b Check for unapplied migrations on startup 
Closes #1328
 2020-01-20 12:20:26 +03:00
Roman Chvanikov cde828ff7d Fix credo warning 2020-01-19 22:09:47 +03:00
Roman Chvanikov 0f1fc382d0 Add test case for attachment deletion when non-map data.url present in DB 2020-01-19 22:04:14 +03:00
Roman Chvanikov d6a532bf0f Delete attachments asynchronously 2020-01-19 19:45:20 +03:00
rinpatch 205e73058d mix.lock: update mock to 0.3.4 
This version adds Mock.passthrough/1 which I need to use in a test
 2020-01-19 13:42:52 +03:00
Haelwenn (lanodan) Monnier 6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors 2020-01-19 07:06:15 +01:00
Roman Chvanikov 81133702d4 Delete attachments after object and cache cleanup 2020-01-17 20:20:37 +03:00
feld 52a0bf62f5 Merge branch 'ci/docker-imaging' into 'develop' 
ci/docker imaging

See merge request pleroma/pleroma!2110
 2020-01-15 22:52:53 +00:00
jp 1e17ad2275 Update docker release / stable jobs 2020-01-15 17:25:33 -05:00
jp ffab411327 Update docker jobs for release branches and stable branches 2020-01-15 16:54:53 -05:00
jp 0c9499bf25 Fix only: on docker develop/latest job 2020-01-15 16:41:41 -05:00
jp 4d19f38753 update `only:` for release/ branch regex matching. and to avoid running image builds on unnecessary forks 2020-01-15 16:23:43 -05:00
jp cc4c3255fe Fix odd spacing 2020-01-15 16:16:29 -05:00
lain 6317183acd Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop' 
[#1478] OAuth `admin` scopes tweaks

Closes #1478

See merge request pleroma/pleroma!2081
 2020-01-15 15:44:49 +00:00
Ivan Tashkinov d1e9768e10 [#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808. 2020-01-15 18:38:18 +03:00
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 2020-01-15 18:12:08 +03:00
lain 1b233aa653 Merge branch 'notifications-from-account' into 'develop' 
[#1470] Add support for `account_id` param to filter notifications by the account

See merge request pleroma/pleroma!2073
 2020-01-15 14:05:22 +00:00
Egor Kislitsyn 023b7f605b
Fix notification controller test 2020-01-15 16:51:09 +04:00