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

Commit Graph

  • cc4c3255fe Fix odd spacing jp 2020-01-15 16:16:29 -05:00
  • a5db044e57 Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-15 19:11:13 +03:00
  • 6317183acd Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop' lain 2020-01-15 15:44:49 +00:00
  • d1e9768e10 [#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808. Ivan Tashkinov 2020-01-15 18:38:18 +03:00
  • 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks Ivan Tashkinov 2020-01-15 18:12:08 +03:00
  • aa9fe3a712 Merge branch 'develop' into 'feature/tag_feed' lain 2020-01-15 14:29:56 +00:00
  • 59ba5c80b9
         little cleanup Alexander Strizhakov 2020-01-15 17:10:33 +03:00
  • 66de2b159b
         don't migrate Pleroma.Web.EndPoint settings Alexander Strizhakov 2020-01-15 17:08:45 +03:00
  • 1b233aa653 Merge branch 'notifications-from-account' into 'develop' lain 2020-01-15 14:05:22 +00:00
  • 023b7f605b
         Fix notification controller test Egor Kislitsyn 2020-01-15 16:51:09 +04:00
  • 3849053c6a
         Merge branch 'develop' into notifications-from-account Egor Kislitsyn 2020-01-15 16:49:45 +04:00
  • c8da684434 TimelineControllerTest: Fix hashtag timeline test fix-tags-again lain 2020-01-15 13:04:39 +01:00
  • b9b668d39e Merge remote-tracking branch 'origin/develop' into fix-tags-again lain 2020-01-15 12:49:56 +01:00
  • 9ae24fc68e TimelineController: Do not order hashtag timelines for now. lain 2020-01-15 12:41:25 +01:00
  • 167e9c45ec Benchmarks: Move to correct folder lain 2020-01-15 12:37:50 +01:00
  • 76c1948880 [#1478] Adjusted AdminAPIController admin subscope requirements. Ivan Tashkinov 2020-01-15 12:11:23 +03:00
  • e02eb8de3e Add OTP to updating.md ilja 2020-01-15 09:12:24 +01:00
  • cbb98c9b58 Set benchmark job to use dedicated database server chore/benchmark-dedicated-db Mark Felder 2020-01-14 16:24:19 -06:00
  • 77412d5dd2 Merge branch 'features/docker-updates' into 'develop' feld 2020-01-14 21:36:52 +00:00
  • a58a0a7b1b Remove forked test branch matching jp 2020-01-14 13:47:36 -05:00
  • ff15d6ef13 Remove artifacts passing by setting dependencies: [] jp 2020-01-14 13:45:47 -05:00
  • c9f45edeac Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2020-01-14 16:26:56 +03:00
  • b4532277b1 Merge branch 'features/docker-updates' into 'develop' lain 2020-01-14 17:48:58 +00:00
  • 964d188a96 Add allow_failure to docker jobs jp 2020-01-14 12:43:28 -05:00
  • fe57e5139f Remove cache from docker jobs. Split devlop and stable branches into their own jobs jp 2020-01-14 12:32:36 -05:00
  • a9c7cd341b
         Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-14 19:56:33 +03:00
  • 0709757e47 Check if object->data is array when looking up attachment objects to delete Roman Chvanikov 2020-01-14 19:53:28 +03:00
  • 2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags lain 2020-01-14 17:24:26 +01:00
  • d150c598d7 Merge branch 'warnings-fix' into 'develop' lain 2020-01-14 16:11:36 +00:00
  • 0d331f3d23
         compilation warnings fix Alexander Strizhakov 2020-01-14 15:49:52 +03:00
  • 41c7f34905
         short labels and fixes for typos Alexander Strizhakov 2020-01-14 15:00:38 +03:00
  • 70c7a26de8
         Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-14 14:52:00 +03:00
  • 12b28c8925 Merge branch 'feature/ci-registry' into 'develop' lain 2020-01-13 15:25:41 +00:00
  • b7908844f2 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-13 12:41:07 +03:00
  • b560cc989f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-01-12 16:25:18 -06:00
  • a431e8c9f7 Merge branch 'feature/attachments-cleanup' into 'develop' feld 2020-01-12 18:48:59 +00:00
  • 88f0eed0f2 Delete attachments when status is deleted Roman Chvanikov 2020-01-12 18:48:58 +00:00
  • 8b4d81609d Merge branch 'updated-at-on-conversation-read' into 'develop' feld 2020-01-12 18:37:52 +00:00
  • 6cc5341d26 Merge branch 'config/benchmark' into 'develop' feld 2020-01-12 18:31:10 +00:00
  • bb5862ea2f Merge branch 'issue/1354' into 'develop' feld 2020-01-12 18:20:31 +00:00
  • e64059d218 Assign token that can write to follows Mark Felder 2020-01-12 12:14:09 -06:00
  • 2f5b8fbeb3 Merge branch 'develop' into issue/1354 Mark Felder 2020-01-12 12:12:15 -06:00
  • 0a1275ad67 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-01-12 12:00:09 -06:00
  • ea4a462858 Merge branch 'issue/1487' into 'develop' feld 2020-01-12 17:25:25 +00:00
  • f82f5df86f Change source url Your New SJW Waifu 2020-01-11 18:55:44 -06:00
  • 6027919d0a add user fix Your New SJW Waifu 2020-01-11 18:41:19 -06:00
  • 279a6edb84 add anti hellthread policy Your New SJW Waifu 2020-01-11 18:20:01 -06:00
  • ecb8fe183c Merge branch 'patch-1' into 'develop' rinpatch 2020-01-11 17:38:12 +00:00
  • a0bf928c98 Merge branch 'remove/remove-mdii-uploader' into 'develop' rinpatch 2020-01-11 17:19:54 +00:00
  • 0c9c62509d Remove MDII uploader Hakaba Hitoyo 2020-01-11 17:19:54 +00:00
  • 1630ecaa20
         Merge branch 'develop' into admin-be Alexander Strizhakov 2020-01-11 12:15:42 +03:00
  • e1308f10bd docs: API: update Mastodon API link Alibek Omarov 2020-01-11 05:06:40 +00:00
  • 2ef8f0be6c Update Dockerfile with labels. Update gitlab-ci for registry usage jp 2020-01-10 14:09:14 -05:00
  • 3453b27015
         don't migrate prometheus settings Alexander Strizhakov 2020-01-10 21:24:06 +03:00
  • d933fd3d61
         more renamings Alexander Strizhakov 2020-01-10 19:49:40 +03:00
  • eadb674c41
         don't migrate configurable_from_database setting Alexander Strizhakov 2020-01-10 19:44:30 +03:00
  • 7d128ca208
         dynamic_configuration renaming Alexander Strizhakov 2020-01-10 19:34:19 +03:00
  • 958d0452e4
         fix for pleroma assets group update Alexander Strizhakov 2020-01-10 18:18:09 +03:00
  • 00aff5f78c
         syncing new setting to descriptions.exs Alexander Strizhakov 2020-01-10 17:54:54 +03:00
  • 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks Ivan Tashkinov 2020-01-10 16:18:32 +03:00
  • 05ca420c09 Merge branch 'issue/1490' into 'develop' lain 2020-01-10 13:14:20 +00:00
  • 9b5cd8b1b7 Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop' lain 2020-01-10 13:07:20 +00:00
  • 6395ad942c
         Update AdminFE build Alexander Strizhakov 2020-01-10 15:38:53 +03:00
  • 88a16bb9fc
         deep merge in config update Alexander Strizhakov 2020-01-06 14:05:32 +03:00
  • c841174de8
         flag for delete fix Alexander 2019-12-26 10:05:30 +03:00
  • 0b02040327
         little fixes and typos fix Alexander 2019-12-25 15:31:51 +03:00
  • 9c1f3bfeff
         fixes for logger backends Alexander 2019-12-21 13:54:22 +03:00
  • cda2c1fc63
         fix for subgroup tuple Alexander 2019-12-20 10:22:53 +03:00
  • 063ab6d911
         logger backends fix Alexander 2019-12-19 10:19:56 +03:00
  • 583cee4607
         parsing proxy url setting Alexander 2019-12-17 19:51:01 +03:00
  • f9d01068cf
         suggestions fix Alexander 2019-12-16 18:13:22 +03:00
  • bb9a43c3ae
         typo fix Alexander 2019-12-12 16:44:24 +03:00
  • 4306769671
         adapter children Alexander 2019-12-10 12:16:19 +03:00
  • a71393dd29
         fix for endpoints after env update Alexander 2019-12-10 12:00:40 +03:00
  • e412d2f152
         test fixes after rebase Alexander 2019-12-10 09:54:10 +03:00
  • fea734ca70
         errors on endpoints Alexander 2019-12-06 17:50:53 +03:00
  • 5cacb988b9
         partially settings update Alexander 2019-12-06 15:12:56 +03:00
  • 0656816c77
         tests for setttings without an explicit key Alexander 2019-12-06 08:21:30 +03:00
  • 2753285b77
         config editing through database Alex S 2019-09-29 11:17:38 +03:00
  • 1629fa2412 Merge branch 'release/1.1.8' into 'stable' v1.1.8 lain 2020-01-10 12:44:31 +00:00
  • e372917f6c Update version to 1.1.8 lain 2020-01-10 12:27:46 +01:00
  • 3c63f5ecb2 1.1.8 Changelog lain 2020-01-10 12:25:50 +01:00
  • 38df2dd60c Fix captcha time, which was meant to be 5 minutes Mark Felder 2020-01-09 15:45:46 -06:00
  • a19278c35e Update captcha dependency Egor Kislitsyn 2019-12-28 19:48:54 +07:00
  • 337e4c021f Add Kocaptcha endpoint to config.exs Egor Kislitsyn 2019-12-16 19:35:10 +07:00
  • e118d639a0 Merge branch 'fix/captcha-time' into 'develop' lain 2020-01-10 11:09:07 +00:00
  • 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 +03:00
  • 89243fee8e Fix captcha time, which was meant to be 5 minutes Mark Felder 2020-01-09 15:45:46 -06:00
  • e8b0c7689a Merge branch 'update/adminfe-20201019' into 'develop' feld 2020-01-09 18:35:17 +00:00
  • fd3c23af63 Update AdminFE build Mark Felder 2020-01-09 10:00:15 -06:00
  • 70410dfafd fix create service actor Maksim Pechnikov 2020-01-08 16:40:38 +03:00
  • fcd5dd259a Merge branch 'bugfix/smtp-config-examples' into 'develop' rinpatch 2020-01-07 11:43:22 +00:00
  • 180f257ced Update CHANGELOG.md lain 2020-01-06 14:10:07 +00:00
  • b55f2563d0
         Fix SMTP mailer example RX14 2020-01-05 19:00:48 +00:00
  • 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 +03:00
  • fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate Maksim Pechnikov 2020-01-03 16:21:52 +03:00
  • badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests Ivan Tashkinov 2020-01-02 13:03:33 +03:00
  • ee0c40831e Merge branch 'update-captcha' into 'develop' rinpatch 2019-12-28 12:57:21 +00:00
  • 520940d3e2
         Update captcha dependency Egor Kislitsyn 2019-12-28 19:48:54 +07:00
  • 933dc12043 added code of mr#2067 Maksim Pechnikov 2019-12-25 15:12:43 +03:00