Commit graph

  • f1b72bfb70 Split hide_networ only for local users Maxim Filippov 2019-02-06 13:41:31 +0300
  • 3c08e20d68 Merge branch '2019-02-06-update-frontend' into 'develop' lambda 2019-02-06 09:47:36 +0000
  • 78a51f4dd4 update frontend lain 2019-02-06 10:40:01 +0100
  • 5b1d7c3c56 fix tests Egor Kislitsyn 2019-02-06 12:17:41 +0700
  • 6f05f448f8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs Egor Kislitsyn 2019-02-06 11:33:00 +0700
  • 035eaeb9b8 Allow to configure visibility for admin and moderator badges eugenijm 2019-02-04 15:28:35 +0300
  • 398c81f9c8 Add is_admin and is_moderator boolean fields to the user view eugenijm 2019-02-04 05:03:57 +0300
  • c46490b199 Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop' rinpatch 2019-02-05 21:01:20 +0000
  • d83dbd9070 rich media: parser: reject any data which cannot be explicitly encoded into JSON William Pitcock 2019-02-05 20:50:57 +0000
  • d120aa63f0 Merge branch 'fix-dm-index' into 'develop' kaniini 2019-02-05 20:27:31 +0000
  • 681ba1e52f Merge branch 'feature/ap-c2s-whoami' into 'develop' kaniini 2019-02-05 20:26:31 +0000
  • 00d572fd58 Merge branch 'testfix/twitter-api' into 'develop' kaniini 2019-02-05 20:13:38 +0000
  • 73e6a1f1dd test: twitterapi: fix another possible test failure case William Pitcock 2019-02-05 20:04:39 +0000
  • eb2b1960e0 Merge branch 'feature/split-hide-network-v2' into 'develop' kaniini 2019-02-05 18:56:59 +0000
  • ecdb0b7f57 Merge branch 'bugfix/rich-media-image-nil' into 'develop' kaniini 2019-02-05 18:53:43 +0000
  • c4d317ccb6 test: twitterapi: fix the test breakage for real William Pitcock 2019-02-05 18:49:02 +0000
  • 1d94b67e40 mastodon api: fix rendering of cards without image URLs (closes #597) William Pitcock 2019-02-05 18:30:27 +0000
  • f8b831ecfd Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop' lambda 2019-02-05 11:30:18 +0000
  • 040ab352a5 Merge branch 'patch-2' into 'develop' lambda 2019-02-05 11:29:20 +0000
  • 8892f4468c Merge branch 'bugfix/rich-media-nil' into 'develop' lambda 2019-02-05 11:28:48 +0000
  • c48aba3c2a Fix SQL Maxim Filippov 2019-02-05 10:22:31 +0300
  • 47eb557617 ARGLE GARBLE witches.live 2019-02-05 07:03:54 +0000
  • a2bb5d890d html: don't attempt to parse nil content William Pitcock 2019-02-05 05:06:17 +0000
  • e71ab5a10f activitypub: transmogrifier: fix bare tags William Pitcock 2019-02-05 00:32:49 +0000
  • db1165f70f activitypub: c2s: add /api/ap/whoami endpoint for andstatus William Pitcock 2019-02-04 22:58:29 +0000
  • f3c8b02d65 Massage index until it actually does the stuff we want. lain 2019-02-04 23:47:29 +0100
  • cd6606b7f6 Initialize hide_network with false Maxim Filippov 2019-02-04 22:23:09 +0300
  • 03991e7bc5 Merge branch 'feature/mrf-tag' into 'develop' Haelwenn 2019-02-04 19:20:11 +0000
  • 7d110be119 activitypub: mrf: tag policy: fix force-unlisted and sandbox actions William Pitcock 2019-02-04 19:03:25 +0000
  • 64a3993425 activitypub: mrf: tag policy: add support for subscription control William Pitcock 2019-02-04 17:48:48 +0000
  • 14d967f515 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs Egor Kislitsyn 2019-02-05 00:38:05 +0700
  • 3ae11835a9 Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop' rinpatch 2019-02-04 17:32:12 +0000
  • 4031c94a59 fix hellthread threshold deprecation warning Karen Konou 2019-02-04 18:26:56 +0100
  • ff2c28fd6d activitypub: mrf: tag policy: refactor the filtering hook a bit William Pitcock 2019-02-04 17:06:37 +0000
  • 9a69f08e86 activitypub: mrf: tag policy: add support for processing follow requests William Pitcock 2019-02-04 17:03:34 +0000
  • 084bb8ccd5 activitypub: mrf: tag policy: implement force-unlisted and sandbox William Pitcock 2019-02-04 15:55:20 +0000
  • 88e32a32ce mrf: add initial MRF.TagPolicy engine William Pitcock 2019-02-04 02:35:46 +0000
  • 93e136d70b mix: add user tag/untag task William Pitcock 2019-02-04 02:33:11 +0000
  • 25a659d2dc Merge branch 'mime-riff' into 'develop' kaniini 2019-02-04 16:52:41 +0000
  • 127f99ae18
    Mime: detect RIFF formats (wave, webp, avi) href 2019-02-04 17:44:41 +0100
  • 00835bf678 Merge branch 'fix/rich-media-relative-path' into 'develop' rinpatch 2019-02-04 16:01:34 +0000
  • 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs Egor Kislitsyn 2019-02-04 20:50:28 +0700
  • 89762ad230 Merge branch 'feature/hellthread-filter-improvements' into 'develop' rinpatch 2019-02-04 12:36:50 +0000
  • 58262a8b8a removed a debug thingy Karen Konou 2019-02-04 11:22:25 +0000
  • 4430641349 squished a bug Karen Konou 2019-02-04 12:09:00 +0100
  • 3cf046babb actually commited the changes Karen Konou 2019-02-04 10:23:43 +0100
  • 63a4f4b7be fixed Map,put arguments, updated nomenclature Karen Konou 2019-02-04 10:23:07 +0100
  • 583c4e0f17 more tweaks, fixed silly mistakes... Karen Konou 2019-02-03 23:56:20 +0100
  • e10cda7541 implemented tweaks Karen Konou 2019-02-03 22:46:06 +0100
  • c57f37bd36 Merge branch 'mogrify-orient' into 'develop' kaniini 2019-02-03 21:06:15 +0000
  • 531507a635 fixed things Karen Konou 2019-02-03 20:45:32 +0100
  • 10130fa7d6 made toggleable, added docs Karen Konou 2019-02-03 20:27:28 +0100
  • 0ef0ae35ab added optional delist feature Karen Konou 2019-02-03 20:12:23 +0100
  • 16ce129e38 Split hide_network into hide_followers & hide_followings (fixed) Maxim Filippov 2019-02-03 21:24:09 +0300
  • 69a38644bc Merge branch '589-fix-cache' into 'develop' lambda 2019-02-03 18:19:40 +0000
  • e61f0be951 Unbreak all the tests. lain 2019-02-03 18:54:39 +0100
  • 505a084058 Still do caching in tests. lain 2019-02-03 18:28:14 +0100
  • 0c08bd4181 Update Mogrify docs and warning for deprecated syntax to encourage users to enable both strip and auto-orient Mark Felder 2019-02-03 16:39:42 +0000
  • 8180de951e Merge branch '582_federation_retirement_optimization' into 'develop' kaniini 2019-02-03 15:47:55 +0000
  • 3913b0196e [#582] Made single-pub task call Instance.set_reachable/1 if set_reachable is not specified. Added tests. Ivan Tashkinov 2019-02-03 13:28:13 +0300
  • b40b4bc4e5 [#582] Optimized federation retirement by reducing the number of SQL calls (calling Instances.set_reachable/1 only if instance had unreachable_since, calling Instances.set_unreachable/1 only if instance had nil unreachable_since). Ivan Tashkinov 2019-02-03 12:41:27 +0300
  • d5d91ae689 Merge branch 'fix/oauth-page-responsiveness' into 'develop' rinpatch 2019-02-02 10:48:35 +0000
  • 2c59eb3cfc Add responsive features to layout Maxim Filippov 2019-02-02 13:38:52 +0300
  • 68d461b3a9 Check if rich media uri is relative rinpatch 2019-02-02 12:24:24 +0300
  • 833404f0f5 Use with instead of if in the card rinpatch 2019-02-02 12:04:18 +0300
  • e4d18f328b merge only if page_url is an absolute path rinpatch 2019-02-02 11:53:46 +0300
  • cbadf9d333 Fix rich media relative path rinpatch 2019-02-02 11:38:37 +0300
  • 09e1c8c05d Merge branch 'revert-0a82a7e6' into 'develop' kaniini 2019-02-01 20:23:55 +0000
  • 486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'" kaniini 2019-02-01 20:22:58 +0000
  • 28bfb09b01 Merge branch 'hotfix/object-normalize-cache' into 'develop' href 2019-02-01 19:45:55 +0000
  • ffbf306c9a Merge branch 'streaming-api-url-fix' into 'develop' href 2019-02-01 19:39:50 +0000
  • af10ef8d4e object: use cached accesses when possible in Object.normalize() William Pitcock 2019-02-01 19:38:57 +0000
  • a184811a60 Use url() instead of static_url in Endpoint.websocket_url() eugenijm 2019-02-01 22:35:19 +0300
  • 7e384a2425 Merge branch 'develop' into 'develop' href 2019-02-01 19:18:46 +0000
  • 9cac8729af update nodeinfo version when requesting 2.1 Luna 2019-02-01 16:03:23 -0300
  • d747bd9870 Use String.replace_leading instead of String.replace for getting websocket streaming api url. eugenijm 2019-02-01 21:56:18 +0300
  • 1cdcee89da mix format pass Luna 2019-02-01 14:40:43 -0300
  • 23b1c64a19 downcase software name in nodeinfo Luna 2019-02-01 14:35:08 -0300
  • e8c7be38fc add tests for nodeinfo 2.0 compat and 2.1's new field Luna 2019-02-01 14:33:14 -0300
  • 389e6a878a Merge branch 'bugfix/get_list_return_404' into 'develop' Haelwenn 2019-02-01 17:27:50 +0000
  • b17ce875cf keep compatibility with nodeinfo 2.0 Luna 2019-02-01 14:23:40 -0300
  • 74c6119f28
    MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list Haelwenn (lanodan) Monnier 2019-02-01 18:15:15 +0100
  • cd6db6abe4 use Mix.Project.Config for some Application functions Luna 2019-02-01 14:11:23 -0300
  • 0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop' kaniini 2019-02-01 17:05:29 +0000
  • fc7644798d Merge branch 'serve-sw-pleroma.js' into 'develop' lambda 2019-02-01 14:24:07 +0000
  • fa5ec765d9
    Serve sw-pleroma.js properly href 2019-02-01 11:34:41 +0100
  • ddab8d45ec Merge branch 'fix-rich-media-toggle' into 'develop' lambda 2019-02-01 09:33:50 +0000
  • 01d483f9c7 Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle lain 2019-02-01 10:21:17 +0100
  • b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop' href 2019-02-01 09:14:35 +0000
  • b0c4c082c4 mix format pass Luna 2019-02-01 04:02:40 -0300
  • c05928dbda use nodeinfo 2.1, add repository field Luna 2019-02-01 03:55:10 -0300
  • 0340fcaeca Merge branch 'docs/pleroma-api-invite-token' into 'develop' Haelwenn 2019-01-31 22:28:08 +0000
  • a7c55c61bb
    docs/Pleroma-API.md: Add missing token field documentation Haelwenn (lanodan) Monnier 2019-01-31 23:23:53 +0100
  • b19b4f8537 Remove default value for rich media. lain 2019-01-31 20:02:08 +0100
  • e914eeb632 Merge branch 'user-follow-all-unique' into 'develop' kaniini 2019-01-31 18:50:00 +0000
  • 308b35ebe2
    User.follow_all: ensure its stays unique href 2019-01-31 18:07:46 +0100
  • 44913c1019 Merge branch 'bugfix/rich-media-non-unicode' into 'develop' lambda 2019-01-31 16:54:48 +0000
  • 106475f265 test: http mocks: formatting William Pitcock 2019-01-31 16:30:56 +0000
  • dea33f4aec Merge branch 'develop' into 'develop' kaniini 2019-01-31 16:28:40 +0000
  • fb9730010e Merge branch 'fix/rich-media-disable-in-config' into 'develop' kaniini 2019-01-31 16:22:26 +0000