Commit graph

  • d23a80e691 Merge branch 'feature/add-event-support' into 'develop' rinpatch 2019-12-17 15:31:10 +0000
  • 086250ac5b Merge branch 'ci/rum-testing-no-recompilation' into 'develop' rinpatch 2019-12-17 15:29:38 +0000
  • 407449158f CI: Add a cache policy for test jobs and fix rum tests recompiling everything rinpatch 2019-12-17 18:24:16 +0300
  • d2f1c4f658
    Add ActivityPub Object Event type support Thomas Citharel 2019-12-17 16:16:21 +0100
  • 6c39fa20b1
    Add support for account_id param to filter notifications by the account Egor Kislitsyn 2019-12-17 17:00:46 +0700
  • 45180d4c60 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost Maxim Filippov 2019-12-17 12:36:56 +0300
  • 38ad407395 Merge branch 'hide-followers-count' into 'develop' Haelwenn 2019-12-17 06:43:15 +0000
  • 8f79f433bc
    Hide follower counter when hiding is activated Egor Kislitsyn 2019-12-17 13:34:07 +0700
  • a879c396bb Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2019-12-17 09:24:08 +0300
  • 36d66d9655
    Fix typo Egor Kislitsyn 2019-12-17 02:06:58 +0700
  • d81c3afbb2 Apply suggestion to CHANGELOG.md minibikini 2019-12-16 18:40:12 +0000
  • e1fa8c11a9 Apply suggestion to test/plugs/http_signature_plug_test.exs minibikini 2019-12-16 18:39:59 +0000
  • 804b961d3c Merge branch 'fix/remove-useless-sleep' into 'develop' lain 2019-12-16 17:07:13 +0000
  • b9a87b1baa
    Merge branch 'develop' into feature/custom-runtime-modules Egor Kislitsyn 2019-12-16 22:34:21 +0700
  • a12b6454bb
    Add an option to require fetches to be signed Egor Kislitsyn 2019-12-16 22:24:03 +0700
  • e659fbfbf9 Merge branch 'kocaptcha-default-endpoint' into 'develop' rinpatch 2019-12-16 13:08:00 +0000
  • fc484e5ce6
    Add Kocaptcha endpoint to config.exs Egor Kislitsyn 2019-12-16 19:35:10 +0700
  • 8d242f52d4
    Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" Egor Kislitsyn 2019-12-16 19:33:51 +0700
  • 82c62c5028
    Add default endpoint to Pleroma.Captcha.Kocaptcha Egor Kislitsyn 2019-12-16 15:32:33 +0700
  • eae65e3216 formatting rinpatch 2019-12-16 01:37:33 +0300
  • 6ffbfdeeb2 tests: significantly reduce streamer timeout rinpatch 2019-12-16 01:22:01 +0300
  • 54029fe212 tests: remove a useless sleep in rate limiter tests rinpatch 2019-12-16 01:03:13 +0300
  • 137a3d220b tests: remove a useless 1 second sleep rinpatch 2019-12-16 00:51:59 +0300
  • 814a99c80f tests: remove a useless 3 second sleep rinpatch 2019-12-16 00:50:39 +0300
  • c8046e1080 tests: Replace 2 second sleep with offseting updated_at rinpatch 2019-12-16 00:48:49 +0300
  • 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. Ivan Tashkinov 2019-12-15 22:32:42 +0300
  • 6f5844cf8e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-12-15 14:11:26 +0000
  • 67cb46e15d Merge branch 'develop' into issue/1383 Maksim Pechnikov 2019-12-14 21:44:10 +0300
  • ecb3386f93 Merge branch 'release/1.1.7' into 'stable' rinpatch 2019-12-14 15:01:09 +0000
  • eb11c60289 Disable rate limiter for socket/localhost (unless RemoteIp is enabled) Maxim Filippov 2019-12-13 19:00:26 +0300
  • 02c3031e99 Don't log when users or objects are deleted. Phil Hagelberg 2019-12-13 11:14:11 -0800
  • 3b407a9a29 remove a random test rinpatch 2019-12-13 22:47:39 +0300
  • 3ecdd13bb2 Add Kocaptcha endpoint to the test config rinpatch 2019-12-13 22:24:26 +0300
  • 703e5829dd .gitlab-ci.yml: bump rum postgres to non-bugged version and disable --trace rinpatch 2019-12-13 22:15:08 +0300
  • f38fb42e30 mix.exs: bump version to 1.1.7 rinpatch 2019-12-13 22:09:14 +0300
  • ec6cc876bc changelog: add entry for bundled pleroma-fe changes on 1.1.7 rinpatch 2019-12-13 22:08:45 +0300
  • f393975123 pleroma-fe bundle: update to 36910935727ad75616a60bfb4a1622df6a686b7b rinpatch 2019-12-13 22:03:24 +0300
  • 9fad30f553 changelog: entry for 1.1.7 rinpatch 2019-12-13 21:58:06 +0300
  • bf9d631fca Add native captcha and enable it by default. Egor Kislitsyn 2019-12-11 22:29:31 +0700
  • 865cd2c7c4 report federating status in nodeinfo href 2019-11-11 19:03:43 +0100
  • 66563f93fd Set better Cache-Control header for static content rinpatch 2019-11-06 16:41:19 +0300
  • b7370ab513 OTP releases: only set name and distribution type if not set already rinpatch 2019-11-22 19:58:39 +0300
  • 2199d15000 OTP: Fix runtime upload limit config being ignored rinpatch 2019-12-08 21:08:25 +0300
  • 8efacfed67 Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop' Haelwenn 2019-12-13 14:58:35 +0000
  • bcd16676a7 Publisher: check out a connection for inserting publish_one jobs rinpatch 2019-12-13 14:27:10 +0300
  • 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules Egor Kislitsyn 2019-12-13 01:51:52 +0700
  • 2f31cef71f Merge branch 'feature/native-captcha' into 'develop' lain 2019-12-12 18:43:21 +0000
  • 803bce3668 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-12-12 17:48:36 +0000
  • 8ad6d2784c Merge branch 'uguu' into 'develop' lain 2019-12-12 16:40:39 +0000
  • 756a029edf Update frontend lain 2019-12-12 17:05:22 +0100
  • f44794d273 Merge branch '1427-oauth-graceful-admin-scope' into 'develop' lain 2019-12-12 13:26:39 +0000
  • 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted. Ivan Tashkinov 2019-12-12 16:00:06 +0300
  • 470a3a678d Add Kocaptcha endpoint to the test config Egor Kislitsyn 2019-12-12 18:04:52 +0700
  • e536796984 Add native captcha and enable it by default. Egor Kislitsyn 2019-12-11 22:29:31 +0700
  • 79532a7f7c Merge branch 'revert-bca1512d' into 'develop' lain 2019-12-12 09:46:16 +0000
  • 2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'" lain 2019-12-12 09:37:02 +0000
  • 68a667a465 Merge branch 'test-timeout' into 'develop' lain 2019-12-12 09:31:50 +0000
  • 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' lain 2019-12-12 09:28:27 +0000
  • c6f2735ffa Remove runtime modules config example Egor Kislitsyn 2019-12-12 14:37:57 +0700
  • 2aa609db8a Merge branch 'feature/report-notes' into 'develop' feld 2019-12-11 23:45:44 +0000
  • 3ecf131511 Merge branch 'develop' into feature/report-notes Maxim Filippov 2019-12-12 02:16:23 +0300
  • fd697cf209 Merge branch 'issue/1411' into 'develop' feld 2019-12-11 22:37:16 +0000
  • 0867064441 Document the favorites timeline order change Mark Felder 2019-12-11 15:03:54 -0600
  • 9ef912aecf Merge branch 'develop' into issue/1411 Mark Felder 2019-12-11 15:02:53 -0600
  • 63ffa0e3ed try local sheduling stwf 2019-12-11 14:57:33 -0500
  • df469b4468 Benchmark env uses test database so we should be able to use test.secret.exs Mark Felder 2019-12-11 12:52:57 -0600
  • 92b4a1aa1b Merge branch 'chore/fast_sanitize_bump' into 'develop' rinpatch 2019-12-11 17:57:41 +0000
  • c01b39579d mix.lock: update fast_sanitize rinpatch 2019-12-11 20:42:08 +0300
  • bca1512dae Merge branch 'admin-scope-support-code' into 'develop' rinpatch 2019-12-11 17:38:16 +0000
  • 84f0aec9aa Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f. Ivan Tashkinov 2019-12-11 19:48:00 +0300
  • 82fae3e23f AdminAPI: Merge account views for list instance statuses Maxim Filippov 2019-12-11 18:57:36 +0300
  • 1a6e30d32e Update CHANGELOG Egor Kislitsyn 2019-12-11 22:32:53 +0700
  • ee6805850c Set log level to debug for not important messages Egor Kislitsyn 2019-12-11 17:46:07 +0700
  • 97f67e0786 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-12-11 10:01:04 +0000
  • 72f3b22134 Merge branch 'domain-block-precedence' into 'develop' rinpatch 2019-12-11 09:57:00 +0000
  • 1ad96d667a remove single-step pipe Sadposter 2019-12-11 09:08:20 +0000
  • 1f498ba2bb Merge branch '1427-oauth-admin-scopes' into 'develop' lain 2019-12-11 08:50:43 +0000
  • 3920244be5 [#1427] Fixed :admin option handling in OAuthScopesPlug, added tests. Ivan Tashkinov 2019-12-11 11:42:02 +0300
  • 457821adb0 Apply suggestion to lib/pleroma/user.ex Sadposter 2019-12-10 18:49:41 +0000
  • 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop' feld 2019-12-10 17:25:56 +0000
  • 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence' Sadposter 2019-12-10 16:54:25 +0000
  • 5abee19b63 make analysis happy Sadposter 2019-12-10 16:50:58 +0000
  • 25f774f7c1 format activity_pub.ex Sadposter 2019-12-10 16:41:43 +0000
  • 19d228cc58 modify SQL to include followed-but-domain-blocked activities Sadposter 2019-12-10 16:40:12 +0000
  • 75b419d7c8 Do not apply http signature pipeline to the unsubscribe route Egor Kislitsyn 2019-12-10 21:46:02 +0700
  • aac0187ec1 Merge branch '1427-oauth-admin-scopes' into 'develop' lain 2019-12-10 13:44:06 +0000
  • 43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules' minibikini 2019-12-10 13:38:25 +0000
  • 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes' lain 2019-12-10 13:34:54 +0000
  • 54b1b2c9c0 Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop' lain 2019-12-10 13:19:26 +0000
  • 701815e64c [ActivityPub] Configurable ActivityPub actor type Hakaba Hitoyo 2019-12-10 13:19:26 +0000
  • a37bd5c255 Change log level Egor Kislitsyn 2019-12-10 15:08:57 +0700
  • 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes Ivan Tashkinov 2019-12-10 08:55:14 +0300
  • 99623b4eca Merge branch 'fix/load_config' into 'develop' rinpatch 2019-12-09 20:35:05 +0000
  • 9dfaa0b832 fix loads config variable with large value from db Maksim Pechnikov 2019-12-09 22:29:44 +0300
  • d3cee00057 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-12-09 18:17:59 +0000
  • 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop' rinpatch 2019-12-09 17:55:48 +0000
  • 632dab5d30 Merge branch 'user-timelines-changelog' into 'develop' rinpatch 2019-12-09 17:50:00 +0000
  • f4b7f32d51 status search: prefer the status fetched by url over other results rinpatch 2019-12-09 20:45:04 +0300
  • b7a57d8e38 Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0 Egor Kislitsyn 2019-12-10 00:38:01 +0700
  • c098dec473 Merge branch 'develop' into feature/custom-runtime-modules Egor Kislitsyn 2019-12-10 00:16:43 +0700