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

Commit Graph

  • 11e010fc77 Merge branch 'feat/doc-improvements' into 'develop' Haelwenn 2019-12-24 19:57:41 +00:00
  • 385356aad0 fix oauth scopes for AdminApi#reports_update Maksim Pechnikov 2019-12-24 20:45:46 +03:00
  • 10ce7185c2 Merge branch 'increase-captcha-expiry-time' into 'develop' lain 2019-12-23 16:31:15 +00:00
  • 969769730e update tests Maksim Pechnikov 2019-12-23 17:12:55 +03:00
  • b012e66e4e
         Increase CAPTCHA expiration time to 5 minutes Egor Kislitsyn 2019-12-23 15:14:46 +07:00
  • bdd71669da update test Maksim Pechnikov 2019-12-22 21:17:19 +03:00
  • 4c505bc615 Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex Maksim 2019-12-22 17:58:54 +00:00
  • c9a44ec4a6 Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex Maksim 2019-12-22 17:58:45 +00:00
  • 5b84156013 moved remote follow in separate controller Maksim Pechnikov 2019-12-20 16:34:14 +03:00
  • 54c9db38c8 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2019-12-21 20:37:29 +03:00
  • c51e93978e Merge branch 'feature/custom-runtime-modules' into 'develop' rinpatch 2019-12-21 11:56:24 +00:00
  • 7447c80e33 Merge branch 'revert-a54aa5af' into 'develop' rinpatch 2019-12-21 11:49:35 +00:00
  • e71a13ad57 Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" Maxim Filippov 2019-12-21 11:41:19 +00:00
  • 0193b0862f Merge branch 'fix/twitter-card-without-attachments' into 'develop' feld 2019-12-20 22:40:52 +00:00
  • 06ae56a3ae Posts without media attachments should get the Summary TwitterCard Mark Felder 2019-12-20 16:32:04 -06:00
  • a54aa5af43 Merge branch 'feature/status-counts-by-scope' into 'develop' feld 2019-12-20 16:30:26 +00:00
  • 60819fd973 Merge branch 'fix/remote-user-no-follower-counter' into 'develop' feld 2019-12-20 16:30:00 +00:00
  • 7bd0bca2ab fixed remote follow Maksim Pechnikov 2019-12-20 16:33:44 +03:00
  • c7848b6326 Merge branch 'remove-outdated-doc' into 'develop' Haelwenn 2019-12-20 13:24:24 +00:00
  • fc79c69173
         Remove /api/account/register documentation from pleroma_api.md Egor Kislitsyn 2019-12-20 19:47:44 +07:00
  • b7811dfb7b Instead allow a dedicated benchmark config Mark Felder 2019-12-19 12:16:53 -06:00
  • 50638525db Merge branch 'develop' into config/benchmark Mark Felder 2019-12-19 12:16:33 -06:00
  • 5fc84552d3 Fix all count Maxim Filippov 2019-12-19 19:52:55 +03:00
  • 4079d66f00 Expose issue via failing test Maxim Filippov 2019-12-19 19:47:36 +03:00
  • ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests Ivan Tashkinov 2019-12-19 17:24:08 +03:00
  • 455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests. Ivan Tashkinov 2019-12-19 17:23:27 +03:00
  • 34d85f8a54
         Return 404 if account to filter notifications from is not found Egor Kislitsyn 2019-12-19 20:45:44 +07:00
  • 775212121c
         Verify HTTP signatures only when request accepts "activity+json" type Egor Kislitsyn 2019-12-19 20:17:18 +07:00
  • 432b3067d4
         Do not crash when remote user follower and following counters are hidden Egor Kislitsyn 2019-12-19 19:25:23 +07:00
  • 404a9ccb9a Stats: return status counts by scope Maxim Filippov 2019-12-18 23:11:42 +03:00
  • b53573a837 add tag feeds Maksim Pechnikov 2019-12-17 22:13:45 +03:00
  • d23a80e691 Merge branch 'feature/add-event-support' into 'develop' rinpatch 2019-12-17 15:31:10 +00:00
  • 086250ac5b Merge branch 'ci/rum-testing-no-recompilation' into 'develop' rinpatch 2019-12-17 15:29:38 +00:00
  • 407449158f CI: Add a cache policy for test jobs and fix rum tests recompiling everything rinpatch 2019-12-17 18:24:16 +03:00
  • d2f1c4f658
         Add ActivityPub Object Event type support Thomas Citharel 2019-12-17 16:16:21 +01:00
  • 6c39fa20b1
         Add support for account_id param to filter notifications by the account Egor Kislitsyn 2019-12-17 17:00:46 +07:00
  • 45180d4c60 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost Maxim Filippov 2019-12-17 12:36:56 +03:00
  • 38ad407395 Merge branch 'hide-followers-count' into 'develop' Haelwenn 2019-12-17 06:43:15 +00:00
  • 8f79f433bc
         Hide follower counter when hiding is activated Egor Kislitsyn 2019-12-17 13:34:07 +07:00
  • a879c396bb Merge branch 'develop' into feature/tag_feed Maksim Pechnikov 2019-12-17 09:24:08 +03:00
  • 36d66d9655
         Fix typo Egor Kislitsyn 2019-12-17 02:06:58 +07:00
  • d81c3afbb2 Apply suggestion to CHANGELOG.md minibikini 2019-12-16 18:40:12 +00:00
  • e1fa8c11a9 Apply suggestion to test/plugs/http_signature_plug_test.exs minibikini 2019-12-16 18:39:59 +00:00
  • 804b961d3c Merge branch 'fix/remove-useless-sleep' into 'develop' lain 2019-12-16 17:07:13 +00:00
  • b9a87b1baa
         Merge branch 'develop' into feature/custom-runtime-modules Egor Kislitsyn 2019-12-16 22:34:21 +07:00
  • a12b6454bb
         Add an option to require fetches to be signed Egor Kislitsyn 2019-12-16 22:24:03 +07:00
  • e659fbfbf9 Merge branch 'kocaptcha-default-endpoint' into 'develop' rinpatch 2019-12-16 13:08:00 +00:00
  • fc484e5ce6
         Add Kocaptcha endpoint to config.exs Egor Kislitsyn 2019-12-16 19:35:10 +07:00
  • 8d242f52d4
         Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" Egor Kislitsyn 2019-12-16 19:33:51 +07:00
  • 82c62c5028
         Add default endpoint to Pleroma.Captcha.Kocaptcha Egor Kislitsyn 2019-12-16 15:32:33 +07:00
  • eae65e3216 formatting rinpatch 2019-12-16 01:37:33 +03:00
  • 6ffbfdeeb2 tests: significantly reduce streamer timeout rinpatch 2019-12-16 01:22:01 +03:00
  • 54029fe212 tests: remove a useless sleep in rate limiter tests rinpatch 2019-12-16 01:03:13 +03:00
  • 137a3d220b tests: remove a useless 1 second sleep rinpatch 2019-12-16 00:51:59 +03:00
  • 814a99c80f tests: remove a useless 3 second sleep rinpatch 2019-12-16 00:50:39 +03:00
  • c8046e1080 tests: Replace 2 second sleep with offseting updated_at rinpatch 2019-12-16 00:48:49 +03:00
  • 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. Ivan Tashkinov 2019-12-15 22:32:42 +03:00
  • 67cb46e15d Merge branch 'develop' into issue/1383 Maksim Pechnikov 2019-12-14 21:44:10 +03:00
  • ecb3386f93 Merge branch 'release/1.1.7' into 'stable' v1.1.7 rinpatch 2019-12-14 15:01:09 +00:00
  • 724036d358 Fixed UtilController.do_remote_follow/2 auth check (allowed password auth without OAuth scope check). Follower might be signed out when submitting the form and thus OAuth token may be absent. remote-follow-auth-fix Ivan Tashkinov 2019-12-14 13:43:33 +03:00
  • eb11c60289 Disable rate limiter for socket/localhost (unless RemoteIp is enabled) Maxim Filippov 2019-12-13 19:00:26 +03:00
  • 02c3031e99 Don't log when users or objects are deleted. Phil Hagelberg 2019-12-13 11:14:11 -08:00
  • 3b407a9a29 remove a random test rinpatch 2019-12-13 22:47:39 +03:00
  • 3ecdd13bb2 Add Kocaptcha endpoint to the test config rinpatch 2019-12-13 22:24:26 +03:00
  • 703e5829dd .gitlab-ci.yml: bump rum postgres to non-bugged version and disable --trace rinpatch 2019-12-13 22:15:08 +03:00
  • f38fb42e30 mix.exs: bump version to 1.1.7 rinpatch 2019-12-13 22:09:14 +03:00
  • ec6cc876bc changelog: add entry for bundled pleroma-fe changes on 1.1.7 rinpatch 2019-12-13 22:08:45 +03:00
  • f393975123 pleroma-fe bundle: update to 36910935727ad75616a60bfb4a1622df6a686b7b rinpatch 2019-12-13 22:03:24 +03:00
  • 9fad30f553 changelog: entry for 1.1.7 rinpatch 2019-12-13 21:58:06 +03:00
  • bf9d631fca Add native captcha and enable it by default. Egor Kislitsyn 2019-12-11 22:29:31 +07:00
  • 865cd2c7c4 report federating status in nodeinfo href 2019-11-11 19:03:43 +01:00
  • 66563f93fd Set better Cache-Control header for static content rinpatch 2019-11-06 16:41:19 +03:00
  • b7370ab513 OTP releases: only set name and distribution type if not set already rinpatch 2019-11-22 19:58:39 +03:00
  • 2199d15000 OTP: Fix runtime upload limit config being ignored rinpatch 2019-12-08 21:08:25 +03:00
  • 8efacfed67 Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop' Haelwenn 2019-12-13 14:58:35 +00:00
  • bcd16676a7 Publisher: check out a connection for inserting publish_one jobs rinpatch 2019-12-13 14:27:10 +03:00
  • 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules Egor Kislitsyn 2019-12-13 01:51:52 +07:00
  • 2f31cef71f Merge branch 'feature/native-captcha' into 'develop' lain 2019-12-12 18:43:21 +00:00
  • 8ad6d2784c Merge branch 'uguu' into 'develop' lain 2019-12-12 16:40:39 +00:00
  • 756a029edf Update frontend lain 2019-12-12 17:05:22 +01:00
  • f44794d273 Merge branch '1427-oauth-graceful-admin-scope' into 'develop' lain 2019-12-12 13:26:39 +00:00
  • 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 +03:00
  • 470a3a678d Add Kocaptcha endpoint to the test config Egor Kislitsyn 2019-12-12 18:04:52 +07:00
  • e536796984 Add native captcha and enable it by default. Egor Kislitsyn 2019-12-11 22:29:31 +07:00
  • 79532a7f7c Merge branch 'revert-bca1512d' into 'develop' lain 2019-12-12 09:46:16 +00:00
  • 2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'" lain 2019-12-12 09:37:02 +00:00
  • 68a667a465 Merge branch 'test-timeout' into 'develop' lain 2019-12-12 09:31:50 +00:00
  • 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' lain 2019-12-12 09:28:27 +00:00
  • c6f2735ffa Remove runtime modules config example Egor Kislitsyn 2019-12-12 14:37:57 +07:00
  • 2aa609db8a Merge branch 'feature/report-notes' into 'develop' feld 2019-12-11 23:45:44 +00:00
  • 3ecf131511 Merge branch 'develop' into feature/report-notes Maxim Filippov 2019-12-12 02:16:23 +03:00
  • fd697cf209 Merge branch 'issue/1411' into 'develop' feld 2019-12-11 22:37:16 +00:00
  • 0867064441 Document the favorites timeline order change Mark Felder 2019-12-11 15:03:54 -06:00
  • 9ef912aecf Merge branch 'develop' into issue/1411 Mark Felder 2019-12-11 15:02:53 -06:00
  • 63ffa0e3ed try local sheduling stwf 2019-12-11 14:57:33 -05:00
  • df469b4468 Benchmark env uses test database so we should be able to use test.secret.exs Mark Felder 2019-12-11 12:52:57 -06:00
  • 92b4a1aa1b Merge branch 'chore/fast_sanitize_bump' into 'develop' rinpatch 2019-12-11 17:57:41 +00:00
  • c01b39579d mix.lock: update fast_sanitize rinpatch 2019-12-11 20:42:08 +03:00
  • bca1512dae Merge branch 'admin-scope-support-code' into 'develop' rinpatch 2019-12-11 17:38:16 +00:00
  • 84f0aec9aa Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f. Ivan Tashkinov 2019-12-11 19:48:00 +03:00