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

Commit Graph

  • 091baf9316 Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop' lambda 2019-04-02 10:57:38 +00:00
  • 26d509cc86 Merge branch 'get_by_id' into 'develop' lambda 2019-04-02 10:52:29 +00:00
  • b5d486d9ac Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop' lambda 2019-04-02 10:51:33 +00:00
  • 95c92c49c9 Fix account lookup for nicknames beginning with numbers cascode 2019-04-02 10:51:33 +00:00
  • 590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth Ivan Tashkinov 2019-04-02 13:50:12 +03:00
  • 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 +07:00
  • 88d3cb44c3 replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) Egor Kislitsyn 2019-04-02 17:47:02 +07:00
  • 15ce710460 Added "GET /oauth/authorize" tests. Ivan Tashkinov 2019-04-02 13:43:33 +03:00
  • 11c2d6bdc4 change Repo.get(Activity, id) => Activity.get_by_id(id) in tests Egor Kislitsyn 2019-04-02 17:08:03 +07:00
  • 1b3d921921 change Repo.get(User, id) => User.get_by_id(id) Egor Kislitsyn 2019-04-02 17:01:26 +07:00
  • 4212527928 change Repo.get(Activity, id) => Activity.get_by_id(id) Egor Kislitsyn 2019-04-02 16:50:31 +07:00
  • 3db9235150
         Ignore dates in wrong formats Sergey Suprunenko 2019-04-02 11:25:51 +02:00
  • a14742f495 add user delete_activities mix task Egor Kislitsyn 2019-04-02 16:30:11 +07:00
  • 484162c187 test fix Alex S 2019-04-02 16:26:40 +07:00
  • 08d64b977f little changes and typos Alex S 2019-04-02 16:13:34 +07:00
  • 851c5bf093 updating custom_emoji docs Alex S 2019-04-02 15:57:57 +07:00
  • 9305e241cb Merge branch 'ci-speedup-2-electric-boogalo' into 'develop' lambda 2019-04-02 08:50:47 +00:00
  • 9b2188da7c refactoring of emoji tags config to use groups Alex S 2019-04-02 15:44:56 +07:00
  • a1869f5272 Merge remote-tracking branch 'pleroma/develop' into remove-user-activities Egor Kislitsyn 2019-04-02 15:41:30 +07:00
  • f20e8d28de add support for all status type (ostatus) and replase case with if Sachin Joshi 2019-04-02 12:15:41 +05:45
  • 8c71ea5a1a remove reduntant services in docs deploy and change job names to kebab case rinpatch 2019-04-02 09:13:34 +03:00
  • 5ee54d8183 what the fuck rinpatch 2019-04-02 09:07:58 +03:00
  • 7827b929fc huh rinpatch 2019-04-02 09:02:21 +03:00
  • 4861558b93 Separate CI jobs to 3 stages to allow them to be executed in parallel rinpatch 2019-04-02 08:58:09 +03:00
  • f8aa917eef Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop' rinpatch 2019-04-02 05:31:41 +00:00
  • 6386c1c9c1 fetch url for OStatus to know if it is a/c or status Sachin Joshi 2019-04-02 10:26:09 +05:45
  • f56eef8d8c
         router: Add fake identity proof endpoint Haelwenn (lanodan) Monnier 2019-04-02 01:53:25 +02:00
  • fd7dd8f9a2 Merge branch 'fix/default-mail-adapter' into 'develop' lambda 2019-04-01 21:47:40 +00:00
  • fc2bef5ac3 Merge branch 'documentation-improvements' into 'develop' lambda 2019-04-01 21:20:11 +00:00
  • b6f9f7b8aa
         Handle dates in the Unix timestamp format (Fixes #763) Sergey Suprunenko 2019-04-01 22:40:48 +02:00
  • 1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status Sachin Joshi 2019-04-01 22:12:02 +05:45
  • 66e7d4966d
         COPYING: Wording Haelwenn (lanodan) Monnier 2019-04-01 18:34:53 +02:00
  • 5373077501 update mastodon api link in README to point to a non-outdated docs rinpatch 2019-04-01 19:27:40 +03:00
  • d976cc5df7 Merge branch 'update-readme' into 'develop' rinpatch 2019-04-01 16:25:02 +00:00
  • e2b94d8f33 Make only important note bold rather than the whole paragraph because it looks better that way rinpatch 2019-04-01 19:24:50 +03:00
  • a309b49c2d Remove outdated howto change config and port and move it to config.md instead rinpatch 2019-04-01 19:19:06 +03:00
  • 41f02e87a1 Link to docs page instead of to clients.md Karen Konou 2019-04-01 18:13:42 +02:00
  • 715a31c1ed
         COPYING: wrap to 79, city.jpg Unsplash, wording Haelwenn (lanodan) Monnier 2019-04-01 18:13:13 +02:00
  • 3c9abf5dee Fix dead links and add note about new docs site Karen Konou 2019-04-01 18:02:58 +02:00
  • 6910fb371b Fixed local MastoFE authentication / force_login option. Ivan Tashkinov 2019-04-01 17:25:25 +03:00
  • 949cfde065 restart makes no sense here as we instructed to stop the service before rinpatch 2019-04-01 16:26:46 +03:00
  • bff8cde0cf Instruct to stop the service only after git pulling and getting deps to minimize downtimes rinpatch 2019-04-01 16:23:32 +03:00
  • 7c69c6f624 change bold text to be proper geadings in introduction.md rinpatch 2019-04-01 16:22:12 +03:00
  • b46e6f0949 Fix backup/restore page to have proper headings rinpatch 2019-04-01 16:10:47 +03:00
  • cbe09d94d1 Added force_login authentication option (previously applied by default). Ivan Tashkinov 2019-04-01 14:46:50 +03:00
  • 49733f6176 add docs folder to gitignore Alex S 2019-04-01 18:28:19 +07:00
  • 17d3d05a71 code style Alex S 2019-04-01 17:54:30 +07:00
  • 3601f03147 Adding tag to emoji ets table Alex S 2019-04-01 17:17:57 +07:00
  • fe5145eeaa Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex rinpatch 2019-04-01 12:25:53 +03:00
  • 975482f091 insert object defaults for fake activities and make credo happy rinpatch 2019-04-01 12:16:51 +03:00
  • d866b59eea oof rinpatch 2019-04-01 11:58:08 +03:00
  • 45ba10bf47 Fix the issue with HTML scrubber rinpatch 2019-04-01 11:55:59 +03:00
  • 804173fc92 [#923] Minor code readability fix. Ivan Tashkinov 2019-04-01 09:45:44 +03:00
  • eadafc88b8 [#923] Deps config adjustment (no override for httpoison), code analysis issues fixes. Ivan Tashkinov 2019-04-01 09:28:56 +03:00
  • baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth Ivan Tashkinov 2019-04-01 08:49:32 +03:00
  • 0bab2661ae
         COPYING: Add copyright notice for the finmojis Haelwenn (lanodan) Monnier 2019-04-01 02:15:14 +02:00
  • d5a1e08bf1 Add default mail adapter settings to config Mark Felder 2019-03-31 17:46:17 -05:00
  • 8ae4837abd
         COPYING: Add copyright notice for the whole repository Haelwenn (lanodan) Monnier 2019-04-01 00:32:00 +02:00
  • 362603c723
         LICENSE → AGPL-3 Haelwenn (lanodan) Monnier 2019-04-01 00:31:21 +02:00
  • 32e843f033
         CC-BY-SA-4.0: Add a copy of the CC-BY-SA-4.0 license Haelwenn (lanodan) Monnier 2019-04-01 00:30:21 +02:00
  • cd387f8693 Add a fake option to lazy_put_actvity_defaults rinpatch 2019-03-30 13:57:54 +03:00
  • 42b779527c document fake option rinpatch 2019-03-29 22:15:20 +03:00
  • 1bb4d5d65b Implement fake status submit rinpatch 2019-03-29 21:59:04 +03:00
  • dc39d8d3fb Merge branch 'fix/job-queue-doc' into 'develop' lambda 2019-03-29 13:43:07 +00:00
  • afbc905a1c qs rinpatch 2019-03-29 16:38:18 +03:00
  • 11584488d1 Improve PleromaJobQeue config documentation rinpatch 2019-03-29 16:11:22 +03:00
  • a5edc4da62 Merge branch 'pleroma_job_queue' into 'develop' lambda 2019-03-29 12:46:05 +00:00
  • 9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue Egor 2019-03-29 12:46:05 +00:00
  • 749d53e2b2 Merge branch 'sayonara-gitlab-wiki' into 'develop' lambda 2019-03-29 10:24:52 +00:00
  • 52bec238c3 Merge branch 'feature/deploy-docs' into 'develop' lambda 2019-03-29 09:57:15 +00:00
  • ef3c23d40e Merge branch 'bugfix/migration-less_replies_count' into 'develop' kaniini 2019-03-29 07:32:24 +00:00
  • b2f3a40e53
         Revert awfully long migration from 568e34858 Haelwenn (lanodan) Monnier 2019-03-29 01:57:02 +01:00
  • 634e09e1a8 Remove duplicated header from i2p.md rinpatch 2019-03-28 20:29:46 +03:00
  • 9bd80e6044 did it really take me 4 commits to fix this? rinpatch 2019-03-28 20:27:01 +03:00
  • d16e2a2e04 Remove duplicated header from admin_api.md rinpatch 2019-03-28 20:16:59 +03:00
  • e4601b2c1d remove admin tasks as they have their page in mix tasks category already rinpatch 2019-03-28 20:16:14 +03:00
  • d0026761b7 cringe rinpatch 2019-03-28 20:13:22 +03:00
  • dfae0050af Move out of Gitlab Wiki rinpatch 2019-03-28 19:46:30 +03:00
  • a71831d1c2 Merge branch 'admin-api-user-show' into 'develop' lambda 2019-03-28 12:19:44 +00:00
  • 10c81fc902 Add user show endpoint for Pleroma admin API eugenijm 2019-03-27 21:19:00 +03:00
  • 642075b1a9 [#923] Enabled binding of multiple OAuth provider accounts to single user. Ivan Tashkinov 2019-03-27 16:20:50 +03:00
  • 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth Ivan Tashkinov 2019-03-27 15:41:40 +03:00
  • 2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring. Ivan Tashkinov 2019-03-27 15:39:35 +03:00
  • 926bf114b7 Merge branch 'feature/more-user-filters' into 'develop' lambda 2019-03-27 11:33:13 +00:00
  • a5f141d9d5 Merge branch 'fix-reblog-tests' into 'develop' lambda 2019-03-27 11:30:07 +00:00
  • 776bb5137f Fix muting reblogs tests rinpatch 2019-03-27 13:43:43 +03:00
  • 6da1999fc8 Merge branch 'hotfix/missing-announce-mastoapi' into 'develop' rinpatch 2019-03-27 09:37:08 +00:00
  • ce6d64bbd8 Fix missing announces in MastoAPI home timeline rinpatch 2019-03-27 12:28:53 +03:00
  • b2e163ec57 Merge branch 'apps-verify-credentials' into 'develop' lambda 2019-03-27 09:16:00 +00:00
  • 3cf7539bca Add more user filters + move search to its own module Maxim Filippov 2019-03-27 03:51:59 +05:00
  • a4ab60ac54 Add vapid_key to the POST /api/v1/apps response eugenijm 2019-03-26 23:21:31 +03:00
  • 691d1208b5 Add GET /api/v1/apps/verify_credentials eugenijm 2019-03-26 21:42:03 +03:00
  • ff3b09f6b3 Merge branch 'fix/ap-icon' into 'develop' lambda 2019-03-26 16:12:50 +00:00
  • c6ab5ebe7c Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop' lambda 2019-03-26 16:01:52 +00:00
  • 10a7a4a868 AP UserView: Refactor banner / avatar display code, add test. lain 2019-03-26 16:40:09 +01:00
  • 47b49ab1a1 Test for MastoAPI /api/v1/instance response structure (formatting fix). Ivan Tashkinov 2019-03-26 18:18:36 +03:00
  • 9e3899bf36 Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop' lambda 2019-03-26 15:13:55 +00:00
  • caf0e9cf33 Test for MastoAPI /api/v1/instance response structure. Ivan Tashkinov 2019-03-26 18:13:24 +03:00
  • 21ff78cd40 Merge branch 'replies-count' into 'develop' lambda 2019-03-26 14:49:09 +00:00
  • 3f44433ebd Merge branch 'refactor/remove-activity-representer' into 'develop' lambda 2019-03-26 14:46:01 +00:00