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

Commit Graph

  • b343c0c8ee Merge pull request #1 from pleroma/mfc-login roger 2018-11-08 18:17:30 +01:00
  • 31f3a6a8f6 Properly generate avatar. lain 2018-11-08 18:11:17 +01:00
  • 83b48558de Better logging and error method. lain 2018-11-08 17:04:43 +01:00
  • b8f1fed9ce Update avatar on log in, if it changed. lain 2018-11-08 16:53:08 +01:00
  • 2f7527c656 Update instance panel per Leo Mark Felder 2018-11-07 12:01:41 -06:00
  • 6416774ac6 Add MFC logo thumbnail Mark Felder 2018-11-07 11:58:30 -06:00
  • dd4aebb9b4 Doesn't allow access below a certain access level. lain 2018-11-07 18:02:49 +01:00
  • b6ae0095c4 Use MFC username as handle. lain 2018-11-06 20:21:59 +01:00
  • eaccf5adfc update frontend lain 2018-11-06 18:05:33 +01:00
  • a06a27c206 In OAuth, call to MFC for authentication. lain 2018-11-06 17:58:12 +01:00
  • e70d9d92f2 Add an mfc_id field to users. lain 2018-11-06 17:57:52 +01:00
  • 44561d18e2 Merge branch 'unify-mastodon-oauth' of git.pleroma.social:pleroma/pleroma into mfc-login lain 2018-11-06 16:07:00 +01:00
  • dddd186182 Clean up login code, add tests. lain 2018-11-03 13:00:31 +01:00
  • 94d5b06f08 Add basic mfc login functions. lain 2018-11-01 18:37:24 +01:00
  • 9a5b784dbe Vagrant setup for Pleroma, based on Ubuntu 16.04 (ala Mastodon's setup) Kit Redgrave 2018-06-13 02:22:30 -05:00
  • 4c3955bdba disable cookies in nginx config -- to free up static assets from the chainz DYM 2018-06-05 12:38:06 +00:00
  • 34833cb39b Update pleroma.nginx - Misspelling of 'example.tld' on line 15 Fexel 2018-04-08 02:23:16 +00:00
  • 4a6855d9ee Provide plaintext representations of content/cw in MastoAPI rinpatch 2017-01-01 03:10:08 +03:00
  • 4977e96fa4 Merge branch 'use-jobs-in-webpush' into 'develop' lambda 2019-04-08 11:53:18 +00:00
  • 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush Egor Kislitsyn 2019-04-08 18:48:10 +07:00
  • e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' lambda 2019-04-08 11:42:20 +00:00
  • fd45cab9ec Merge branch 'twitter_oauth' into 'develop' lambda 2019-04-08 11:41:50 +00:00
  • ff9290836b Merge branch 'feature/697-language-tag-metadata' into 'develop' lambda 2019-04-08 11:03:10 +00:00
  • 36c0a10fdf adding language tag Alexander Strizhakov 2019-04-08 11:03:10 +00:00
  • 23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop' lambda 2019-04-08 09:50:00 +00:00
  • c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush Egor Kislitsyn 2019-04-08 16:46:59 +07:00
  • 44829d9181 AdminApiControllerTest unused variables fix. Ivan Tashkinov 2019-04-08 12:32:55 +03:00
  • a1a854646e Merge branch 'develop' into use-jobs-in-webpush Egor Kislitsyn 2019-04-08 16:29:20 +07:00
  • bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth Ivan Tashkinov 2019-04-08 12:20:26 +03:00
  • b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' lambda 2019-04-08 09:18:01 +00:00
  • b177e1e7f3 Merge branch 'scheduled-activities' into 'develop' lambda 2019-04-08 09:08:18 +00:00
  • e3328bc138 [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring. Ivan Tashkinov 2019-04-07 11:08:37 +03:00
  • fb2040d061 Merge branch 'fix/deactivated-user-error' into 'develop' feld 2019-04-06 22:19:30 +00:00
  • 2056efa714 Add scheduler for sending scheduled activities to the queue eugenijm 2019-04-03 18:55:04 +03:00
  • fc92a0fd8d Added limits and media attachments for scheduled activities. eugenijm 2019-04-02 01:31:01 +03:00
  • b3870df51f Handle scheduled_at on status creation. eugenijm 2019-03-30 12:58:40 +03:00
  • 7bf622ce73 Add scheduled activities eugenijm 2019-03-28 12:39:10 +03:00
  • 7aa53d52bd Return 403 on oauth token exchange for a deactivated user eugenijm 2019-04-06 00:22:42 +03:00
  • 876965a7e7 Merge branch 'fix/failed-legacy-test' into 'develop' feld 2019-04-06 16:03:35 +00:00
  • 9aeac7dcca Merge branch 'feature/prometheus' into 'develop' feld 2019-04-06 14:51:46 +00:00
  • b395aebf24 Pin recon dependency to 2.4.0 Mark Felder 2019-04-06 09:30:36 -05:00
  • 7410aee886 Merge develop to 770-add-emoji-tags Alex S 2019-04-06 20:34:00 +07:00
  • 3c5daa0235 Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop' Haelwenn 2019-04-05 23:36:42 +00:00
  • 325a268017 Redirect to the referer url after mastofe authorization Sergey Suprunenko 2019-04-05 23:36:42 +00:00
  • e9c075d05c
         Mock :crypt.crypt/2 because otherwise the test fails on Mac OS Sergey Suprunenko 2019-04-05 22:40:30 +02:00
  • e3ca9f708f Merge branch 'revert-8607ae68' into 'develop' rinpatch 2019-04-05 20:04:16 +00:00
  • e5df8cadea Revert "Merge branch 'test-coverage' into 'develop'" rinpatch 2019-04-05 19:59:03 +00:00
  • 8607ae6841 Merge branch 'test-coverage' into 'develop' rinpatch 2019-04-05 19:49:20 +00:00
  • fb1be1d798 Use --cover option when running CI tests optikfluffel 2019-04-05 20:12:44 +02:00
  • 3fb3f42e77 Merge branch 'feature/admin-api-follow' into 'develop' feld 2019-04-05 17:15:55 +00:00
  • fac76bfa35 We actually want the user id not nickname in the test... Mark Felder 2019-04-05 12:11:19 -05:00
  • c746087f57 Also remove Repo functions in the tests Mark Felder 2019-04-05 11:59:56 -05:00
  • b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase Mark Felder 2019-04-05 11:41:41 -05:00
  • da64a5aece Document the admin API endpoints for controlling follow/unfollow Mark Felder 2019-04-05 11:29:34 -05:00
  • 7895ee37fa Add user following / unfollowing to the admin api. Roger Braun 2018-12-16 16:41:56 +01:00
  • 1c2e4f88d1 fix credo Egor Kislitsyn 2019-04-05 19:46:28 +07:00
  • 5499750054 Merge branch 'hotfix/html-sanitization' into 'develop' lambda 2019-04-05 12:43:57 +00:00
  • f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push Egor Kislitsyn 2019-04-05 19:38:44 +07:00
  • 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 +03:00
  • 47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. Ivan Tashkinov 2019-04-05 15:12:02 +03:00
  • 3e7f2bfc2f [#923] OAuthController#callback adjustments (with tests). Ivan Tashkinov 2019-04-05 09:19:17 +03:00
  • 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth Ivan Tashkinov 2019-04-04 23:43:08 +03:00
  • 66e7b03372 Merge branch 'develop' into feature/prometheus Mark Felder 2019-04-04 15:39:42 -05:00
  • 9c9eec62c2 Merge branch 'feature/quack' into 'develop' feld 2019-04-04 19:52:22 +00:00
  • 3b12eeda19 Add ability to ship logs to a Slack channel feld 2019-04-04 19:52:22 +00:00
  • f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements. Ivan Tashkinov 2019-04-04 22:41:03 +03:00
  • 69038887b2 Code readability tweak Mark Felder 2019-04-04 12:36:57 -05:00
  • 7222afe01b Clean merge crumbs Mark Felder 2019-04-04 12:29:10 -05:00
  • 7e930559fe Serve metrics at /api/pleroma/app_metrics href 2019-01-30 16:44:38 +01:00
  • 5564cd421d Document Prometheus Mark Felder 2019-04-04 12:19:31 -05:00
  • 0b5c818cb7 [#1] fix telemetry Egor Kislitsyn 2019-03-25 15:29:04 +07:00
  • bc3618a38d Set up telemetry and prometheus href 2019-01-30 16:32:30 +01:00
  • b655a8ea83 Add recon href 2019-02-06 10:33:05 +01:00
  • cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 Egor Kislitsyn 2019-04-04 16:10:43 +07:00
  • 3c7f5bb1dc Merge branch 'fix/add-oauth-token-indexes' into 'develop' lambda 2019-04-04 08:01:12 +00:00
  • c900ff39af Merge branch 'features/pleroma-tan-mastofe' into 'develop' lambda 2019-04-04 07:34:20 +00:00
  • af0065a71f
         mastodon_api_controller.ex: Add pleroma-tan to initial_state Haelwenn (lanodan) Monnier 2019-04-04 09:07:25 +02:00
  • 3f8be270c6 Merge branch 'feature/robotstxt' into 'develop' lambda 2019-04-03 17:31:34 +00:00
  • cd41584ac4 Generate permissive or restrictive robots.txt in the config generator Sachin Joshi 2019-04-03 00:54:16 +05:45
  • 9bb122d5a7 Merge branch 'update-autolinker' into 'develop' lambda 2019-04-03 14:42:59 +00:00
  • 86f90c0a54 adding indexes to oauth_tokens table Alex S 2019-04-03 20:51:09 +07:00
  • d313a0c49c Update auto_linker dependency Egor Kislitsyn 2019-04-03 19:41:15 +07:00
  • 7c003991d6 Merge branch 'fix/preview-not-working-with-form-data' into 'develop' lambda 2019-04-03 06:51:44 +00:00
  • 79cb34a4b0 Fix preview not being usable in form data rinpatch 2019-04-02 23:07:16 +03:00
  • 0cb94cfa94 Merge branch 'fix-slow-relationships' into 'develop' Haelwenn 2019-04-02 18:43:48 +00:00
  • 256b492a58 Merge branch 'bugfix/wrong-date-format' into 'develop' lambda 2019-04-02 14:18:23 +00:00
  • a79ce94dd4 Merge branch 'feature/fake-statuses' into 'develop' lambda 2019-04-02 14:17:43 +00:00
  • 39bcf93007 Merge remote-tracking branch 'origin/develop' into fix-slow-relationships lain 2019-04-02 16:10:38 +02:00
  • fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching. lain 2019-04-02 16:04:18 +02:00
  • fa8483cb80 Merging develop into feature/770-add-emoji-tags Alex S 2019-04-02 20:39:52 +07:00
  • d140738edf second level of headertext change in doc Alex S 2019-04-02 20:35:41 +07:00
  • 3465b7ba9a syntax highlighting Alex S 2019-04-02 20:32:37 +07:00
  • 180b87257c Merge branch 'bugfix/share-mastodon' into 'develop' lambda 2019-04-02 12:47:40 +00:00
  • ce9284b36f Merge branch 'remove-user-activities' into 'develop' lambda 2019-04-02 12:45:29 +00:00
  • b95cf3d490 Merge branch 'get_by_id' into 'develop' lambda 2019-04-02 12:43:28 +00:00
  • 9e0567ec52 Merge develop into feature/770-add-emoji-tags Alex S 2019-04-02 19:16:29 +07:00
  • bd961a3bad Merge branch 'features/pleroma-tan' into 'develop' lambda 2019-04-02 11:54:04 +00:00
  • 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 +03:00
  • 37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth Ivan Tashkinov 2019-04-02 14:05:34 +03:00
  • 20c619f85f replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests Egor Kislitsyn 2019-04-02 17:58:32 +07:00