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

Commit Graph

  • c5f8df08a7 Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop' lambda 2019-02-08 12:18:05 +00:00
  • a44e532fb1 Added thread unmuting (still a bit buggy maybe) Karen Konou 2019-02-08 13:17:11 +01:00
  • 38ff9b3568 fix typo in config.md rinpatch 2019-02-08 15:12:44 +03:00
  • 7356659273 wow rinpatch 2019-02-08 15:12:13 +03:00
  • ba7d7ffd80 Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop' lambda 2019-02-08 12:10:35 +00:00
  • b4271de770 Merge branch 'oauth2_strengthening' into 'develop' lambda 2019-02-08 12:09:43 +00:00
  • 98ec578f4d Merge branch 'develop' into feature/thread-muting Karen Konou 2019-02-08 12:44:02 +01:00
  • f88dec8b33 What idiot did that? (me) rinpatch 2019-02-08 13:16:50 +03:00
  • 6c21f5aa16 Merge branch 'develop' into feature/keyword-policy rinpatch 2019-02-08 13:12:33 +03:00
  • 8a0b755c19 rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy rinpatch 2019-02-08 13:12:09 +03:00
  • 2174f6eb4f Add default config for keyword policy rinpatch 2019-02-08 12:48:39 +03:00
  • 46aa8c18a2 Add keyword policy rinpatch 2019-02-08 12:38:24 +03:00
  • 97a2789caa resolved merge conflict Karen Konou 2019-02-07 23:47:13 +01:00
  • c43f414a79 Somehow fixed the repo insert [skip-ci] Karen Konou 2019-02-07 23:44:30 +01:00
  • 7e3ec93ed0 made a silly oopsie Karen Konou 2019-02-07 22:38:54 +01:00
  • 6b5032e10e made a silly oopsie Karen Konou 2019-02-07 22:38:54 +01:00
  • 77448de492 ugghhhh Karen Konou 2019-02-07 22:25:07 +01:00
  • 2c68cf7e9e OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix. Ivan Tashkinov 2019-02-07 22:14:06 +03:00
  • f4ff4ffba2 Migration and some boilerplate stuff Karen Konou 2019-02-05 13:35:24 +01:00
  • c2090b86b7 mark streaming feature for ios apps in readme hakabahitoyo 2019-02-07 12:01:35 +09:00
  • d84392c9e0 Merge branch 'remove-pawoo-apps-from-readme' into 'develop' kaniini 2019-02-07 02:19:52 +00:00
  • 24dd0fc545 Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop' kaniini 2019-02-07 02:18:51 +00:00
  • 902c72bb56 Mark streaming feature for Apps in README.md hakabahitoyo 2019-02-07 11:04:37 +09:00
  • 063739054e Update README.md Hakaba Hitoyo 2019-02-07 01:15:27 +00:00
  • 430f23323c Merge branch 'rename-followings' into 'develop' kaniini 2019-02-06 22:40:24 +00:00
  • 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 +00:00
  • 1220a17146 Merge branch 'bugfix/rich-media-card' into 'develop' Haelwenn 2019-02-06 18:39:13 +00:00
  • 26670b09a7 tests: add a rich media card that contains all relevant fields William Pitcock 2019-02-06 18:27:55 +00:00
  • 18e783bcb2 Merge branch 'add-admin-and-moderator-fields' into 'develop' kaniini 2019-02-06 18:19:47 +00:00
  • 6eb8c1eb92 test: add some regression tests for the rich media card rendering William Pitcock 2019-02-06 18:12:26 +00:00
  • 65a4b9fbea mastodon api: rich media: don't clobber %URI struct with a string William Pitcock 2019-02-06 18:02:15 +00:00
  • 09b71a9053 Merge branch 'mr/exsyslogger-doc-and-format' into 'develop' Haelwenn 2019-02-06 18:02:10 +00:00
  • ab80c8ebb8 adds a couple of explicit examples for ExSyslogger Michael Loftis 2019-02-06 17:54:30 +00:00
  • f7aedbcc55 Merge branch 'fix/activitypub-user-view-badmap' into 'develop' rinpatch 2019-02-06 17:47:58 +00:00
  • f753043ce0
         Fix if clause in activity_pub user_view href 2019-02-06 18:42:19 +01:00
  • 43b3f9e96e rids the duplicate timestamp from default ExSyslogger config Michael Loftis 2019-02-06 17:34:09 +00:00
  • f1b72bfb70 Split hide_networ only for local users Maxim Filippov 2019-02-06 13:41:31 +03:00
  • 3c08e20d68 Merge branch '2019-02-06-update-frontend' into 'develop' lambda 2019-02-06 09:47:36 +00:00
  • 78a51f4dd4 update frontend lain 2019-02-06 10:40:01 +01:00
  • 5b1d7c3c56 fix tests Egor Kislitsyn 2019-02-06 12:17:41 +07:00
  • 6f05f448f8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs Egor Kislitsyn 2019-02-06 11:33:00 +07:00
  • 035eaeb9b8 Allow to configure visibility for admin and moderator badges eugenijm 2019-02-04 15:28:35 +03:00
  • 398c81f9c8 Add is_admin and is_moderator boolean fields to the user view eugenijm 2019-02-04 05:03:57 +03:00
  • c46490b199 Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop' rinpatch 2019-02-05 21:01:20 +00:00
  • d83dbd9070 rich media: parser: reject any data which cannot be explicitly encoded into JSON William Pitcock 2019-02-05 20:50:57 +00:00
  • d120aa63f0 Merge branch 'fix-dm-index' into 'develop' kaniini 2019-02-05 20:27:31 +00:00
  • 681ba1e52f Merge branch 'feature/ap-c2s-whoami' into 'develop' kaniini 2019-02-05 20:26:31 +00:00
  • 00d572fd58 Merge branch 'testfix/twitter-api' into 'develop' kaniini 2019-02-05 20:13:38 +00:00
  • 73e6a1f1dd test: twitterapi: fix another possible test failure case William Pitcock 2019-02-05 20:04:39 +00:00
  • eb2b1960e0 Merge branch 'feature/split-hide-network-v2' into 'develop' kaniini 2019-02-05 18:56:59 +00:00
  • ecdb0b7f57 Merge branch 'bugfix/rich-media-image-nil' into 'develop' kaniini 2019-02-05 18:53:43 +00:00
  • c4d317ccb6 test: twitterapi: fix the test breakage for real William Pitcock 2019-02-05 18:49:02 +00:00
  • 1d94b67e40 mastodon api: fix rendering of cards without image URLs (closes #597) William Pitcock 2019-02-05 18:30:27 +00:00
  • f8b831ecfd Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop' lambda 2019-02-05 11:30:18 +00:00
  • 040ab352a5 Merge branch 'patch-2' into 'develop' lambda 2019-02-05 11:29:20 +00:00
  • 8892f4468c Merge branch 'bugfix/rich-media-nil' into 'develop' lambda 2019-02-05 11:28:48 +00:00
  • c48aba3c2a Fix SQL Maxim Filippov 2019-02-05 10:22:31 +03:00
  • 47eb557617 ARGLE GARBLE witches.live 2019-02-05 07:03:54 +00:00
  • a2bb5d890d html: don't attempt to parse nil content William Pitcock 2019-02-05 05:06:17 +00:00
  • e71ab5a10f activitypub: transmogrifier: fix bare tags William Pitcock 2019-02-05 00:32:49 +00:00
  • db1165f70f activitypub: c2s: add /api/ap/whoami endpoint for andstatus William Pitcock 2019-02-04 22:58:29 +00:00
  • f3c8b02d65 Massage index until it actually does the stuff we want. lain 2019-02-04 23:47:29 +01:00
  • cd6606b7f6 Initialize hide_network with false Maxim Filippov 2019-02-04 22:23:09 +03:00
  • 03991e7bc5 Merge branch 'feature/mrf-tag' into 'develop' Haelwenn 2019-02-04 19:20:11 +00:00
  • 7d110be119 activitypub: mrf: tag policy: fix force-unlisted and sandbox actions William Pitcock 2019-02-04 19:03:25 +00:00
  • 64a3993425 activitypub: mrf: tag policy: add support for subscription control William Pitcock 2019-02-04 17:48:48 +00:00
  • 14d967f515 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs Egor Kislitsyn 2019-02-05 00:38:05 +07:00
  • 3ae11835a9 Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop' rinpatch 2019-02-04 17:32:12 +00:00
  • 4031c94a59 fix hellthread threshold deprecation warning Karen Konou 2019-02-04 18:26:56 +01:00
  • ff2c28fd6d activitypub: mrf: tag policy: refactor the filtering hook a bit William Pitcock 2019-02-04 17:06:37 +00:00
  • 9a69f08e86 activitypub: mrf: tag policy: add support for processing follow requests William Pitcock 2019-02-04 17:03:34 +00:00
  • 084bb8ccd5 activitypub: mrf: tag policy: implement force-unlisted and sandbox William Pitcock 2019-02-04 15:55:20 +00:00
  • 88e32a32ce mrf: add initial MRF.TagPolicy engine William Pitcock 2019-02-04 02:35:46 +00:00
  • 93e136d70b mix: add user tag/untag task William Pitcock 2019-02-04 02:33:11 +00:00
  • 25a659d2dc Merge branch 'mime-riff' into 'develop' kaniini 2019-02-04 16:52:41 +00:00
  • 127f99ae18
         Mime: detect RIFF formats (wave, webp, avi) href 2019-02-04 17:44:41 +01:00
  • 00835bf678 Merge branch 'fix/rich-media-relative-path' into 'develop' rinpatch 2019-02-04 16:01:34 +00:00
  • 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs Egor Kislitsyn 2019-02-04 20:50:28 +07:00
  • 89762ad230 Merge branch 'feature/hellthread-filter-improvements' into 'develop' rinpatch 2019-02-04 12:36:50 +00:00
  • 58262a8b8a removed a debug thingy Karen Konou 2019-02-04 11:22:25 +00:00
  • 4430641349 squished a bug Karen Konou 2019-02-04 12:09:00 +01:00
  • 3cf046babb actually commited the changes Karen Konou 2019-02-04 10:23:43 +01:00
  • 63a4f4b7be fixed Map,put arguments, updated nomenclature Karen Konou 2019-02-04 10:23:07 +01:00
  • 583c4e0f17 more tweaks, fixed silly mistakes... Karen Konou 2019-02-03 23:56:20 +01:00
  • e10cda7541 implemented tweaks Karen Konou 2019-02-03 22:46:06 +01:00
  • c57f37bd36 Merge branch 'mogrify-orient' into 'develop' kaniini 2019-02-03 21:06:15 +00:00
  • 531507a635 fixed things Karen Konou 2019-02-03 20:45:32 +01:00
  • 10130fa7d6 made toggleable, added docs Karen Konou 2019-02-03 20:27:28 +01:00
  • 0ef0ae35ab added optional delist feature Karen Konou 2019-02-03 20:12:23 +01:00
  • 16ce129e38 Split hide_network into hide_followers & hide_followings (fixed) Maxim Filippov 2019-02-03 21:24:09 +03:00
  • 69a38644bc Merge branch '589-fix-cache' into 'develop' lambda 2019-02-03 18:19:40 +00:00
  • e61f0be951 Unbreak all the tests. lain 2019-02-03 18:54:39 +01:00
  • 505a084058 Still do caching in tests. lain 2019-02-03 18:28:14 +01:00
  • 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 +00:00
  • 8180de951e Merge branch '582_federation_retirement_optimization' into 'develop' kaniini 2019-02-03 15:47:55 +00:00
  • 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 +03:00
  • 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 +03:00
  • d5d91ae689 Merge branch 'fix/oauth-page-responsiveness' into 'develop' rinpatch 2019-02-02 10:48:35 +00:00
  • 2c59eb3cfc Add responsive features to layout Maxim Filippov 2019-02-02 13:38:52 +03:00
  • 68d461b3a9 Check if rich media uri is relative rinpatch 2019-02-02 12:24:24 +03:00