akkoma

itepechi/akkoma

Fork 0

Commit graph

aa0f0d4edd

Disable NewUsersDigestEmail by default Egor Kislitsyn 2020-01-22 20:53:06 +0400
df0b8f1d08

Add new users digest email Egor Kislitsyn 2020-01-22 20:31:42 +0400
f3e074e949

little fixes Alexander Strizhakov 2020-01-22 18:22:54 +0300
a9c6f119ac

docs update Alexander Strizhakov 2020-01-22 18:08:53 +0300
15db18af69 Merge branch 'mastofe/bundle-2020-01-22' into 'develop' rinpatch 2020-01-22 15:06:26 +0000
bd3f3756fb

Update MastoFE bundle to 2020-01-22 Haelwenn (lanodan) Monnier 2020-01-22 16:00:23 +0100
34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop' rinpatch 2020-01-22 14:11:01 +0000
043cd5aa54 Emoji reactions: Document changes lain 2020-01-22 13:58:02 +0100
dd3fc50ea4 Emoji reactions: Change cache and reply format lain 2020-01-22 13:57:42 +0100
d5f8a88a37

support for updating env after settings deletion Alexander Strizhakov 2020-01-22 15:14:11 +0300
32a643a159

Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-22 11:22:31 +0300
7ee2f86d76 Revert "Update AdminFE build" Alexander Strizhakov 2020-01-22 08:21:35 +0000
b8d5c09f48 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-22 09:30:30 +0300
71bffbf0b7 Merge branch 'fix/attachments-cleanup' into 'develop' feld 2020-01-21 22:44:04 +0000
66c6f8f6ec Merge branch 'update/adminfe-20200121-part2' into 'develop' feld 2020-01-21 21:15:32 +0000
2860bee604 Last AdminFE update was accidentally built from master, not develop Mark Felder 2020-01-21 15:09:16 -0600
6f26937647 Merge branch 'update/adminfe-20200121' into 'develop' feld 2020-01-21 19:49:02 +0000
bc2ebdcfd6 Update AdminFE build Mark Felder 2020-01-21 13:41:22 -0600
5ea8596448 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-21 20:56:49 +0300
92c8825515 Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma into fix/attachments-cleanup Roman Chvanikov 2020-01-21 19:48:27 +0300
795a5fe441 Add delete_attachments queue to config Roman Chvanikov 2020-01-21 19:48:14 +0300
22e94bb2c7 Merge branch 'develop' into fix/attachments-cleanup Roman Chvanikov 2020-01-21 19:45:13 +0300
7bfb8ed14d

remote_follow_controller.ex: Redirect to the user page on success Haelwenn (lanodan) Monnier 2020-01-21 16:16:59 +0100
f01ab6cd29

some refactor and tests Alexander Strizhakov 2020-01-21 17:49:22 +0300
04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop' rinpatch 2020-01-21 13:13:17 +0000
fa47a71990 Merge branch 'issue/1484' into 'develop' lain 2020-01-21 13:07:07 +0000
503d966e9f

Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-21 10:32:27 +0300
dcae5914d1

