Commit Graph

  • 85953c0836 fixes for tests Alex S 2019-04-22 16:16:19 +07:00
  • 229ce6abbc migration without using old field name Alex S 2019-04-22 12:45:45 +07:00
  • 3c2ae80008 unused Alex S 2019-04-20 14:41:42 +07:00
  • c157e27a00 Merge branch 'develop' into feature/disable-account Egor Kislitsyn 2019-04-25 13:41:10 +07:00
  • 58711a79d0 removing useless transaction Alex S 2019-04-17 14:24:11 +07:00
  • 6322c1e123 migration optimization Alex S 2019-04-15 11:43:02 +07:00
  • 17b5b78737 changelog file update Alex S 2019-04-14 21:54:49 +07:00
  • 1258128f4f favourites add bookmark display Alex S 2019-04-14 21:42:18 +07:00
  • 324c9c8ab5 migrate user.bookmarks to separate table Alex S 2019-04-14 21:37:05 +07:00
  • 73d01857e3 bookmarks in separate table Alex S 2019-04-14 19:45:56 +07:00
  • 0fd0ffcd76 activitypub: transmogrifier: send reject follow if following does not succeed William Pitcock 2019-04-24 23:52:33 +00:00
  • 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 +03:00
  • 963d5774af fix the status notification with special char Sachin Joshi 2019-04-24 07:06:17 +05:45
  • 030a7876b4 Merge branch 'security/fix-html-class-scrubbing' into 'develop' kaniini 2019-04-23 23:07:56 +00:00
  • f5535e5743 html: lock down allowed class attributes to only those related to microformats William Pitcock 2019-04-23 22:55:21 +00:00
  • 3789945784 Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop' kaniini 2019-04-23 02:47:43 +00:00
  • 9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) Sergey Suprunenko 2019-04-23 02:47:43 +00:00
  • 10c40e13d2 Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' kaniini 2019-04-23 02:43:53 +00:00
  • aa9d378985 Merge branch 'fix/normalize-activities' into 'develop' kaniini 2019-04-23 02:43:26 +00:00
  • 7dcac0bac0 Merge branch 'develop' into 'develop' kaniini 2019-04-23 02:41:21 +00:00
  • 414902cd9e Merge branch 'add-healthcheck-setting-to-config' into 'develop' kaniini 2019-04-22 18:31:01 +00:00
  • 74ef14b04e Add :emoji settings to config.md ilja 2019-04-22 19:42:02 +02:00
  • d35246c449 added healthcheck setting to instance config Alex S 2019-04-22 17:00:06 +07:00
  • c876b04aeb Add shortcode_globs setting to documentation ilja 2019-04-22 11:17:53 +02:00
  • f4c9b79306 Add a changelog entry for pleroma.in_reply_to_account_acct rinpatch 2019-04-22 12:02:41 +03:00
  • f60d072bbb Add pleroma.in_reply_to_account_acct to MastoAPI status entity rinpatch 2019-04-22 11:53:37 +03:00
  • d21d921def Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading rinpatch 2019-04-22 11:27:29 +03:00
  • 20deff75f1 Merge branch 'fix/emoji-task-docs' into 'develop' rinpatch 2019-04-22 08:09:08 +00:00
  • 952a4ae68e Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs rinpatch 2019-04-22 11:02:31 +03:00
  • 0b6d1d920e Merge branch 'get-cached-everywhere' into 'develop' kaniini 2019-04-22 07:20:43 +00:00
  • b9cdf6d3b9 Use User.get_cached* everywhere Egor 2019-04-22 07:20:43 +00:00
  • 05862ded7a Merge branch 'feature/826-healthcheck-endpoint' into 'develop' kaniini 2019-04-22 07:19:53 +00:00
  • 88f0be9693 Feature/826 healthcheck endpoint Alexander Strizhakov 2019-04-22 07:19:53 +00:00
  • e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account Egor Kislitsyn 2019-04-22 13:08:30 +07:00
  • 7fcbda702e Merge branch 'rework-emoji-management' into 'develop' kaniini 2019-04-22 02:07:19 +00:00
  • 3cefdc62e0 Fix emoji.txt / custom_emoji.txt / shortcode_globs handling Ekaterina Vaartis 2019-04-21 22:46:55 +03:00
  • 6c0e07b8bd Merge branch 'docs/posting_formatted' into 'develop' rinpatch 2019-04-21 19:57:52 +00:00
  • ba19ba8a88 Formatting Ekaterina Vaartis 2019-04-21 22:33:54 +03:00
  • 0d6265cfe2 Change the default manifest to pleroma's namespace Ekaterina Vaartis 2019-04-21 22:32:34 +03:00
  • 153f5375a6 Replace MD5 with SHA256 for emoji pack verification Ekaterina Vaartis 2019-04-21 22:19:19 +03:00
  • d5c0fd35e1 Wrap the docstrings to 70 characters Ekaterina Vaartis 2019-04-21 22:16:46 +03:00
  • 4908e0eeee Fix Credo warning Roman Chvanikov 2019-04-21 23:24:33 +07:00
  • eeb093631c Fix Credo warning Roman Chvanikov 2019-04-21 23:19:36 +07:00
  • e56afefef9 Refactor conversation function in MastodonAPIController to use a View Roman Chvanikov 2019-04-21 23:14:27 +07:00
  • 5300cd56e5 Merge branch '923_oauth_controller_refactoring_p2' into 'develop' lambda 2019-04-21 13:52:06 +00:00
  • 2662bea4e0 Add accounts and last_status to conversation read response Roman Chvanikov 2019-04-21 20:26:13 +07:00
  • b87ad13803 Move comments for email_notifications config to docs Roman Chvanikov 2019-04-21 19:36:31 +07:00
  • d086319733
    differences_in_mastoapi_responses.md: content_type parameter of post submission Haelwenn (lanodan) Monnier 2019-04-21 12:48:40 +02:00
  • f1d90ee942 Remove debug code Roman Chvanikov 2019-04-21 16:40:05 +07:00
  • 2359ee38b3 Set digest emails to false by default Roman Chvanikov 2019-04-21 16:36:25 +07:00
  • 9256d2d4b4 [#923] Refactored OAuthController#authorize definitions, added test. Ivan Tashkinov 2019-04-21 10:51:32 +03:00
  • ad157f16b2 Merge branch 'fix/mastoapi-status-view' into 'develop' kaniini 2019-04-21 04:22:56 +00:00
  • 375fd21055 Set correct values in the MastoAPI reblog status view eugenijm 2019-04-15 20:32:14 +03:00
  • 2d54fdcdfe Merge branch 'fix/follow-with-reblogs' into 'develop' kaniini 2019-04-21 00:41:16 +00:00
  • e48848dad0 Merge branch 'patch-1' into 'develop' kaniini 2019-04-21 00:40:29 +00:00
  • 25fa10499a Mention Mastodon 2.8+ follow import fix in changelog Francis Dinh 2019-04-20 18:28:08 +00:00
  • 24073f829f Refactor query to return only 1 message instead of 20 Roman Chvanikov 2019-04-21 00:40:41 +07:00
  • 724311e151 Fix Credo warnings Roman Chvanikov 2019-04-20 19:57:43 +07:00
  • 60f213bb1a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email Roman Chvanikov 2019-04-20 19:43:06 +07:00
  • 05cdb2f238 Do not track coverage files Roman Chvanikov 2019-04-20 19:42:50 +07:00
  • 64a2c6a041 Digest emails Roman Chvanikov 2019-04-20 19:42:19 +07:00
  • 8f93d4c423 Remove most finmoji mentions where appropriate Ekaterina Vaartis 2019-04-20 15:34:45 +03:00
  • 1f3ddb031c Add the emoji packs & finmoji removal to the changelog Ekaterina Vaartis 2019-04-20 15:17:21 +03:00
  • 53a3e61016 Fix priv/static/instance/static to be just instance/static Ekaterina Vaartis 2019-04-20 15:06:56 +03:00
  • 31cff7dbca Document the pleroma.emoji task Ekaterina Vaartis 2019-04-20 10:57:31 +03:00
  • 1e311d6662 Add a newline at the end of pack in ls-packs Ekaterina Vaartis 2019-04-20 00:22:11 +03:00
  • aef3a3ca46 Fix tests that used finmoji Ekaterina Vaartis 2019-04-18 22:04:37 +03:00
  • 52ed287e87 Fix incorrect multiple emoji tag handling introduced in initial impl Ekaterina Vaartis 2019-04-18 21:17:52 +03:00
  • 9bd5e2dec9 Make emoji default_manifest a config option Ekaterina Vaartis 2019-04-18 20:48:57 +03:00
  • 98d4b3de53 Treat the manifest path as a file if it doesn't start with http Ekaterina Vaartis 2019-04-18 20:06:59 +03:00
  • aaaa428512 mix format Ekaterina Vaartis 2019-04-18 18:09:43 +03:00
  • a141f0807b Assume packs without emoji.txt only have emoji pictures, unhardcode Ekaterina Vaartis 2019-04-18 18:04:02 +03:00
  • eff725c3af Add a task to generate emoji packs Ekaterina Vaartis 2019-04-18 17:02:22 +03:00
  • 1e44b5478d Remove useless comment Ekaterina Vaartis 2019-04-18 15:57:41 +03:00
  • c5b7286b5f Move helper functions of emoji manager task down in the file Ekaterina Vaartis 2019-04-18 15:47:49 +03:00
  • 06db3ee1a8 Add MD5 verification for emoji pack source Ekaterina Vaartis 2019-04-18 15:46:07 +03:00
  • af5494f942 Separate emoji pack file lists in a different file Ekaterina Vaartis 2019-04-18 15:32:18 +03:00
  • 21b39c54a3 Allow using a custom manfest and getting multiple packs at once Ekaterina Vaartis 2019-04-18 10:57:20 +03:00
  • c26724cc55 Remove finmoji and add a way to download emojis in packs Ekaterina Vaartis 2019-04-17 23:54:09 +03:00
  • 6ca82c18a7 Merge branch 'patch-2' into 'develop' Haelwenn 2019-04-20 07:11:06 +00:00
  • 8166cefa21 Include explicit warning for emerge config line as it will vary more widely based on current version of postgres witches.live 2019-04-20 07:11:06 +00:00
  • fa48532387 Handle reblogs on the first follow request in MastoAPI eugenijm 2019-04-19 08:35:05 +03:00
  • 9da8b287f8 Merge branch 'feature/database-compaction' into 'develop' kaniini 2019-04-19 16:55:33 +00:00
  • 73407f4eea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email Roman Chvanikov 2019-04-19 23:27:13 +07:00
  • bc7862106d Fix tests Roman Chvanikov 2019-04-19 23:26:41 +07:00
  • 8add119444 Add User.list_inactive_users_query/1 Roman Chvanikov 2019-04-19 22:17:54 +07:00
  • aeafa0b2ef Add Notification.for_user_since/2 Roman Chvanikov 2019-04-19 22:16:17 +07:00
  • cc93775ebf Merge branch 'feature/805-server-rendered-rel-me-links' into 'develop' lambda 2019-04-19 07:50:21 +00:00
  • ada384207b typo fix Alexander Strizhakov 2019-04-19 07:50:21 +00:00
  • 218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' lambda 2019-04-19 07:49:26 +00:00
  • f9865cf943 Stream out deletes, mistakingly removed when resolving merge conflicts rinpatch 2019-04-19 00:47:02 +03:00
  • 17d94ae267 Add a changelog entry for removing embded objects mix task rinpatch 2019-04-19 00:26:46 +03:00
  • 73b8c5387b Add some logging rinpatch 2019-04-19 00:17:37 +03:00
  • 945325013a remove query timeouts rinpatch 2019-04-18 23:58:59 +03:00
  • 099f89367e Replace embedded object migration with a mix task rinpatch 2019-04-18 23:34:01 +03:00
  • 9238dccac1 Add a guard to fetching reply activity rinpatch 2019-04-18 21:40:40 +03:00
  • eba3db0966 Merge branch 'bugfix/filter-boosted-blocks' into 'develop' Haelwenn 2019-04-18 18:29:57 +00:00
  • ad3270c241 Merge branch 'fix/mastoapi-search-unauth' into 'develop' kaniini 2019-04-18 18:21:28 +00:00
  • 1aa4994f6d Do not require authentication for user search in MastoAPI Mark Felder 2019-04-18 12:44:25 -05:00
  • 4ef237f26a Fix my incorrect search test fix rinpatch 2019-04-18 14:37:57 +03:00