Commit graph

  • 9a98f48ec3 Remove incorrect statement about valid characters Mark Felder 2019-05-01 12:29:48 -0500
  • 8af55728e4 Fix tests Roman Chvanikov 2019-04-29 03:44:04 +0700
  • 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three lain 2019-05-01 18:40:41 +0200
  • d107919b3d Merge branch 'support/oauth' into 'develop' lambda 2019-05-01 13:28:04 +0000
  • c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator Maksim 2019-05-01 13:28:04 +0000
  • 622c804c9a Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop' rinpatch 2019-05-01 11:02:08 +0000
  • 51e26f14f7 Remove redundant ensure_scrubbed_html rinpatch 2019-05-01 13:52:44 +0300
  • a58813e7a1 Merge branch 'features/download-mastofe-build' into 'develop' lambda 2019-05-01 10:48:30 +0000
  • 0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop' lambda 2019-05-01 10:45:32 +0000
  • 297596ce48 Merge branch 'harmonize_return_types_in_user_module' into 'develop' lambda 2019-05-01 10:41:00 +0000
  • a7c9e3b242 Merge branch 'docs/fix-config.md' into 'develop' rinpatch 2019-05-01 09:16:25 +0000
  • 7c5f1ef327 Merge branch 'update_auto_linker' into 'develop' rinpatch 2019-05-01 09:14:10 +0000
  • a3dc02d282 Add addressable lists Egor Kislitsyn 2019-05-01 16:11:17 +0700
  • f11e7037c2 test fixes Alex S 2019-05-01 16:09:53 +0700
  • 04fd7cf817 Update auto_linker Egor Kislitsyn 2019-05-01 15:18:12 +0700
  • bdfa3a6fa8 Merging with develop Alex S 2019-05-01 12:29:33 +0700
  • 2982061dfa Fix syntax highlighting + clarify :frontend_configuration xse 2019-05-01 01:26:14 +0200
  • 85fa2fbce4 add scrubber for html special char Sachin Joshi 2019-05-01 01:37:17 +0545
  • cd6da3606b Merge branch 'develop' into bugfix/web-notification-special-char Sachin Joshi 2019-05-01 00:21:30 +0545
  • 77690b9d03 Merge branch 'fix/stream_out-normalize-only-creates' into 'develop' rinpatch 2019-04-30 17:31:48 +0000
  • ce4825c1dc Do not normalize objects in stream_out unless the activity type is Create rinpatch 2019-04-30 20:21:28 +0300
  • 0f0cc2703b Merge develop Roman Chvanikov 2019-04-30 20:17:52 +0700
  • 32a4501d2d Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop' rinpatch 2019-04-29 18:33:06 +0000
  • f8f6af4cc1 Fix MigrateOldBookmarks migration crashing on deleted activities rinpatch 2019-04-29 21:25:30 +0300
  • 41d78f9108 Merge branch 'fix-webpush' into 'develop' rinpatch 2019-04-29 16:24:33 +0000
  • b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality. lain 2019-04-29 18:15:30 +0200
  • fa632f9c37 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop Sadposter 2019-04-29 12:56:53 +0100
  • 4b521119dc Add compressed background Sadposter 2019-04-29 12:56:08 +0100
  • 0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop' rinpatch 2019-04-29 06:45:18 +0000
  • 8e266e02da Merge branch 'fix/uploads-folder-issues' into 'develop' kaniini 2019-04-28 23:05:50 +0000
  • 292c69481b Merge branch 'regression/rights-only-for-admin' into 'develop' kaniini 2019-04-28 23:05:14 +0000
  • 61ca2f7a4e Fix rights in TwitterAPI's user entity being present only for Admins/Moderators rinpatch 2019-04-28 19:42:43 +0300
  • 31852f906e fix issues with the uploads directory xse 2019-04-28 06:43:00 +0200
  • f2a4156d49 Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop' kaniini 2019-04-28 00:21:32 +0000
  • ce3789e39a Add default_scope to /api/v1/update_credentials rinpatch 2019-04-27 23:55:54 +0300
  • c3e9fcf098 Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL rinpatch 2019-04-27 23:06:46 +0300
  • 002ea343f8 Merge branch 'feature/bbcode' into 'develop' kaniini 2019-04-27 07:44:24 +0000
  • 81bc274930 Merge branch 'update/pleroma-fe-20190426' into 'develop' kaniini 2019-04-27 07:42:01 +0000
  • 52bdfced32 update pleroma frontend William Pitcock 2019-04-27 07:34:59 +0000
  • ef52aa0e66 tests: fix up for changed bbcode library output and verify html is properly escaped William Pitcock 2019-04-26 22:38:56 +0000
  • 501af917b5 add support for bbcode William Pitcock 2019-04-26 10:17:57 +0000
  • 2bd880be88 mix: add bbcode dependency William Pitcock 2019-04-26 09:22:26 +0000
  • 4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' lambda 2019-04-26 11:59:47 +0000
  • 48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop' kaniini 2019-04-26 02:41:35 +0000
  • fd45c74e6f Merge branch 'chore/update-changelog' into 'develop' kaniini 2019-04-25 23:35:13 +0000
  • 99b0792751 update Changelog William Pitcock 2019-04-25 23:27:38 +0000
  • 5b2791698c Merge branch 'feature/mediaproxy-whitelist' into 'develop' kaniini 2019-04-25 23:23:27 +0000
  • 24c3e2db2c Add mediaproxy whitelist capability Mark Felder 2019-04-25 18:11:47 -0500
  • 8c9227c1f1 Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop' Haelwenn 2019-04-25 09:47:42 +0000
  • dfc8425659 Move settings to Source subentity rinpatch 2019-04-25 09:14:35 +0300
  • a825056d4d test fixes Alex S 2019-04-25 14:09:57 +0700
  • 85953c0836 fixes for tests Alex S 2019-04-22 16:16:19 +0700
  • 229ce6abbc migration without using old field name Alex S 2019-04-22 12:45:45 +0700
  • 3c2ae80008 unused Alex S 2019-04-20 14:41:42 +0700
  • c157e27a00 Merge branch 'develop' into feature/disable-account Egor Kislitsyn 2019-04-25 13:41:10 +0700
  • 58711a79d0 removing useless transaction Alex S 2019-04-17 14:24:11 +0700
  • 6322c1e123 migration optimization Alex S 2019-04-15 11:43:02 +0700
  • 17b5b78737 changelog file update Alex S 2019-04-14 21:54:49 +0700
  • 1258128f4f favourites add bookmark display Alex S 2019-04-14 21:42:18 +0700
  • 324c9c8ab5 migrate user.bookmarks to separate table Alex S 2019-04-14 21:37:05 +0700
  • 73d01857e3 bookmarks in separate table Alex S 2019-04-14 19:45:56 +0700
  • 0fd0ffcd76 activitypub: transmogrifier: send reject follow if following does not succeed William Pitcock 2019-04-24 23:52:33 +0000
  • 4baea6e6d9 Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API rinpatch 2019-04-24 20:01:42 +0300
  • 963d5774af fix the status notification with special char Sachin Joshi 2019-04-24 07:06:17 +0545
  • 030a7876b4 Merge branch 'security/fix-html-class-scrubbing' into 'develop' kaniini 2019-04-23 23:07:56 +0000
  • f5535e5743 html: lock down allowed class attributes to only those related to microformats William Pitcock 2019-04-23 22:55:21 +0000
  • 3789945784 Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop' kaniini 2019-04-23 02:47:43 +0000
  • 9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) Sergey Suprunenko 2019-04-23 02:47:43 +0000
  • 10c40e13d2 Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' kaniini 2019-04-23 02:43:53 +0000
  • aa9d378985 Merge branch 'fix/normalize-activities' into 'develop' kaniini 2019-04-23 02:43:26 +0000
  • 7dcac0bac0 Merge branch 'develop' into 'develop' kaniini 2019-04-23 02:41:21 +0000
  • 414902cd9e Merge branch 'add-healthcheck-setting-to-config' into 'develop' kaniini 2019-04-22 18:31:01 +0000
  • 74ef14b04e Add :emoji settings to config.md ilja 2019-04-22 19:42:02 +0200
  • d35246c449 added healthcheck setting to instance config Alex S 2019-04-22 17:00:06 +0700
  • c876b04aeb Add shortcode_globs setting to documentation ilja 2019-04-22 11:17:53 +0200
  • f4c9b79306 Add a changelog entry for pleroma.in_reply_to_account_acct rinpatch 2019-04-22 12:02:41 +0300
  • f60d072bbb Add pleroma.in_reply_to_account_acct to MastoAPI status entity rinpatch 2019-04-22 11:53:37 +0300
  • d21d921def Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading rinpatch 2019-04-22 11:27:29 +0300
  • 20deff75f1 Merge branch 'fix/emoji-task-docs' into 'develop' rinpatch 2019-04-22 08:09:08 +0000
  • 952a4ae68e Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs rinpatch 2019-04-22 11:02:31 +0300
  • 0b6d1d920e Merge branch 'get-cached-everywhere' into 'develop' kaniini 2019-04-22 07:20:43 +0000
  • b9cdf6d3b9 Use User.get_cached* everywhere Egor 2019-04-22 07:20:43 +0000
  • 05862ded7a Merge branch 'feature/826-healthcheck-endpoint' into 'develop' kaniini 2019-04-22 07:19:53 +0000
  • 88f0be9693 Feature/826 healthcheck endpoint Alexander Strizhakov 2019-04-22 07:19:53 +0000
  • e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account Egor Kislitsyn 2019-04-22 13:08:30 +0700
  • 7fcbda702e Merge branch 'rework-emoji-management' into 'develop' kaniini 2019-04-22 02:07:19 +0000
  • 3cefdc62e0 Fix emoji.txt / custom_emoji.txt / shortcode_globs handling Ekaterina Vaartis 2019-04-21 22:46:55 +0300
  • 6c0e07b8bd Merge branch 'docs/posting_formatted' into 'develop' rinpatch 2019-04-21 19:57:52 +0000
  • ba19ba8a88 Formatting Ekaterina Vaartis 2019-04-21 22:33:54 +0300
  • 0d6265cfe2 Change the default manifest to pleroma's namespace Ekaterina Vaartis 2019-04-21 22:32:34 +0300
  • 153f5375a6 Replace MD5 with SHA256 for emoji pack verification Ekaterina Vaartis 2019-04-21 22:19:19 +0300
  • d5c0fd35e1 Wrap the docstrings to 70 characters Ekaterina Vaartis 2019-04-21 22:16:46 +0300
  • 4908e0eeee Fix Credo warning Roman Chvanikov 2019-04-21 23:24:33 +0700
  • eeb093631c Fix Credo warning Roman Chvanikov 2019-04-21 23:19:36 +0700
  • e56afefef9 Refactor conversation function in MastodonAPIController to use a View Roman Chvanikov 2019-04-21 23:14:27 +0700
  • 5300cd56e5 Merge branch '923_oauth_controller_refactoring_p2' into 'develop' lambda 2019-04-21 13:52:06 +0000
  • 2662bea4e0 Add accounts and last_status to conversation read response Roman Chvanikov 2019-04-21 20:26:13 +0700
  • b87ad13803 Move comments for email_notifications config to docs Roman Chvanikov 2019-04-21 19:36:31 +0700
  • d086319733
    differences_in_mastoapi_responses.md: content_type parameter of post submission Haelwenn (lanodan) Monnier 2019-04-21 12:48:40 +0200
  • f1d90ee942 Remove debug code Roman Chvanikov 2019-04-21 16:40:05 +0700