Commit graph

  • 10762ea2ac Merge branch 'feature/tag_feed' into 'develop' lain 2020-01-28 16:14:23 +0000
  • d385789a45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed lain 2020-01-28 17:06:36 +0100
  • 271935953a Merge branch 'whole-db-removal' into 'develop' Haelwenn 2020-01-28 15:51:45 +0000
  • 4eb935be78
    Create pleroma.email mix task Haelwenn (lanodan) Monnier 2020-01-20 13:23:21 +0100
  • e816edbb2f Update streamer_test.exs lain 2020-01-28 15:42:05 +0000
  • 77f24525ca Streamer: Correctly handle reblog mutes lain 2020-01-28 16:40:44 +0100
  • 6302b40791
    Warn if HTTPSecurityPlug is disabled Egor Kislitsyn 2020-01-28 18:04:13 +0400
  • 33bd8fbffe
    filename and test fixes Alexander Strizhakov 2020-01-28 18:02:11 +0300
  • d9cb8acd3e Merge branch 'fix/attachments-cleanup' into 'develop' feld 2020-01-28 14:52:57 +0000
  • ffa9e3a2ce Merge branch 'fix-elixir-v1.10' into 'develop' lain 2020-01-28 14:30:34 +0000
  • 2ddd1bb088
    Fix compatibility with Elixir v1.10 Egor Kislitsyn 2020-01-28 18:23:59 +0400
  • d18a2e4e36 Add test for custom base_url when deleting an attachment Roman Chvanikov 2020-01-28 17:22:24 +0300
  • 804a702f97 Fix base_url string trimming Roman Chvanikov 2020-01-28 17:07:46 +0300
  • dea968463d Add logging Roman Chvanikov 2020-01-28 16:52:20 +0300
  • 46915207b6 Remove whole_db parameter everywhere, it's not used anymore lain 2020-01-28 14:40:40 +0100
  • e3fae3380e Apply suggestion to lib/pleroma/web/feed/tag_controller.ex lain 2020-01-28 13:38:49 +0000
  • 7f78bd7e37 Fix __MODULE__ usage Roman Chvanikov 2020-01-28 16:38:44 +0300
  • 93b9f226e0
    path fix Alexander Strizhakov 2020-01-28 16:32:33 +0300
  • da334ef934 Apply suggestion to mix.lock Alexander Strizhakov 2020-01-28 13:29:48 +0000
  • 251bbd794a Apply suggestion to mix.exs Alexander Strizhakov 2020-01-28 13:29:44 +0000
  • 6fab5fe7f8 Merge branch 'translation/errors-french' into 'develop' lain 2020-01-28 13:26:28 +0000
  • dd5a24073f Merge branch 'docs_introduction' into 'develop' lain 2020-01-28 12:57:07 +0000
  • c8964cc438 DOCS General update for the "Introduction to Pleroma" section Ilja 2020-01-28 12:57:06 +0000
  • 95afcae194 Merge branch 'support/update_ecto' into 'develop' lain 2020-01-28 12:49:22 +0000
  • aa3ba63513
    like this Alexander Strizhakov 2020-01-28 15:41:45 +0300
  • 4f004ab92e Merge branch 'fix/attachments-cleanup' into 'develop' lain 2020-01-28 12:40:00 +0000
  • 51283bf996 Formatter: Add a test for domain / username clashes lain 2020-01-28 13:38:21 +0100
  • 91ea3ed82c
    moving restarter application into pleroma repo Alexander Strizhakov 2020-01-28 15:19:05 +0300
  • 02c3dd2e3d update ecto Maksim Pechnikov 2020-01-28 10:43:47 +0300
  • eb4870e1cd Remove unused var Roman Chvanikov 2020-01-28 03:54:54 +0300
  • 52e08ec9fd explicitly describe perform op in AttachmentsClenupWorker Roman Chvanikov 2020-01-28 03:52:35 +0300
  • be926863a8 fix test Maksim Pechnikov 2020-01-27 21:20:33 +0300
  • bcffa662dc Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-27 21:13:13 +0300
  • 7c6e5c541d
    docs update Alexander Strizhakov 2020-01-27 19:48:20 +0300
  • b12f306473 Merge branch 'remove/suggestions-third-party-engine' into 'develop' Haelwenn 2020-01-27 13:21:50 +0000
  • dabd535e43 Remove user recommendation by third party engine Hakaba Hitoyo 2020-01-27 13:21:50 +0000
  • e442ea5722 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-01-27 15:20:47 +0300
  • 0b582d415b Merge branch 'descriptions-fixes' into 'develop' Haelwenn 2020-01-27 11:45:26 +0000
  • f72727a409
    little fixes Alexander Strizhakov 2020-01-27 12:53:21 +0300
  • bfc70fdf29 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-27 08:48:19 +0300
  • 86c4b76bf0 Fix typo Roman Chvanikov 2020-01-27 04:01:50 +0300
  • 36838b516f Merge branch 'fix/runtime-config' into 'develop' feld 2020-01-26 17:35:21 +0000
  • f4335ccd7a Merge branch 'issue/1280' into 'develop' feld 2020-01-26 17:33:12 +0000
  • d770cffce0 Merge branch 'develop' into issue/1280 Mark Felder 2020-01-26 11:23:05 -0600
  • d9e2bd8f40 Merge branch 'fix/descriptions' into 'develop' feld 2020-01-26 17:21:49 +0000
  • 5943d78c74
    description typos, Oban verbose type fix, new keys Alexander Strizhakov 2020-01-25 19:45:51 +0300
  • ac97d01fb6
    right test Alexander Strizhakov 2020-01-25 19:21:21 +0300
  • e93cc561cd
    restarting pleroma from outside application Alexander Strizhakov 2020-01-25 18:42:04 +0300
  • 86e4d23acb [#1505] Background fetching of incoming activities' replies collections. Ivan Tashkinov 2020-01-25 10:47:30 +0300
  • de4102b247
    can be changed in runtime Alexander Strizhakov 2020-01-25 10:39:10 +0300
  • 6252e82f85
    respect settings from database in mix tasks Alexander Strizhakov 2020-01-25 10:33:27 +0300
  • 99c0a11c58 added atom feed Maksim Pechnikov 2020-01-24 22:08:10 +0300
  • 055edd3d72 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-24 21:46:57 +0300
  • 28f822877f Merge branch 'chore/changelog-for-dynamic-config' into 'develop' feld 2020-01-24 14:11:06 +0000
  • a43b73bba9 Document dynamic_configuration breaking change Mark Felder 2020-01-24 08:04:25 -0600
  • 0a5e792454 Merge branch 'fix/better-descriptions-for-email-fields' into 'develop' feld 2020-01-24 13:54:44 +0000
  • 8533b63d1f Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop' rinpatch 2020-01-24 11:33:02 +0000
  • 0fceeb44b3 Merge branch 'emoji-reaction-sanity-check' into 'develop' rinpatch 2020-01-24 11:32:25 +0000
  • 72edc3e30f Merge branch 'fix/removing-mdii-uploader-from-descriptions' into 'develop' rinpatch 2020-01-24 11:31:34 +0000
  • ecff8e92ff Merge branch 'emoji-reaction-api-change-2' into 'develop' rinpatch 2020-01-24 11:31:24 +0000
  • 9a994878f1 Emoji reactions: Update docs and changelog lain 2020-01-24 10:53:01 +0100
  • 347f3ed2c6 Emoji reactions: Change api format once more lain 2020-01-24 10:52:24 +0100
  • 6a0f0ac4a2
    fix for non existing atom Alexander Strizhakov 2020-01-24 12:22:26 +0300
  • e9d8a84790
    better descriptions for email fields for admin-fe Alexander Strizhakov 2020-01-24 11:19:12 +0300
  • b0ae69d996
    removing deleted MDII uploader from suggestions Alexander Strizhakov 2020-01-24 11:05:03 +0300
  • 293281fcbd Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-24 08:58:07 +0300
  • a182d400d7 Merge branch 'fix_for_migrate_to_db_test' into 'develop' feld 2020-01-24 00:25:38 +0000
  • 362295358a Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop' feld 2020-01-23 17:18:11 +0000
  • 6cd2e851d9
    parsing Swoosh modules Alexander Strizhakov 2020-01-23 18:21:29 +0300
  • 3c4a30c6db
    Add NewUsersDigestEmail to config/description.exs Egor Kislitsyn 2020-01-23 18:53:11 +0400
  • e8e57e398f
    restart config id after truncate Alexander Strizhakov 2020-01-23 17:48:45 +0300
  • 4344c5d5b9
    truncate config table on migrate to db task Alexander Strizhakov 2020-01-23 17:23:02 +0300
  • 8589632d09 fixed delete ScheduledActivity Maksim Pechnikov 2020-01-23 17:18:23 +0300
  • 2bad25cf14
    fix for migrate to db test Alexander Strizhakov 2020-01-23 15:13:27 +0300
  • 4646d3c9d6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-01-23 11:55:07 +0000
  • 34fc0ca053 Emoji reactions: Add sanity checks for the cache lain 2020-01-23 12:34:34 +0100
  • 2cfe1b9385 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-23 11:42:10 +0300
  • 5fc2fa8908 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-23 11:11:18 +0300
  • ce7c887a27 removed try/rescue Maksim Pechnikov 2020-01-23 11:05:08 +0300
  • 6f77b77428 Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex Maksim 2020-01-23 05:49:00 +0000
  • dddebee047 Merge branch 'emoji-notifications' into 'develop' Haelwenn 2020-01-23 02:12:03 +0000
  • 73e6bbbe89 Merge branch 'develop' into 'develop' Haelwenn 2020-01-23 02:05:22 +0000
  • 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 -0500
  • 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 -0600
  • e151dea276 Merge branch 'develop' into feature/new-registrations-digest Mark Felder 2020-01-22 15:59:24 -0600
  • ae78059ff4 Merge branch 'develop' into features/remote-follow-userpage-redirect Mark Felder 2020-01-22 15:05:39 -0600
  • 002146d297 Update changelog lain 2020-01-22 20:12:45 +0100
  • 85f45c7689 Document new EmojiReaction notifications lain 2020-01-22 20:11:18 +0100
  • 615b72238e Notifications: Add emoji reaction notifications lain 2020-01-22 20:06:12 +0100
  • 0b843f2567
    Update CHANGELOG Egor Kislitsyn 2020-01-22 22:29:07 +0400
  • b8b90d967a
    Update documentation Egor Kislitsyn 2020-01-22 22:21:32 +0400
  • cf96c40057 [#1505] Added Mastodon-compatible replies collection to Note federated representation. Ivan Tashkinov 2020-01-22 21:10:17 +0300
  • 6e6f1ead31 Merge branch 'no-error-404' into 'develop' rinpatch 2020-01-22 17:55:49 +0000
  • cf19bf3c7c Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-22 20:20:39 +0300
  • 7c0ac54437 Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex minibikini 2020-01-22 17:18:55 +0000
  • 5c842e3b68
    Merge branch 'develop' into feature/new-registrations-digest Egor Kislitsyn 2020-01-22 21:18:27 +0400
  • be27777156 Merge branch 'admin-be' into 'develop' feld 2020-01-22 17:13:17 +0000
  • b6f5b326e7
    Fix credo warnings Egor Kislitsyn 2020-01-22 20:59:58 +0400
  • e761d76e4f Apply suggestion to docs/configuration/cheatsheet.md Maksim 2020-01-22 16:58:50 +0000
  • d43c9ab286 Apply suggestion to docs/configuration/cheatsheet.md Maksim 2020-01-22 16:58:43 +0000