Commit graph

  • 7bf622ce73 Add scheduled activities eugenijm 2019-03-28 12:39:10 +0300
  • 7aa53d52bd Return 403 on oauth token exchange for a deactivated user eugenijm 2019-04-06 00:22:42 +0300
  • 876965a7e7 Merge branch 'fix/failed-legacy-test' into 'develop' feld 2019-04-06 16:03:35 +0000
  • 9aeac7dcca Merge branch 'feature/prometheus' into 'develop' feld 2019-04-06 14:51:46 +0000
  • b395aebf24 Pin recon dependency to 2.4.0 Mark Felder 2019-04-06 09:30:36 -0500
  • 7410aee886 Merge develop to 770-add-emoji-tags Alex S 2019-04-06 20:34:00 +0700
  • 3c5daa0235 Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop' Haelwenn 2019-04-05 23:36:42 +0000
  • 325a268017 Redirect to the referer url after mastofe authorization Sergey Suprunenko 2019-04-05 23:36:42 +0000
  • e9c075d05c
    Mock :crypt.crypt/2 because otherwise the test fails on Mac OS Sergey Suprunenko 2019-04-05 22:40:30 +0200
  • e3ca9f708f Merge branch 'revert-8607ae68' into 'develop' rinpatch 2019-04-05 20:04:16 +0000
  • e5df8cadea Revert "Merge branch 'test-coverage' into 'develop'" rinpatch 2019-04-05 19:59:03 +0000
  • 8607ae6841 Merge branch 'test-coverage' into 'develop' rinpatch 2019-04-05 19:49:20 +0000
  • fb1be1d798 Use --cover option when running CI tests optikfluffel 2019-04-05 20:12:44 +0200
  • 3fb3f42e77 Merge branch 'feature/admin-api-follow' into 'develop' feld 2019-04-05 17:15:55 +0000
  • fac76bfa35 We actually want the user id not nickname in the test... Mark Felder 2019-04-05 12:11:19 -0500
  • c746087f57 Also remove Repo functions in the tests Mark Felder 2019-04-05 11:59:56 -0500
  • b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase Mark Felder 2019-04-05 11:41:41 -0500
  • da64a5aece Document the admin API endpoints for controlling follow/unfollow Mark Felder 2019-04-05 11:29:34 -0500
  • 7895ee37fa Add user following / unfollowing to the admin api. Roger Braun 2018-12-16 16:41:56 +0100
  • 1c2e4f88d1 fix credo Egor Kislitsyn 2019-04-05 19:46:28 +0700
  • 5499750054 Merge branch 'hotfix/html-sanitization' into 'develop' lambda 2019-04-05 12:43:57 +0000
  • f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push Egor Kislitsyn 2019-04-05 19:38:44 +0700
  • f0f30019e1 Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi rinpatch 2019-04-05 15:19:44 +0300
  • 47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. Ivan Tashkinov 2019-04-05 15:12:02 +0300
  • 3e7f2bfc2f [#923] OAuthController#callback adjustments (with tests). Ivan Tashkinov 2019-04-05 09:19:17 +0300
  • 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth Ivan Tashkinov 2019-04-04 23:43:08 +0300
  • 66e7b03372 Merge branch 'develop' into feature/prometheus Mark Felder 2019-04-04 15:39:42 -0500
  • 9c9eec62c2 Merge branch 'feature/quack' into 'develop' feld 2019-04-04 19:52:22 +0000
  • 3b12eeda19 Add ability to ship logs to a Slack channel feld 2019-04-04 19:52:22 +0000
  • f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements. Ivan Tashkinov 2019-04-04 22:41:03 +0300
  • 69038887b2 Code readability tweak Mark Felder 2019-04-04 12:36:57 -0500
  • 7222afe01b Clean merge crumbs Mark Felder 2019-04-04 12:29:10 -0500
  • 7e930559fe Serve metrics at /api/pleroma/app_metrics href 2019-01-30 16:44:38 +0100
  • 5564cd421d Document Prometheus Mark Felder 2019-04-04 12:19:31 -0500
  • 0b5c818cb7 [#1] fix telemetry Egor Kislitsyn 2019-03-25 15:29:04 +0700
  • bc3618a38d Set up telemetry and prometheus href 2019-01-30 16:32:30 +0100
  • b655a8ea83 Add recon href 2019-02-06 10:33:05 +0100
  • cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 Egor Kislitsyn 2019-04-04 16:10:43 +0700
  • 3c7f5bb1dc Merge branch 'fix/add-oauth-token-indexes' into 'develop' lambda 2019-04-04 08:01:12 +0000
  • c900ff39af Merge branch 'features/pleroma-tan-mastofe' into 'develop' lambda 2019-04-04 07:34:20 +0000
  • af0065a71f
    mastodon_api_controller.ex: Add pleroma-tan to initial_state Haelwenn (lanodan) Monnier 2019-04-04 09:07:25 +0200
  • 3f8be270c6 Merge branch 'feature/robotstxt' into 'develop' lambda 2019-04-03 17:31:34 +0000
  • cd41584ac4 Generate permissive or restrictive robots.txt in the config generator Sachin Joshi 2019-04-03 00:54:16 +0545
  • 9bb122d5a7 Merge branch 'update-autolinker' into 'develop' lambda 2019-04-03 14:42:59 +0000
  • 86f90c0a54 adding indexes to oauth_tokens table Alex S 2019-04-03 20:51:09 +0700
  • d313a0c49c Update auto_linker dependency Egor Kislitsyn 2019-04-03 19:41:15 +0700
  • 7c003991d6 Merge branch 'fix/preview-not-working-with-form-data' into 'develop' lambda 2019-04-03 06:51:44 +0000
  • 79cb34a4b0 Fix preview not being usable in form data rinpatch 2019-04-02 23:07:16 +0300
  • 0cb94cfa94 Merge branch 'fix-slow-relationships' into 'develop' Haelwenn 2019-04-02 18:43:48 +0000
  • 256b492a58 Merge branch 'bugfix/wrong-date-format' into 'develop' lambda 2019-04-02 14:18:23 +0000
  • a79ce94dd4 Merge branch 'feature/fake-statuses' into 'develop' lambda 2019-04-02 14:17:43 +0000
  • 39bcf93007 Merge remote-tracking branch 'origin/develop' into fix-slow-relationships lain 2019-04-02 16:10:38 +0200
  • fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching. lain 2019-04-02 16:04:18 +0200
  • fa8483cb80 Merging develop into feature/770-add-emoji-tags Alex S 2019-04-02 20:39:52 +0700
  • d140738edf second level of headertext change in doc Alex S 2019-04-02 20:35:41 +0700
  • 3465b7ba9a syntax highlighting Alex S 2019-04-02 20:32:37 +0700
  • 180b87257c Merge branch 'bugfix/share-mastodon' into 'develop' lambda 2019-04-02 12:47:40 +0000
  • ce9284b36f Merge branch 'remove-user-activities' into 'develop' lambda 2019-04-02 12:45:29 +0000
  • b95cf3d490 Merge branch 'get_by_id' into 'develop' lambda 2019-04-02 12:43:28 +0000
  • 9e0567ec52 Merge develop into feature/770-add-emoji-tags Alex S 2019-04-02 19:16:29 +0700
  • bd961a3bad Merge branch 'features/pleroma-tan' into 'develop' lambda 2019-04-02 11:54:04 +0000
  • fdb4357e9b Rename fake param to preview and make the tests check that the object was not inserted to the db rinpatch 2019-04-02 14:31:18 +0300
  • 37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth Ivan Tashkinov 2019-04-02 14:05:34 +0300
  • 20c619f85f replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests Egor Kislitsyn 2019-04-02 17:58:32 +0700
  • 091baf9316 Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop' lambda 2019-04-02 10:57:38 +0000
  • 26d509cc86 Merge branch 'get_by_id' into 'develop' lambda 2019-04-02 10:52:29 +0000
  • b5d486d9ac Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop' lambda 2019-04-02 10:51:33 +0000
  • 95c92c49c9 Fix account lookup for nicknames beginning with numbers cascode 2019-04-02 10:51:33 +0000
  • 590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth Ivan Tashkinov 2019-04-02 13:50:12 +0300
  • 9a59c26619 replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id) Egor Kislitsyn 2019-04-02 17:47:52 +0700
  • 88d3cb44c3 replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) Egor Kislitsyn 2019-04-02 17:47:02 +0700
  • 15ce710460 Added "GET /oauth/authorize" tests. Ivan Tashkinov 2019-04-02 13:43:33 +0300
  • 11c2d6bdc4 change Repo.get(Activity, id) => Activity.get_by_id(id) in tests Egor Kislitsyn 2019-04-02 17:08:03 +0700
  • 1b3d921921 change Repo.get(User, id) => User.get_by_id(id) Egor Kislitsyn 2019-04-02 17:01:26 +0700
  • 4212527928 change Repo.get(Activity, id) => Activity.get_by_id(id) Egor Kislitsyn 2019-04-02 16:50:31 +0700
  • 3db9235150
    Ignore dates in wrong formats Sergey Suprunenko 2019-04-02 11:25:51 +0200
  • a14742f495 add user delete_activities mix task Egor Kislitsyn 2019-04-02 16:30:11 +0700
  • 484162c187 test fix Alex S 2019-04-02 16:26:40 +0700
  • 08d64b977f little changes and typos Alex S 2019-04-02 16:13:34 +0700
  • 851c5bf093 updating custom_emoji docs Alex S 2019-04-02 15:57:57 +0700
  • 9305e241cb Merge branch 'ci-speedup-2-electric-boogalo' into 'develop' lambda 2019-04-02 08:50:47 +0000
  • 9b2188da7c refactoring of emoji tags config to use groups Alex S 2019-04-02 15:44:56 +0700
  • a1869f5272 Merge remote-tracking branch 'pleroma/develop' into remove-user-activities Egor Kislitsyn 2019-04-02 15:41:30 +0700
  • f20e8d28de add support for all status type (ostatus) and replase case with if Sachin Joshi 2019-04-02 12:15:41 +0545
  • 8c71ea5a1a remove reduntant services in docs deploy and change job names to kebab case rinpatch 2019-04-02 09:13:34 +0300
  • 5ee54d8183 what the fuck rinpatch 2019-04-02 09:07:58 +0300
  • 7827b929fc huh rinpatch 2019-04-02 09:02:21 +0300
  • 4861558b93 Separate CI jobs to 3 stages to allow them to be executed in parallel rinpatch 2019-04-02 08:58:09 +0300
  • f8aa917eef Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop' rinpatch 2019-04-02 05:31:41 +0000
  • 6386c1c9c1 fetch url for OStatus to know if it is a/c or status Sachin Joshi 2019-04-02 10:26:09 +0545
  • f56eef8d8c
    router: Add fake identity proof endpoint Haelwenn (lanodan) Monnier 2019-04-02 01:53:25 +0200
  • fd7dd8f9a2 Merge branch 'fix/default-mail-adapter' into 'develop' lambda 2019-04-01 21:47:40 +0000
  • fc2bef5ac3 Merge branch 'documentation-improvements' into 'develop' lambda 2019-04-01 21:20:11 +0000
  • b6f9f7b8aa
    Handle dates in the Unix timestamp format (Fixes #763) Sergey Suprunenko 2019-04-01 22:40:48 +0200
  • 1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status Sachin Joshi 2019-04-01 22:12:02 +0545
  • 66e7d4966d
    COPYING: Wording Haelwenn (lanodan) Monnier 2019-04-01 18:34:53 +0200
  • 5373077501 update mastodon api link in README to point to a non-outdated docs rinpatch 2019-04-01 19:27:40 +0300
  • d976cc5df7 Merge branch 'update-readme' into 'develop' rinpatch 2019-04-01 16:25:02 +0000
  • e2b94d8f33 Make only important note bold rather than the whole paragraph because it looks better that way rinpatch 2019-04-01 19:24:50 +0300
  • a309b49c2d Remove outdated howto change config and port and move it to config.md instead rinpatch 2019-04-01 19:19:06 +0300