fix for db key Alexander Strizhakov 2020-01-21 10:14:48 +0300
41e2332007 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-21 09:23:35 +0300
6e88a7e591 exclude blocked user posts from search results Maksim Pechnikov 2020-01-20 21:47:44 +0300
390bf9b097 Merge branch 'develop' into fix/attachments-cleanup Mark Felder 2020-01-20 12:55:51 -0600
7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions lain 2020-01-20 18:10:55 +0100
ab36459464 Merge branch '1521-admin-report-test-fix' into 'develop' lain 2020-01-20 17:10:23 +0000
ca3b4de2c9 [#1521] AdminApiControllerTest: fixed create report test (OAuth). Ivan Tashkinov 2020-01-20 20:04:25 +0300
00d08c9231 Merge branch 'favoritng-responses' into 'develop' rinpatch 2020-01-20 16:31:43 +0000
7518f3877f Update changelog lain 2020-01-20 16:31:12 +0100
8023fa48db

merge fix Alexander Strizhakov 2020-01-20 18:25:00 +0300
4c5b5f14dc StatusView: Add emoji_reactions lain 2020-01-20 16:24:20 +0100
6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop' lain 2020-01-20 14:42:43 +0000
2199d63ddc StatusControllerTest: Fix typo lain 2020-01-20 15:31:14 +0100
42ea480e95 Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop' lain 2020-01-20 13:49:06 +0000
510776ba31 CommonAPI: Don't error out on double favs/repeats lain 2020-01-20 14:27:59 +0100
c814f22030 Merge branch 'fix-admin-api-scope' into 'develop' lain 2020-01-20 12:07:12 +0000
5fddf988ea Pleroma API: emoji_reactions_by does not need authorization lain 2020-01-20 13:05:35 +0100
e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop' Haelwenn 2020-01-20 11:26:07 +0000
271afcd940 Add benchmark of any/all tag options lain 2020-01-20 12:19:15 +0100
5c533e10e7

Bump credo to 1.1.5 Haelwenn (lanodan) Monnier 2020-01-20 11:53:14 +0100
9367b70f37 Merge branch 'features/cleanup-incoming-actor' into 'develop' rinpatch 2020-01-20 10:25:17 +0000
7731f9a447 Merge branch 'feat/startup-migration-check' into 'develop' lain 2020-01-20 09:56:16 +0000
dc0498ab2b Check for unapplied migrations on startup rinpatch 2020-01-16 19:01:31 +0300
cde828ff7d Fix credo warning Roman Chvanikov 2020-01-19 22:09:47 +0300
0f1fc382d0 Add test case for attachment deletion when non-map data.url present in DB Roman Chvanikov 2020-01-19 22:04:14 +0300
d6a532bf0f Delete attachments asynchronously Roman Chvanikov 2020-01-19 19:45:20 +0300
205e73058d mix.lock: update mock to 0.3.4 rinpatch 2020-01-19 13:33:46 +0300
6cf3b19a38

transmogrifier.ex: simplify handle_incoming of actors Haelwenn (lanodan) Monnier 2020-01-19 07:02:16 +0100
efb8ef5abe

releases support Alexander Strizhakov 2020-01-18 16:55:33 +0300
e699861690

full update for some subkeys Alexander Strizhakov 2020-01-18 12:25:56 +0300
81133702d4 Delete attachments after object and cache cleanup Roman Chvanikov 2020-01-17 20:20:37 +0300
89e93fb33f

return db key on update requests Alexander Strizhakov 2020-01-17 18:08:45 +0300
7676ed8239

some clean up Alexander Strizhakov 2020-01-17 16:28:44 +0300
ce027fd0ef

revert non needable Alexander Strizhakov 2020-01-17 15:13:24 +0300
9e10b90b5b

configure only console backend Alexander Strizhakov 2020-01-17 15:06:42 +0300
108a39c876 updated error messages for authentication process Maksim Pechnikov 2020-01-17 14:55:36 +0300
b310feeccb

compile fix Alexander Strizhakov 2020-01-17 15:00:20 +0300
58e8963824

fix for config loader Alexander Strizhakov 2020-01-17 11:54:22 +0300
60ba2339a2

saving to DB only added by user settings Alexander Strizhakov 2020-01-17 11:45:44 +0300
4e069ce537 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-01-16 16:17:56 +0000
5664427d6c branch sadposter 2020-01-16 16:13:51 +0000
29155137fd

renaming Alexander Strizhakov 2020-01-16 08:50:27 +0300
52a0bf62f5 Merge branch 'ci/docker-imaging' into 'develop' feld 2020-01-15 22:52:53 +0000
1e17ad2275 Update docker release / stable jobs jp 2020-01-15 17:25:33 -0500
ffab411327 Update docker jobs for release branches and stable branches jp 2020-01-15 16:54:53 -0500
0c9499bf25 Fix only: on docker develop/latest job jp 2020-01-15 16:41:41 -0500
4d19f38753 update only: for release/ branch regex matching. and to avoid running image builds on unnecessary forks jp 2020-01-15 16:23:43 -0500
cc4c3255fe Fix odd spacing jp 2020-01-15 16:16:29 -0500
a5db044e57 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-15 19:11:13 +0300
6317183acd Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop' lain 2020-01-15 15:44:49 +0000
d1e9768e10 [#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808. Ivan Tashkinov 2020-01-15 18:38:18 +0300
5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks Ivan Tashkinov 2020-01-15 18:12:08 +0300
aa9fe3a712 Merge branch 'develop' into 'feature/tag_feed' lain 2020-01-15 14:29:56 +0000
59ba5c80b9

little cleanup Alexander Strizhakov 2020-01-15 17:10:33 +0300
66de2b159b

don't migrate Pleroma.Web.EndPoint settings Alexander Strizhakov 2020-01-15 17:08:45 +0300
1b233aa653 Merge branch 'notifications-from-account' into 'develop' lain 2020-01-15 14:05:22 +0000
023b7f605b

Fix notification controller test Egor Kislitsyn 2020-01-15 16:51:09 +0400
3849053c6a

Merge branch 'develop' into notifications-from-account Egor Kislitsyn 2020-01-15 16:49:45 +0400
167e9c45ec Benchmarks: Move to correct folder lain 2020-01-15 12:37:50 +0100
76c1948880 [#1478] Adjusted AdminAPIController admin subscope requirements. Ivan Tashkinov 2020-01-15 12:11:23 +0300
e02eb8de3e Add OTP to updating.md ilja 2020-01-15 09:12:24 +0100
77412d5dd2 Merge branch 'features/docker-updates' into 'develop' feld 2020-01-14 21:36:52 +0000
a58a0a7b1b Remove forked test branch matching jp 2020-01-14 13:47:36 -0500
ff15d6ef13 Remove artifacts passing by setting dependencies: [] jp 2020-01-14 13:45:47 -0500
c9f45edeac Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-14 16:26:56 +0300
b4532277b1 Merge branch 'features/docker-updates' into 'develop' lain 2020-01-14 17:48:58 +0000
964d188a96 Add allow_failure to docker jobs jp 2020-01-14 12:43:28 -0500
fe57e5139f Remove cache from docker jobs. Split devlop and stable branches into their own jobs jp 2020-01-14 12:32:36 -0500
a9c7cd341b

Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-14 19:56:33 +0300
0709757e47 Check if object->data is array when looking up attachment objects to delete Roman Chvanikov 2020-01-14 19:53:28 +0300
2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags lain 2020-01-14 17:24:26 +0100
d150c598d7 Merge branch 'warnings-fix' into 'develop' lain 2020-01-14 16:11:36 +0000
0d331f3d23

compilation warnings fix Alexander Strizhakov 2020-01-14 15:49:52 +0300