Commit graph

  • 4956ab5ea3 Fix compile Mark Felder 2019-02-12 00:25:12 +0000
  • ac7ef0999d WIP: Fix Twitter Cards Mark Felder 2019-02-11 23:59:04 +0000
  • ea1058929c
    Use url[:scheme] instead of protocol to determine if https is enabled shibayashi 2019-02-12 00:08:52 +0100
  • 39548c3824 Merge branch 'bugfix/keyword-policy-check-summary' into 'develop' kaniini 2019-02-11 18:45:15 +0000
  • 379d04692c Filter summary in keywordpolicy rinpatch 2019-02-11 21:35:40 +0300
  • 39383a6b79 Merge branch 'feature/thread-muting' into 'develop' rinpatch 2019-02-11 15:02:14 +0000
  • 044616292b Merge branch 'feature/rich-media-limits' into 'develop' lambda 2019-02-11 12:33:58 +0000
  • ac72b578da Merge branch 'develop' into feature/thread-muting Karen Konou 2019-02-11 12:10:10 +0100
  • c01ef574c1 Refactor as per Rin's suggestions, add endpoint tests Karen Konou 2019-02-11 11:59:51 +0100
  • 48552b38b2 Merge branch 'revert-e0de0fcf' into 'develop' lambda 2019-02-11 08:22:54 +0000
  • d53e36bf1e Revert "Merge branch 'object-creation' into 'develop'" lambda 2019-02-11 08:07:39 +0000
  • 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs Egor Kislitsyn 2019-02-11 13:54:21 +0700
  • 74579115a7
    test: Change lenght(…) == 0 to Enum.empty?(…) Haelwenn (lanodan) Monnier 2019-02-11 00:08:48 +0100
  • 8bb7e19b38
    test: de-group alias/es Haelwenn (lanodan) Monnier 2019-02-10 22:57:38 +0100
  • 89b6f255b4
    .credo.exs: Add test directory as well Haelwenn (lanodan) Monnier 2019-02-10 22:56:47 +0100
  • 45e57dd187 rich media: tighten fetching timeouts and size limits William Pitcock 2019-02-10 21:37:51 +0000
  • 06c4935c11 Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop' kaniini 2019-02-10 21:28:41 +0000
  • 5d34e5a51e Merge branch 'feather_mention' into 'develop' kaniini 2019-02-10 21:16:29 +0000
  • 6c8d15da11 Merge branch 'fix/credo-issues' into 'develop' kaniini 2019-02-10 20:54:21 +0000
  • 49b5f8d7c9 Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop' kaniini 2019-02-10 19:25:34 +0000
  • d1752a81a8 Update service files of OpenRC and systemd to new recommended paths shibayashi 2019-02-10 19:25:34 +0000
  • fcd8a2d0d6
    Update Mastodon Frontend to 2019-02-10 bundle Haelwenn (lanodan) Monnier 2019-02-10 19:55:22 +0100
  • db407e4d50
    add feather to webclients succfemboi 2019-02-10 16:18:04 +0100
  • 57501defb4 Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop' lambda 2019-02-10 14:21:12 +0000
  • 612ace96de Merge branch 'docs/pleroma-clients' into 'develop' lambda 2019-02-10 13:47:26 +0000
  • 94385313b5
    docs/Clients.md: Add Nekonium Haelwenn (lanodan) Monnier 2019-02-10 14:42:32 +0100
  • daa25f3403
    docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically Haelwenn (lanodan) Monnier 2019-02-10 14:24:48 +0100
  • f2d5989ffa
    docs/Clients.md: Add Social (GNOME) Haelwenn (lanodan) Monnier 2019-01-28 18:39:29 +0100
  • 91a41ec670
    docs/Clients.md: Add per-type sections Haelwenn (lanodan) Monnier 2019-01-28 18:28:25 +0100
  • 5f767be331
    docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore Haelwenn (lanodan) Monnier 2019-01-28 18:20:10 +0100
  • d0cf58d032
    WIP: docs/Clients.md: Add documentation about clients supporting pleroma Haelwenn (lanodan) Monnier 2019-01-28 05:50:08 +0100
  • cc21fc5f53 refactor, status view updating, error handling Karen Konou 2019-02-10 09:31:20 +0100
  • e0de0fcf22 Merge branch 'object-creation' into 'develop' rinpatch 2019-02-10 07:39:27 +0000
  • 1d8b578bb7
    Recommend the acme-challenge path that is used in the installation guides shibayashi 2019-02-09 23:08:27 +0100
  • d5fe05c37e Merge branch 'follow-enhancements' into 'develop' kaniini 2019-02-09 21:03:42 +0000
  • f8388be9c6 Do object insertion through Cachex lain 2019-02-09 22:01:08 +0100
  • 6a150de3bd Add unique index and unique constraint check, uniqueness test fails Karen Konou 2019-02-09 20:52:11 +0100
  • 478a05b4c9 Merged "check mute" test into the other two Karen Konou 2019-02-09 18:34:00 +0100
  • 638456ce8f elixir too new for CI's mix format lol Karen Konou 2019-02-09 18:08:46 +0100
  • a0d732ec55 it works!! Karen Konou 2019-02-09 17:47:57 +0100
  • 6ca633ddd3
    Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure) Haelwenn (lanodan) Monnier 2019-02-09 16:30:42 +0100
  • d924dc73ba
    de-group import/s Haelwenn (lanodan) Monnier 2019-02-09 16:20:18 +0100
  • 6a6a5b3251
    de-group alias/es Haelwenn (lanodan) Monnier 2019-02-09 16:16:26 +0100
  • a337bd114c [#468] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route. Ivan Tashkinov 2019-02-09 17:32:33 +0300
  • 4ad843fb9d [#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions. Ivan Tashkinov 2019-02-09 17:09:08 +0300
  • 381fe44172
    HTML.Scrubber.Default: Consistency Haelwenn (lanodan) Monnier 2019-02-09 14:39:27 +0100
  • 2272934a5e
    Stash Haelwenn (lanodan) Monnier 2019-02-08 17:18:44 +0100
  • d2e4eb7c74
    Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it Haelwenn (lanodan) Monnier 2019-02-06 21:19:35 +0100
  • bd9b5fffbc
    Mix.Tasks.Pleroma.Uploads: Fix typo in documentation Haelwenn (lanodan) Monnier 2019-02-06 21:24:57 +0100
  • 473095faf2
    Web.Federator: Fix unused variable Haelwenn (lanodan) Monnier 2019-02-06 21:04:11 +0100
  • 60ea29dfe6
    Credo fixes: alias grouping/ordering Haelwenn (lanodan) Monnier 2019-02-06 20:20:02 +0100
  • 106f4e7a0f
    Credo fixes: parameter consistency Haelwenn (lanodan) Monnier 2019-02-06 20:19:39 +0100
  • 8bcfac93a8
    Make credo happy Haelwenn (lanodan) Monnier 2019-02-03 18:44:18 +0100
  • 4430a0ad12 added another test Karen Konou 2019-02-09 14:34:42 +0100
  • 09189c3a7c Made a test! Karen Konou 2019-02-09 14:23:51 +0100
  • 563f04e81b Do autofollow first. lain 2019-02-09 13:39:57 +0100
  • bbd0049fae Respect blocks in mass follow. lain 2019-02-09 13:24:23 +0100
  • 99fd199bda Merge branch 'add-media-path-to-caddy-cache' into 'develop' lambda 2019-02-09 11:39:01 +0000
  • e868cfe619 Add /media to Caddy cache shibayashi 2019-02-09 11:39:01 +0000
  • 1eecbc1cd1 Merge branch 'feature/keyword-policy' into 'develop' lambda 2019-02-09 11:38:37 +0000
  • b05a341187 oof rinpatch 2019-02-09 08:12:30 +0300
  • 9a23f8f3ea Add tests and fix a typo in docs rinpatch 2019-02-08 20:23:26 +0300
  • 7e47a810a2 help i am not good with git Karen Konou 2019-02-08 13:21:34 +0100
  • 5c5b228f21 Added thread unmuting (still a bit buggy maybe) Karen Konou 2019-02-08 13:17:11 +0100
  • c5f8df08a7 Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop' lambda 2019-02-08 12:18:05 +0000
  • a44e532fb1 Added thread unmuting (still a bit buggy maybe) Karen Konou 2019-02-08 13:17:11 +0100
  • 38ff9b3568 fix typo in config.md rinpatch 2019-02-08 15:12:44 +0300
  • 7356659273 wow rinpatch 2019-02-08 15:12:13 +0300
  • ba7d7ffd80 Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop' lambda 2019-02-08 12:10:35 +0000
  • b4271de770 Merge branch 'oauth2_strengthening' into 'develop' lambda 2019-02-08 12:09:43 +0000
  • 98ec578f4d Merge branch 'develop' into feature/thread-muting Karen Konou 2019-02-08 12:44:02 +0100
  • f88dec8b33 What idiot did that? (me) rinpatch 2019-02-08 13:16:50 +0300
  • 6c21f5aa16 Merge branch 'develop' into feature/keyword-policy rinpatch 2019-02-08 13:12:33 +0300
  • 8a0b755c19 rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy rinpatch 2019-02-08 13:12:09 +0300
  • 2174f6eb4f Add default config for keyword policy rinpatch 2019-02-08 12:48:39 +0300
  • 46aa8c18a2 Add keyword policy rinpatch 2019-02-08 12:38:24 +0300
  • 97a2789caa resolved merge conflict Karen Konou 2019-02-07 23:47:13 +0100
  • c43f414a79 Somehow fixed the repo insert [skip-ci] Karen Konou 2019-02-07 23:44:30 +0100
  • 7e3ec93ed0 made a silly oopsie Karen Konou 2019-02-07 22:38:54 +0100
  • 6b5032e10e made a silly oopsie Karen Konou 2019-02-07 22:38:54 +0100
  • 77448de492 ugghhhh Karen Konou 2019-02-07 22:25:07 +0100
  • 2c68cf7e9e OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix. Ivan Tashkinov 2019-02-07 22:14:06 +0300
  • f4ff4ffba2 Migration and some boilerplate stuff Karen Konou 2019-02-05 13:35:24 +0100
  • c2090b86b7 mark streaming feature for ios apps in readme hakabahitoyo 2019-02-07 12:01:35 +0900
  • d84392c9e0 Merge branch 'remove-pawoo-apps-from-readme' into 'develop' kaniini 2019-02-07 02:19:52 +0000
  • 24dd0fc545 Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop' kaniini 2019-02-07 02:18:51 +0000
  • 902c72bb56 Mark streaming feature for Apps in README.md hakabahitoyo 2019-02-07 11:04:37 +0900
  • 063739054e Update README.md Hakaba Hitoyo 2019-02-07 01:15:27 +0000
  • 430f23323c Merge branch 'rename-followings' into 'develop' kaniini 2019-02-06 22:40:24 +0000
  • 74518d0b60 hide_followings was renamed to hide_followers in the FE, but never synced up in the BE Mark Felder 2019-02-06 22:34:44 +0000
  • 1220a17146 Merge branch 'bugfix/rich-media-card' into 'develop' Haelwenn 2019-02-06 18:39:13 +0000
  • 26670b09a7 tests: add a rich media card that contains all relevant fields William Pitcock 2019-02-06 18:27:55 +0000
  • 18e783bcb2 Merge branch 'add-admin-and-moderator-fields' into 'develop' kaniini 2019-02-06 18:19:47 +0000
  • 6eb8c1eb92 test: add some regression tests for the rich media card rendering William Pitcock 2019-02-06 18:12:26 +0000
  • 65a4b9fbea mastodon api: rich media: don't clobber %URI struct with a string William Pitcock 2019-02-06 18:02:15 +0000
  • 09b71a9053 Merge branch 'mr/exsyslogger-doc-and-format' into 'develop' Haelwenn 2019-02-06 18:02:10 +0000
  • ab80c8ebb8 adds a couple of explicit examples for ExSyslogger Michael Loftis 2019-02-06 17:54:30 +0000
  • f7aedbcc55 Merge branch 'fix/activitypub-user-view-badmap' into 'develop' rinpatch 2019-02-06 17:47:58 +0000
  • f753043ce0
    Fix if clause in activity_pub user_view href 2019-02-06 18:42:19 +0100
  • 43b3f9e96e rids the duplicate timestamp from default ExSyslogger config Michael Loftis 2019-02-06 17:34:09 +0000