Commit graph

  • 41c7f34905
    short labels and fixes for typos Alexander Strizhakov 2020-01-14 15:00:38 +0300
  • 70c7a26de8
    Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-14 14:52:00 +0300
  • 12b28c8925 Merge branch 'feature/ci-registry' into 'develop' lain 2020-01-13 15:25:41 +0000
  • b7908844f2 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-13 12:41:07 +0300
  • a431e8c9f7 Merge branch 'feature/attachments-cleanup' into 'develop' feld 2020-01-12 18:48:59 +0000
  • 88f0eed0f2 Delete attachments when status is deleted Roman Chvanikov 2020-01-12 18:48:58 +0000
  • 8b4d81609d Merge branch 'updated-at-on-conversation-read' into 'develop' feld 2020-01-12 18:37:52 +0000
  • 6cc5341d26 Merge branch 'config/benchmark' into 'develop' feld 2020-01-12 18:31:10 +0000
  • bb5862ea2f Merge branch 'issue/1354' into 'develop' feld 2020-01-12 18:20:31 +0000
  • e64059d218 Assign token that can write to follows Mark Felder 2020-01-12 12:14:09 -0600
  • 2f5b8fbeb3 Merge branch 'develop' into issue/1354 Mark Felder 2020-01-12 12:12:15 -0600
  • ea4a462858 Merge branch 'issue/1487' into 'develop' feld 2020-01-12 17:25:25 +0000
  • ecb8fe183c Merge branch 'patch-1' into 'develop' rinpatch 2020-01-11 17:38:12 +0000
  • a0bf928c98 Merge branch 'remove/remove-mdii-uploader' into 'develop' rinpatch 2020-01-11 17:19:54 +0000
  • 0c9c62509d Remove MDII uploader Hakaba Hitoyo 2020-01-11 17:19:54 +0000
  • 1630ecaa20
    Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-11 12:15:42 +0300
  • e1308f10bd docs: API: update Mastodon API link Alibek Omarov 2020-01-11 05:06:40 +0000
  • 2ef8f0be6c Update Dockerfile with labels. Update gitlab-ci for registry usage jp 2020-01-10 14:09:14 -0500
  • 3453b27015
    don't migrate prometheus settings Alexander Strizhakov 2020-01-10 21:24:06 +0300
  • d933fd3d61
    more renamings Alexander Strizhakov 2020-01-10 19:49:40 +0300
  • eadb674c41
    don't migrate configurable_from_database setting Alexander Strizhakov 2020-01-10 19:44:30 +0300
  • 7d128ca208
    dynamic_configuration renaming Alexander Strizhakov 2020-01-10 19:34:19 +0300
  • 958d0452e4
    fix for pleroma assets group update Alexander Strizhakov 2020-01-10 18:18:09 +0300
  • 00aff5f78c
    syncing new setting to descriptions.exs Alexander Strizhakov 2020-01-10 17:54:54 +0300
  • 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks Ivan Tashkinov 2020-01-10 16:18:32 +0300
  • 05ca420c09 Merge branch 'issue/1490' into 'develop' lain 2020-01-10 13:14:20 +0000
  • 9b5cd8b1b7 Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop' lain 2020-01-10 13:07:20 +0000
  • 6395ad942c
    Update AdminFE build Alexander Strizhakov 2020-01-10 15:38:53 +0300
  • 88a16bb9fc
    deep merge in config update Alexander Strizhakov 2020-01-06 14:05:32 +0300
  • c841174de8
    flag for delete fix Alexander 2019-12-26 10:05:30 +0300
  • 0b02040327
    little fixes and typos fix Alexander 2019-12-25 15:31:51 +0300
  • 9c1f3bfeff
    fixes for logger backends Alexander 2019-12-21 13:54:22 +0300
  • cda2c1fc63
    fix for subgroup tuple Alexander 2019-12-20 10:22:53 +0300
  • 063ab6d911
    logger backends fix Alexander 2019-12-19 10:19:56 +0300
  • 583cee4607
    parsing proxy url setting Alexander 2019-12-17 19:51:01 +0300
  • f9d01068cf
    suggestions fix Alexander 2019-12-16 18:13:22 +0300
  • bb9a43c3ae
    typo fix Alexander 2019-12-12 16:44:24 +0300
  • 4306769671
    adapter children Alexander 2019-12-10 12:16:19 +0300
  • a71393dd29
    fix for endpoints after env update Alexander 2019-12-10 12:00:40 +0300
  • e412d2f152
    test fixes after rebase Alexander 2019-12-10 09:54:10 +0300
  • fea734ca70
    errors on endpoints Alexander 2019-12-06 17:50:53 +0300
  • 5cacb988b9
    partially settings update Alexander 2019-12-06 15:12:56 +0300
  • 0656816c77
    tests for setttings without an explicit key Alexander 2019-12-06 08:21:30 +0300
  • 2753285b77
    config editing through database Alex S 2019-09-29 11:17:38 +0300
  • 1629fa2412 Merge branch 'release/1.1.8' into 'stable' lain 2020-01-10 12:44:31 +0000
  • e372917f6c Update version to 1.1.8 lain 2020-01-10 12:27:46 +0100
  • 3c63f5ecb2 1.1.8 Changelog lain 2020-01-10 12:25:50 +0100
  • 38df2dd60c Fix captcha time, which was meant to be 5 minutes Mark Felder 2020-01-09 15:45:46 -0600
  • a19278c35e Update captcha dependency Egor Kislitsyn 2019-12-28 19:48:54 +0700
  • 337e4c021f Add Kocaptcha endpoint to config.exs Egor Kislitsyn 2019-12-16 19:35:10 +0700
  • e118d639a0 Merge branch 'fix/captcha-time' into 'develop' lain 2020-01-10 11:09:07 +0000
  • 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests. Ivan Tashkinov 2020-01-10 10:52:21 +0300
  • 89243fee8e Fix captcha time, which was meant to be 5 minutes Mark Felder 2020-01-09 15:45:46 -0600
  • e8b0c7689a Merge branch 'update/adminfe-20201019' into 'develop' feld 2020-01-09 18:35:17 +0000
  • fd3c23af63 Update AdminFE build Mark Felder 2020-01-09 10:00:15 -0600
  • 70410dfafd fix create service actor Maksim Pechnikov 2020-01-08 16:40:38 +0300
  • fcd5dd259a Merge branch 'bugfix/smtp-config-examples' into 'develop' rinpatch 2020-01-07 11:43:22 +0000
  • 180f257ced Update CHANGELOG.md lain 2020-01-06 14:10:07 +0000
  • b55f2563d0
    Fix SMTP mailer example RX14 2020-01-05 19:00:48 +0000
  • 0b6d1292d2 Fix mark-as-read (POST /api/v1/conversations/:id/read) refreshing updated_at and bringing conversation to the top in the user's direct conversation list eugenijm 2019-12-20 16:38:21 +0300
  • fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate Maksim Pechnikov 2020-01-03 16:21:52 +0300
  • badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests Ivan Tashkinov 2020-01-02 13:03:33 +0300
  • 1142790228 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-12-28 17:05:54 +0000
  • ee0c40831e Merge branch 'update-captcha' into 'develop' rinpatch 2019-12-28 12:57:21 +0000
  • 520940d3e2
    Update captcha dependency Egor Kislitsyn 2019-12-28 19:48:54 +0700
  • 019e7fa161 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-12-27 18:44:13 +0000
  • 933dc12043 added code of mr#2067 Maksim Pechnikov 2019-12-25 15:12:43 +0300
  • 11e010fc77 Merge branch 'feat/doc-improvements' into 'develop' Haelwenn 2019-12-24 19:57:41 +0000
  • 385356aad0 fix oauth scopes for AdminApi#reports_update Maksim Pechnikov 2019-12-24 20:45:46 +0300
  • 5f4fc0c373 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-12-23 19:07:20 +0000
  • 10ce7185c2 Merge branch 'increase-captcha-expiry-time' into 'develop' lain 2019-12-23 16:31:15 +0000
  • 969769730e update tests Maksim Pechnikov 2019-12-23 17:12:55 +0300
  • b012e66e4e
    Increase CAPTCHA expiration time to 5 minutes Egor Kislitsyn 2019-12-23 15:14:46 +0700
  • bdd71669da update test Maksim Pechnikov 2019-12-22 21:17:19 +0300
  • 4c505bc615 Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex Maksim 2019-12-22 17:58:54 +0000
  • c9a44ec4a6 Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex Maksim 2019-12-22 17:58:45 +0000
  • 5b84156013 moved remote follow in separate controller Maksim Pechnikov 2019-12-20 16:34:14 +0300
  • 54c9db38c8 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2019-12-21 20:37:29 +0300
  • c51e93978e Merge branch 'feature/custom-runtime-modules' into 'develop' rinpatch 2019-12-21 11:56:24 +0000
  • 7447c80e33 Merge branch 'revert-a54aa5af' into 'develop' rinpatch 2019-12-21 11:49:35 +0000
  • e71a13ad57 Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" Maxim Filippov 2019-12-21 11:41:19 +0000
  • 0193b0862f Merge branch 'fix/twitter-card-without-attachments' into 'develop' feld 2019-12-20 22:40:52 +0000
  • 06ae56a3ae Posts without media attachments should get the Summary TwitterCard Mark Felder 2019-12-20 16:32:04 -0600
  • a54aa5af43 Merge branch 'feature/status-counts-by-scope' into 'develop' feld 2019-12-20 16:30:26 +0000
  • 60819fd973 Merge branch 'fix/remote-user-no-follower-counter' into 'develop' feld 2019-12-20 16:30:00 +0000
  • 7bd0bca2ab fixed remote follow Maksim Pechnikov 2019-12-20 16:33:44 +0300
  • c7848b6326 Merge branch 'remove-outdated-doc' into 'develop' Haelwenn 2019-12-20 13:24:24 +0000
  • fc79c69173
    Remove /api/account/register documentation from pleroma_api.md Egor Kislitsyn 2019-12-20 19:47:44 +0700
  • b7811dfb7b Instead allow a dedicated benchmark config Mark Felder 2019-12-19 12:16:53 -0600
  • 50638525db Merge branch 'develop' into config/benchmark Mark Felder 2019-12-19 12:16:33 -0600
  • 5fc84552d3 Fix all count Maxim Filippov 2019-12-19 19:52:55 +0300
  • 4079d66f00 Expose issue via failing test Maxim Filippov 2019-12-19 19:47:36 +0300
  • ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests Ivan Tashkinov 2019-12-19 17:24:08 +0300
  • 455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests. Ivan Tashkinov 2019-12-19 17:23:27 +0300
  • 34d85f8a54
    Return 404 if account to filter notifications from is not found Egor Kislitsyn 2019-12-19 20:45:44 +0700
  • 775212121c
    Verify HTTP signatures only when request accepts "activity+json" type Egor Kislitsyn 2019-12-19 20:17:18 +0700
  • 432b3067d4
    Do not crash when remote user follower and following counters are hidden Egor Kislitsyn 2019-12-19 19:25:23 +0700
  • 404a9ccb9a Stats: return status counts by scope Maxim Filippov 2019-12-18 23:11:42 +0300
  • b53573a837 add tag feeds Maksim Pechnikov 2019-12-17 22:13:45 +0300
  • 5fb1c96500 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-12-17 17:54:15 +0000