Commit Graph

  • 3d0d9e7a56
    Use string map for default mascot Sadposter 2019-05-20 13:10:04 +01:00
  • dc916ba15f
    Format mascot tests Sadposter 2019-05-20 12:58:17 +01:00
  • e81f0fc6d4
    Add mascot get/set tests Sadposter 2019-05-20 12:58:06 +01:00
  • 54e9cb5c2d
    Add API endpoints for a custom user mascot Sadposter 2019-05-20 12:39:23 +01:00
  • b30b51c3b7 Merge branch 'feature/mrf-simple-report-filtering' into 'develop' kaniini 2019-05-19 22:30:10 +00:00
  • 2375e9a95b Add report filtering to MRF.SimplePolicy Aaron Tinio 2019-05-20 06:02:50 +08:00
  • 6430cb1bf7 Restrict poll replies from fetch queries by default rinpatch 2019-05-19 17:44:18 +03:00
  • 1d90f9b969 Remove tags/mentions/rich text from poll options because Mastodon and add custom emoji rinpatch 2019-05-19 17:06:44 +03:00
  • 5ece901af3 Resolve merge conflicts and remove IO.inspects rinpatch 2019-05-18 13:37:38 +03:00
  • fd920c8973 Mastodon API: Add support for posting polls rinpatch 2019-05-18 13:29:28 +03:00
  • 8e9a764dfc Merge branch 'feature/mrf-always-nsfw' into 'develop' rinpatch 2019-05-18 07:13:18 +00:00
  • cd7a6a25d2 Merge branch 'feature/http-ua-header-always' into 'develop' Haelwenn 2019-05-18 04:42:11 +00:00
  • c4a55e167a add Changelog entry William Pitcock 2019-05-17 20:43:31 +00:00
  • dc08159538 also suppress link previews from posts marked #nsfw William Pitcock 2019-05-17 20:42:51 +00:00
  • c234ce546a add CHANGELOG entry William Pitcock 2019-05-17 20:31:39 +00:00
  • 290f5b2cfe config: make sending the user agent configurable, disable sending the user agent in tests William Pitcock 2019-05-17 20:28:58 +00:00
  • d3b8cd342f http: request builder: send user-agent when making requests William Pitcock 2019-05-17 19:03:19 +00:00
  • 0da1233e8e rich media: suppress link previews if post is marked as sensitive William Pitcock 2019-05-17 18:49:43 +00:00
  • 78588dbd80 mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw William Pitcock 2019-05-17 18:49:10 +00:00
  • 3b71612d3d Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3 Egor Kislitsyn 2019-05-18 01:17:14 +07:00
  • d2dacadb6b Merge branch 'rum-index' into 'develop' rinpatch 2019-05-17 16:35:19 +00:00
  • 075eecec90 Linting. lain 2019-05-17 18:32:30 +02:00
  • f959bf7aa6 MongooseIM: Add basic integration endpoints. lain 2019-05-17 18:21:11 +02:00
  • ef63cf7088 CI: Use the correct image with the correct hostname. lain 2019-05-17 15:21:29 +02:00
  • 8784a7d1b4 RUM: Set rum status by the environment. lain 2019-05-17 15:06:51 +02:00
  • 022e6e4b44 RUM: Remove vacuum analyze from migration lain 2019-05-17 14:59:01 +02:00
  • 557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists Egor Kislitsyn 2019-05-17 19:57:14 +07:00
  • f2936e0a07 Add ap_id to List Egor Kislitsyn 2019-05-17 19:56:37 +07:00
  • a3fc7294da CI: Add rum variant testing. lain 2019-05-17 12:47:38 +02:00
  • 412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index lain 2019-05-17 12:26:59 +02:00
  • e5b34f5e05 Merge branch 'ecto_sql_update' into 'develop' lambda 2019-05-17 10:21:38 +00:00
  • 0498fa244f Merge branch 'update-tzdata' into 'develop' lambda 2019-05-17 10:21:14 +00:00
  • 1dcdcd8871 Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop' lambda 2019-05-17 10:07:51 +00:00
  • 46684db84d Update account_view.ex lambda 2019-05-17 09:53:44 +00:00
  • 5743124c77 Dependencies: Update tzdata. lain 2019-05-17 11:51:50 +02:00
  • 249b31ffe5 Fix specs. lain 2019-05-17 11:49:13 +02:00
  • 67af50ec71 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update lain 2019-05-17 11:33:04 +02:00
  • e39c190f04 Configuration: disable migration lock. lain 2019-05-17 11:30:35 +02:00
  • 718b59a263 Dependencies: Update ecto sql once more. lain 2019-05-17 11:19:30 +02:00
  • 642a67dd44 Render polls in statuses rinpatch 2019-05-17 11:44:47 +03:00
  • 3e5301ad5c Merge branch 'fix/902-random-compile-failing' into 'develop' rinpatch 2019-05-17 07:25:20 +00:00
  • 7ed682213f Fix/902 random compile failing Alexander Strizhakov 2019-05-17 07:25:20 +00:00
  • 5c028b8f92 user creation admin api will create multiple users Sachin Joshi 2019-05-17 12:20:31 +05:45
  • 68c75a08e8
    MastoAPI account_view.ex: requested is false when following is true Haelwenn (lanodan) Monnier 2019-05-17 07:34:52 +02:00
  • 99f50bf3e8 Merge branch 'fix/mrf-tag-typo' into 'develop' kaniini 2019-05-17 01:20:04 +00:00
  • 443cd68a4c Add tests for MRF.SimplePolicy Aaron Tinio 2019-05-17 08:11:17 +08:00
  • 70235ce840 Fix typo: s/"tags"/"tag"/g Aaron Tinio 2019-05-17 09:02:04 +08:00
  • bf84d50c76 Merge branch 'feature/890-add-report-uri' into 'develop' kaniini 2019-05-16 20:11:12 +00:00
  • a328251a52 Merge branch 'feature/task-update-following' into 'develop' feld 2019-05-16 20:04:08 +00:00
  • 2c303afc8b Remove duplicated entries in users' following lists Sergey Suprunenko 2019-05-16 20:04:08 +00:00
  • 0f8892686a Merge branch 'feature/admin-api-reports' into 'develop' feld 2019-05-16 19:09:19 +00:00
  • e2b3a27204 Add Reports to Admin API Sergey Suprunenko 2019-05-16 19:09:18 +00:00
  • e190b3022b Merge branch 'fix/domain-unblocked-reblogs' into 'develop' feld 2019-05-16 18:57:14 +00:00
  • ad76307a82 Merge branch 'conversations-import' into 'develop' rinpatch 2019-05-16 18:32:42 +00:00
  • cd127d2fa4 Update CHANGELOG Mark Felder 2019-05-16 13:17:09 -05:00
  • efa61c1610 Move to pleroma.database mix task Mark Felder 2019-05-16 13:14:48 -05:00
  • ebb0482116 Merge branch 'develop' into conversations-import Mark Felder 2019-05-16 13:11:17 -05:00
  • fde30aee43 Merge branch 'feature/sql-thread-sat' into 'develop' lambda 2019-05-16 13:44:22 +00:00
  • 103f205097 Merge branch 'feature/896-toggling-confirmation' into 'develop' rinpatch 2019-05-16 13:23:42 +00:00
  • 73ae58fdfa Feature/896 toggling confirmation Alexander Strizhakov 2019-05-16 13:23:41 +00:00
  • fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists Egor Kislitsyn 2019-05-16 17:54:24 +07:00
  • 4711d8151c try this Alex S 2019-05-16 17:35:07 +07:00
  • 8355d0607e trailing spaces Alex S 2019-05-16 17:03:12 +07:00
  • 9d14214eb9 Merge branch 'develop' into feature/890-add-report-uri Alex S 2019-05-16 12:54:06 +07:00
  • aa11fa4864 add report uri and report to Alex S 2019-05-16 12:49:40 +07:00
  • a2771869a3 Merge branch 'docs/update_debian_instructions' into 'develop' kaniini 2019-05-16 05:03:37 +00:00
  • 2180136039 Merge branch 'chore/docs-update' into 'develop' kaniini 2019-05-16 05:02:50 +00:00
  • 3a96c29c65 Merge branch 'fix/slow-federation' into 'develop' kaniini 2019-05-16 04:50:15 +00:00
  • c31026423c publisher: use the correct queue name for outgoing federation William Pitcock 2019-05-16 04:41:27 +00:00
  • 107c83ab2b Note that nicknames is an array Angelina Filippova 2019-05-16 01:48:53 +03:00
  • 0641e685c1 Note that nicknames is an array Angelina Filippova 2019-05-16 01:46:43 +03:00
  • 1d2923e5d0 Update tag/untag docs Angelina Filippova 2019-05-16 01:36:26 +03:00
  • 0ae15c2306 Added package to dependency list PolymerWitch 2019-05-15 15:36:20 -07:00
  • 793f1834d2 Use named binding to conditionally join object Aaron Tinio 2019-05-16 06:25:14 +08:00
  • 2b6119dfbf Restrict reblogs of activities from blocked domains Aaron Tinio 2019-05-15 07:59:24 +08:00
  • 64495b96e9 Add test for blocked domains Aaron Tinio 2019-05-15 06:13:47 +08:00
  • 62e42b03ab Handle incoming Question objects rinpatch 2019-05-15 20:10:16 +03:00
  • f3971cbde3 thread visibility function: fix use of no longer used author variable William Pitcock 2019-05-15 17:02:40 +00:00
  • a591ab6112 activity pub: remove Ecto SQL query dumps William Pitcock 2019-05-15 16:56:46 +00:00
  • 71fa7eeb6f thread visibility function: significantly improve efficiency William Pitcock 2019-05-15 16:54:14 +00:00
  • f09c3afdf5 chase test failures William Pitcock 2019-05-15 16:23:01 +00:00
  • 12f45e2a89 update migration William Pitcock 2019-05-15 16:22:52 +00:00
  • 0aada88b55 bbs: chase timeline containment patch William Pitcock 2019-05-08 23:17:51 +00:00
  • 75ce6adcff migration: only care about Create activities William Pitcock 2019-03-25 02:56:13 +00:00
  • c7644313e7 test: update obsolete test William Pitcock 2019-03-25 01:23:15 +00:00
  • 31db31c587 activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread William Pitcock 2019-03-25 00:38:28 +00:00
  • de114ffbb0 activitypub: remove contain_timeline() William Pitcock 2019-03-25 00:10:20 +00:00
  • 0387f52138 activitypub: add restrict_thread_visibility() William Pitcock 2019-03-25 00:06:02 +00:00
  • 958b4cfde9 migrations: add function to see if a thread can be satisfied William Pitcock 2019-03-24 23:45:57 +00:00
  • f168a1cbdc Merge remote-tracking branch 'origin/develop' into conversations-import lain 2019-05-15 17:47:29 +02:00
  • 62516be9c4 Merge branch 'fix/public-option-not-working' into 'develop' kaniini 2019-05-15 15:42:21 +00:00
  • 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop' lambda 2019-05-15 15:37:31 +00:00
  • 4429c1b7da tests: fixup William Pitcock 2019-05-15 15:29:42 +00:00
  • 18f2d2024d Merge branch 'prevent-public-answers' into 'develop' kaniini 2019-05-15 15:26:07 +00:00
  • 0992094bd6 Merge branch 'cleanup' into 'develop' lambda 2019-05-15 15:23:13 +00:00
  • 3456f643a8 Merge branch 'ci/coverage' into 'develop' lambda 2019-05-15 15:19:20 +00:00
  • f831acf912 Excoveralls for code coverage feld 2019-05-15 15:19:20 +00:00
  • 88cc423fa3 Dependencies: Update Ecto SQL. lain 2019-05-15 16:45:26 +02:00
  • 7a92e701b9 CommonAPI: Visibility refactor. lain 2019-05-15 16:35:33 +02:00
  • cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies. lain 2019-05-15 16:30:08 +02:00