Commit Graph

8924 Commits

Author SHA1 Message Date
Alexander Strizhakov
f3e074e949
little fixes 2020-01-22 18:22:54 +03:00
Alexander Strizhakov
a9c6f119ac
docs update 2020-01-22 18:08:53 +03:00
rinpatch
15db18af69 Merge branch 'mastofe/bundle-2020-01-22' into 'develop'
Update MastoFE bundle to 2020-01-22

See merge request pleroma/pleroma!2127
2020-01-22 15:06:26 +00:00
Haelwenn (lanodan) Monnier
bd3f3756fb
Update MastoFE bundle to 2020-01-22 2020-01-22 16:00:23 +01:00
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
Alexander Strizhakov
d5f8a88a37
support for updating env after settings deletion 2020-01-22 15:14:11 +03:00
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be 2020-01-22 11:22:31 +03:00
Alexander Strizhakov
7ee2f86d76 Revert "Update AdminFE build"
This reverts commit 6395ad942c
2020-01-22 08:21:35 +00:00
Maksim Pechnikov
b8d5c09f48 Merge branch 'develop' into issue/1383 2020-01-22 09:30:30 +03: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
Maksim Pechnikov
5ea8596448 Merge branch 'develop' into feature/tag_feed 2020-01-21 20:56:49 +03: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
Haelwenn (lanodan) Monnier
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-21 16:46:16 +01:00
Alexander Strizhakov
f01ab6cd29
some refactor and tests 2020-01-21 18:42:00 +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
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be 2020-01-21 10:32:27 +03:00
Alexander Strizhakov
dcae5914d1
fix for db key 2020-01-21 10:14:48 +03:00
Maksim Pechnikov
41e2332007 Merge branch 'develop' into feature/tag_feed 2020-01-21 09:23:35 +03: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
Alexander Strizhakov
8023fa48db
merge fix 2020-01-20 18:25:00 +03: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