phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 2bad25cf14
         fix for migrate to db test Alexander Strizhakov 2020-01-23 15:13:27 +03:00
  • 34fc0ca053 Emoji reactions: Add sanity checks for the cache lain 2020-01-23 12:34:34 +01:00
  • 2cfe1b9385 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-23 11:42:10 +03:00
  • 5fc2fa8908 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-23 11:11:18 +03:00
  • ce7c887a27 removed try/rescue Maksim Pechnikov 2020-01-23 11:05:08 +03:00
  • 6f77b77428 Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex Maksim 2020-01-23 05:49:00 +00:00
  • dddebee047 Merge branch 'emoji-notifications' into 'develop' Haelwenn 2020-01-23 02:12:03 +00:00
  • 73e6bbbe89 Merge branch 'develop' into 'develop' Haelwenn 2020-01-23 02:05:22 +00:00
  • 89eeadc2a8
         Updated OpenBSD installation guide for version OpenBSD 6.6 * initdb command now requires explicit -U and -D flags * acme-client now requires version v02 API endpoint * Added step to add admin user, per other installation guides * Corrected setup_db.psql path Farhan Khan 2020-01-22 17:33:10 -05:00
  • 4c59e9477a Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest Mark Felder 2020-01-22 15:59:37 -06:00
  • e151dea276 Merge branch 'develop' into feature/new-registrations-digest Mark Felder 2020-01-22 15:59:24 -06:00
  • ae78059ff4 Merge branch 'develop' into features/remote-follow-userpage-redirect Mark Felder 2020-01-22 15:05:39 -06:00
  • 002146d297 Update changelog lain 2020-01-22 20:12:45 +01:00
  • 85f45c7689 Document new EmojiReaction notifications lain 2020-01-22 20:11:18 +01:00
  • 615b72238e Notifications: Add emoji reaction notifications lain 2020-01-22 20:06:12 +01:00
  • 0b843f2567
         Update CHANGELOG Egor Kislitsyn 2020-01-22 22:29:07 +04:00
  • b8b90d967a
         Update documentation Egor Kislitsyn 2020-01-22 22:21:32 +04:00
  • cf96c40057 [#1505] Added Mastodon-compatible replies collection to Note federated representation. Ivan Tashkinov 2020-01-22 21:10:17 +03:00
  • 6e6f1ead31 Merge branch 'no-error-404' into 'develop' rinpatch 2020-01-22 17:55:49 +00:00
  • cf19bf3c7c Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-22 20:20:39 +03:00
  • 7c0ac54437 Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex minibikini 2020-01-22 17:18:55 +00:00
  • 5c842e3b68
         Merge branch 'develop' into feature/new-registrations-digest Egor Kislitsyn 2020-01-22 21:18:27 +04:00
  • be27777156 Merge branch 'admin-be' into 'develop' feld 2020-01-22 17:13:17 +00:00
  • b6f5b326e7
         Fix credo warnings Egor Kislitsyn 2020-01-22 20:59:58 +04:00
  • e761d76e4f Apply suggestion to docs/configuration/cheatsheet.md Maksim 2020-01-22 16:58:50 +00:00
  • d43c9ab286 Apply suggestion to docs/configuration/cheatsheet.md Maksim 2020-01-22 16:58:43 +00:00
  • aa0f0d4edd
         Disable NewUsersDigestEmail by default Egor Kislitsyn 2020-01-22 20:53:06 +04:00
  • df0b8f1d08
         Add new users digest email Egor Kislitsyn 2020-01-22 20:31:42 +04:00
  • f3e074e949
         little fixes Alexander Strizhakov 2020-01-22 18:22:54 +03:00
  • a9c6f119ac
         docs update Alexander Strizhakov 2020-01-22 18:08:53 +03:00
  • 15db18af69 Merge branch 'mastofe/bundle-2020-01-22' into 'develop' rinpatch 2020-01-22 15:06:26 +00:00
  • bd3f3756fb
         Update MastoFE bundle to 2020-01-22 Haelwenn (lanodan) Monnier 2020-01-22 16:00:23 +01:00
  • 34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop' rinpatch 2020-01-22 14:11:01 +00:00
  • 043cd5aa54 Emoji reactions: Document changes lain 2020-01-22 13:58:02 +01:00
  • dd3fc50ea4 Emoji reactions: Change cache and reply format lain 2020-01-22 13:57:42 +01:00
  • d5f8a88a37
         support for updating env after settings deletion Alexander Strizhakov 2020-01-22 15:14:11 +03:00
  • 32a643a159
         Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-22 11:22:31 +03:00
  • 7ee2f86d76 Revert "Update AdminFE build" Alexander Strizhakov 2020-01-22 08:21:35 +00:00
  • b8d5c09f48 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-22 09:30:30 +03:00
  • 35282ccbe3 Updates Your New SJW Waifu 2020-01-21 18:31:41 -06:00
  • 71bffbf0b7 Merge branch 'fix/attachments-cleanup' into 'develop' feld 2020-01-21 22:44:04 +00:00
  • 66c6f8f6ec Merge branch 'update/adminfe-20200121-part2' into 'develop' feld 2020-01-21 21:15:32 +00:00
  • 2860bee604 Last AdminFE update was accidentally built from master, not develop Mark Felder 2020-01-21 15:09:16 -06:00
  • 6f26937647 Merge branch 'update/adminfe-20200121' into 'develop' feld 2020-01-21 19:49:02 +00:00
  • bc2ebdcfd6 Update AdminFE build Mark Felder 2020-01-21 13:41:22 -06:00
  • 5ea8596448 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-21 20:56:49 +03:00
  • 92c8825515 Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma into fix/attachments-cleanup Roman Chvanikov 2020-01-21 19:48:27 +03:00
  • 795a5fe441 Add delete_attachments queue to config Roman Chvanikov 2020-01-21 19:48:14 +03:00
  • 22e94bb2c7 Merge branch 'develop' into fix/attachments-cleanup Roman Chvanikov 2020-01-21 19:45:13 +03:00
  • 7bfb8ed14d
         remote_follow_controller.ex: Redirect to the user page on success Haelwenn (lanodan) Monnier 2020-01-21 16:16:59 +01:00
  • f01ab6cd29
         some refactor and tests Alexander Strizhakov 2020-01-21 17:49:22 +03:00
  • 04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop' rinpatch 2020-01-21 13:13:17 +00:00
  • fa47a71990 Merge branch 'issue/1484' into 'develop' lain 2020-01-21 13:07:07 +00:00
  • 503d966e9f
         Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-21 10:32:27 +03:00
  • dcae5914d1
         fix for db key Alexander Strizhakov 2020-01-21 10:14:48 +03:00
  • 41e2332007 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-21 09:23:35 +03:00
  • 6e88a7e591 exclude blocked user posts from search results Maksim Pechnikov 2020-01-20 21:47:44 +03:00
  • 390bf9b097 Merge branch 'develop' into fix/attachments-cleanup Mark Felder 2020-01-20 12:55:51 -06:00
  • 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions lain 2020-01-20 18:10:55 +01:00
  • ab36459464 Merge branch '1521-admin-report-test-fix' into 'develop' lain 2020-01-20 17:10:23 +00:00
  • ca3b4de2c9 [#1521] AdminApiControllerTest: fixed create report test (OAuth). Ivan Tashkinov 2020-01-20 20:04:25 +03:00
  • 00d08c9231 Merge branch 'favoritng-responses' into 'develop' rinpatch 2020-01-20 16:31:43 +00:00
  • 7518f3877f Update changelog lain 2020-01-20 16:31:12 +01:00
  • 8023fa48db
         merge fix Alexander Strizhakov 2020-01-20 18:25:00 +03:00
  • 4c5b5f14dc StatusView: Add emoji_reactions lain 2020-01-20 16:24:20 +01:00
  • 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop' lain 2020-01-20 14:42:43 +00:00
  • 2199d63ddc StatusControllerTest: Fix typo lain 2020-01-20 15:31:14 +01:00
  • 42ea480e95 Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop' lain 2020-01-20 13:49:06 +00:00
  • 510776ba31 CommonAPI: Don't error out on double favs/repeats lain 2020-01-20 14:27:59 +01:00
  • c814f22030 Merge branch 'fix-admin-api-scope' into 'develop' lain 2020-01-20 12:07:12 +00:00
  • 5fddf988ea Pleroma API: emoji_reactions_by does not need authorization lain 2020-01-20 13:05:35 +01:00
  • e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop' Haelwenn 2020-01-20 11:26:07 +00:00
  • 271afcd940 Add benchmark of any/all tag options lain 2020-01-20 12:19:15 +01:00
  • 5c533e10e7
         Bump credo to 1.1.5 Haelwenn (lanodan) Monnier 2020-01-20 11:53:14 +01:00
  • 9367b70f37 Merge branch 'features/cleanup-incoming-actor' into 'develop' rinpatch 2020-01-20 10:25:17 +00:00
  • 7731f9a447 Merge branch 'feat/startup-migration-check' into 'develop' lain 2020-01-20 09:56:16 +00:00
  • dc0498ab2b Check for unapplied migrations on startup rinpatch 2020-01-16 19:01:31 +03:00
  • cde828ff7d Fix credo warning Roman Chvanikov 2020-01-19 22:09:47 +03:00
  • 0f1fc382d0 Add test case for attachment deletion when non-map data.url present in DB Roman Chvanikov 2020-01-19 22:04:14 +03:00
  • d6a532bf0f Delete attachments asynchronously Roman Chvanikov 2020-01-19 19:45:20 +03:00
  • 205e73058d mix.lock: update mock to 0.3.4 rinpatch 2020-01-19 13:33:46 +03:00
  • 6cf3b19a38
         transmogrifier.ex: simplify handle_incoming of actors Haelwenn (lanodan) Monnier 2020-01-19 07:02:16 +01:00
  • efb8ef5abe
         releases support Alexander Strizhakov 2020-01-18 16:55:33 +03:00
  • e699861690
         full update for some subkeys Alexander Strizhakov 2020-01-18 12:25:56 +03:00
  • 81133702d4 Delete attachments after object and cache cleanup Roman Chvanikov 2020-01-17 20:20:37 +03:00
  • 89e93fb33f
         return db key on update requests Alexander Strizhakov 2020-01-17 18:08:45 +03:00
  • 7676ed8239
         some clean up Alexander Strizhakov 2020-01-17 16:28:44 +03:00
  • ce027fd0ef
         revert non needable Alexander Strizhakov 2020-01-17 15:13:24 +03:00
  • 9e10b90b5b
         configure only console backend Alexander Strizhakov 2020-01-17 15:06:42 +03:00
  • 108a39c876 updated error messages for authentication process Maksim Pechnikov 2020-01-17 14:55:36 +03:00
  • b310feeccb
         compile fix Alexander Strizhakov 2020-01-17 15:00:20 +03:00
  • 58e8963824
         fix for config loader Alexander Strizhakov 2020-01-17 11:54:22 +03:00
  • 60ba2339a2
         saving to DB only added by user settings Alexander Strizhakov 2020-01-17 11:45:44 +03:00
  • 29155137fd
         renaming Alexander Strizhakov 2020-01-16 08:50:27 +03:00
  • 5b0fc7c0d7 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-01-15 22:41:23 -06:00
  • 52a0bf62f5 Merge branch 'ci/docker-imaging' into 'develop' feld 2020-01-15 22:52:53 +00:00
  • 1e17ad2275 Update docker release / stable jobs jp 2020-01-15 17:25:33 -05:00
  • ffab411327 Update docker jobs for release branches and stable branches jp 2020-01-15 16:54:53 -05:00
  • 0c9499bf25 Fix only: on docker develop/latest job jp 2020-01-15 16:41:41 -05:00
  • 4d19f38753 update only: for release/ branch regex matching. and to avoid running image builds on unnecessary forks jp 2020-01-15 16:23:43 -05:00