Commit graph

  • 6a42641b8d Add pack.toml loading Ekaterina Vaartis 2019-08-10 21:46:36 +0300
  • ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop' feld 2019-09-18 21:13:15 +0000
  • 25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop' feld 2019-09-18 21:11:37 +0000
  • 220afadc55 Merge branch 'restore-tests' into 'develop' feld 2019-09-18 21:05:18 +0000
  • 76a1019f41 Merge branch 'chore/refetch-poll-changelog-update' into 'develop' rinpatch 2019-09-18 21:00:51 +0000
  • 56286447ee Merge branch 'fix/test-upload-cleanup' into 'develop' Haelwenn 2019-09-18 21:00:09 +0000
  • a22b87b30c Add a changelog entry for poll refetching rinpatch 2019-09-19 00:00:05 +0300
  • e32d099a3a Merge branch 'feature/poll-refresh' into 'develop' Haelwenn 2019-09-18 20:58:53 +0000
  • a12aeb09c4 Cleanup uploads after the tests are finished rinpatch 2019-09-18 23:34:13 +0300
  • 5028b7b578 Fix credo issues rinpatch 2019-09-18 22:09:03 +0300
  • fe33084ea8 Update AdminFE for 1.1 branch Mark Felder 2019-09-18 13:52:11 -0500
  • c096dd86e5 Do not refetch local objects rinpatch 2019-09-18 19:59:23 +0300
  • eb87a86b5b Preserve internal fields when reinjecting rinpatch 2019-09-18 19:53:51 +0300
  • d32894ae51 Move object internal fields to a constant rinpatch 2019-09-18 19:24:20 +0300
  • e3f902b3a1 Set updated_at even if the object stayed the same rinpatch 2019-09-18 19:07:25 +0300
  • a9c700ff15 Fix wrong argument order when calling NaiveDateTime.diff rinpatch 2019-09-18 18:52:33 +0300
  • 84a40f6f26 Capture log in object refetch tests rinpatch 2019-09-18 18:31:24 +0300
  • 5c78131ee2 Merge branch 'bugfix/docs-formatting' into 'develop' Haelwenn 2019-09-18 15:31:03 +0000
  • 7ef575d11e Initial poll refresh support rinpatch 2019-09-18 18:13:21 +0300
  • 384b7dd40d Fix response Maxim Filippov 2019-09-18 18:06:49 +0300
  • f89728ad95 Merge branch 'develop' into feature/return-link-for-password-reset Maxim Filippov 2019-09-18 16:44:11 +0300
  • e4f3d7f69d Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex Ivan Tashkinov 2019-09-18 10:31:10 +0000
  • 847c7f02f5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-09-18 12:32:02 +0300
  • 551f2fa59e [#1234] Added changelog entry, removed admin OAuth scopes. Ivan Tashkinov 2019-09-18 12:31:33 +0300
  • c98e761d28 Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions Ivan Tashkinov 2019-09-18 12:06:38 +0300
  • 9f28249dfb [#1260] Added changelog entry. Ivan Tashkinov 2019-09-18 12:06:12 +0300
  • a18f1e7cd7 namings Alex S 2019-09-13 08:07:29 +0300
  • 17ff63b3c3 docs fix Alex S 2019-09-07 08:56:22 +0300
  • 2263c8b6b9 little fixes Alex S 2019-09-06 17:20:44 +0300
  • 4faf2b1555 post for creating invite tokens in admin api Alex S 2019-09-06 17:14:31 +0300
  • 40c968626d Merge branch 'chore/changelog-separate-1.1' into 'develop' Haelwenn 2019-09-17 21:30:58 +0000
  • ea6d4137da Apply suggestion to CHANGELOG.md rinpatch 2019-09-17 21:24:21 +0000
  • e501c822c9
    markdown.ex: put two-spaces before the description-newline Haelwenn (lanodan) Monnier 2019-09-17 23:02:24 +0200
  • 4785596a2c
    markdown.ex: end suggestions list with a newline Haelwenn (lanodan) Monnier 2019-09-17 22:55:29 +0200
  • d2097fd0f5
    markdown.ex: \n\n on >1 suggestions, 2-spaces on one Haelwenn (lanodan) Monnier 2019-09-17 22:33:32 +0200
  • d6182a3c8f
    markdown.ex: Make suggestion(s) plural only if on >1 Haelwenn (lanodan) Monnier 2019-09-17 22:22:54 +0200
  • 32d64102cb
    description.exs: uncomment type for email logo Haelwenn (lanodan) Monnier 2019-09-17 22:19:30 +0200
  • c0c5628200
    description.exs: remove empty strings on descriptions Haelwenn (lanodan) Monnier 2019-09-17 22:14:56 +0200
  • 106afaed58
    markdown.ex: do not fail if there is no children Haelwenn (lanodan) Monnier 2019-09-17 22:04:21 +0200
  • e0d8c8897e
    docs/markdown.ex: do no print empty suggestions Haelwenn (lanodan) Monnier 2019-09-17 22:00:02 +0200
  • 50ec445b2c
    description.exs: remove empty strings and arrays Haelwenn (lanodan) Monnier 2019-09-17 21:57:13 +0200
  • bf8567996c Sync develop changelog with master and create a new section for post-1.1 changes rinpatch 2019-09-17 23:48:26 +0300
  • b17f217bf3 [#1234] Addressed code analysis issue. Ivan Tashkinov 2019-09-17 23:31:05 +0300
  • b4d775161c [#1234] Undone reordering-related changes in router.ex. Ivan Tashkinov 2019-09-17 23:24:55 +0300
  • f758e663b2 Merge branch 'feature/bump-elixir-verstion' into 'develop' rinpatch 2019-09-17 20:09:26 +0000
  • f9dd121ad3 Admin API: Return link alongside with token on password reset Maxim Filippov 2019-09-17 23:09:08 +0300
  • e686f9be81 Apply suggestion to CHANGELOG.md Maxim Filippov 2019-09-17 20:04:57 +0000
  • 01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-09-17 22:53:26 +0300
  • 2ab7aeb3ab Merge branch 'cherry-pick-764931fc' into 'maint/1.1' rinpatch 2019-09-17 19:49:10 +0000
  • 7f211a48e0
    docs/markdown.ex: child header as "- key (type): description" Haelwenn (lanodan) Monnier 2019-09-17 21:43:27 +0200
  • 35dcea3e13
    Remove [true,false] for booleans, it is implicit Haelwenn (lanodan) Monnier 2019-09-13 17:05:19 +0200
  • f339ec3939 Merge branch 'deps/update-tesla' into 'develop' feld 2019-09-17 19:37:29 +0000
  • 764931fc9f Merge branch 'deps/update-tesla' into 'develop' feld 2019-09-17 19:37:29 +0000
  • 228bfd8a70 Bump elixir version to ~> 1.8 Maxim Filippov 2019-09-17 22:36:42 +0300
  • 0447c42715 Merge branch 'develop' into issue/733 Maksim Pechnikov 2019-09-17 22:20:39 +0300
  • 76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests. Ivan Tashkinov 2019-09-17 22:19:39 +0300
  • 79376abae3 Merge branch 'support/package_versions' into 'develop' rinpatch 2019-09-17 19:12:24 +0000
  • ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop' rinpatch 2019-09-17 19:09:56 +0000
  • d201eec45c fixed ecto version Maksim Pechnikov 2019-09-17 22:02:37 +0300
  • 8d812c28a7 Update Tesla to 1.3 rinpatch 2019-09-17 21:51:50 +0300
  • 7dd51652f9 Merge branch 'develop' into issue/733 Maksim Pechnikov 2019-09-17 21:20:08 +0300
  • 7318095657 Merge branch 'fix-notification-warnings' into 'develop' rinpatch 2019-09-17 18:12:27 +0000
  • 6193157f19 Fix notification warnings Steven Fuchs 2019-09-17 18:12:27 +0000
  • 2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop' Haelwenn 2019-09-17 17:16:39 +0000
  • 95a4a19417 Merge branch 'support/tests' into 'develop' rinpatch 2019-09-17 14:47:26 +0000
  • 1fc8fabecf Merge branch 'eliminate-test-errors' into 'develop' rinpatch 2019-09-17 14:44:52 +0000
  • 80c5c3495b remove remaining errors from tests Steven Fuchs 2019-09-17 14:44:52 +0000
  • 9fa2586abd Refactor SubscriptionNotificationView Roman Chvanikov 2019-09-17 17:44:10 +0300
  • c3de75b2a1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-09-17 14:58:02 +0100
  • bb6d172e74 Merge branch 'deps/update-oban' into 'develop' rinpatch 2019-09-17 13:55:01 +0000
  • e9f69a3eb7 Move pleroma_api controllers into controllers sub-folders Roman Chvanikov 2019-09-17 16:52:23 +0300
  • 7d1773bc6b Rename SubscriptionNotificationController list and get actions to index and show Roman Chvanikov 2019-09-17 16:48:24 +0300
  • a76168e743 Cleanup PleromaAPIController Roman Chvanikov 2019-09-17 16:44:41 +0300
  • 015597c2ab Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs Roman Chvanikov 2019-09-17 13:43:15 +0000
  • a81f80233d Apply suggestion to lib/pleroma/web/router.ex Roman Chvanikov 2019-09-17 13:43:10 +0000
  • f9be517c7f Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex Roman Chvanikov 2019-09-17 13:42:40 +0000
  • c0f776faec Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex Roman Chvanikov 2019-09-17 13:42:36 +0000
  • 2688b876ab Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex Roman Chvanikov 2019-09-17 13:42:28 +0000
  • e7afb67c5c [#1260] Rate-limiting for create authentication and related requests. Ivan Tashkinov 2019-09-17 16:16:11 +0300
  • 450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count) eugenijm 2019-09-13 17:37:30 +0300
  • a21584556f Update oban to 0.8.1 rinpatch 2019-09-17 13:04:43 +0300
  • 6042e21b25 Move subscription notifications to a separate controller Roman Chvanikov 2019-09-16 21:59:49 +0300
  • 56b60798c2 Code style fixes Roman Chvanikov 2019-09-16 20:50:14 +0300
  • 76c3e290fc Merge develop Roman Chvanikov 2019-09-16 20:30:42 +0300
  • df15ed13d1 Merge branch 'develop' into feature/moderation-log-filters Maxim Filippov 2019-09-16 19:44:06 +0300
  • a58f29b826 Merge branch 'update-fields-limit' into 'develop' Haelwenn 2019-09-16 15:11:05 +0000
  • d6ab78e610 Set account_field_value_length limit to 2048 by default Egor Kislitsyn 2019-09-16 21:48:01 +0700
  • 085d014f08 Fix Transmogrifier.upgrade_user_from_ap_id/1 Egor Kislitsyn 2019-09-16 19:26:00 +0700
  • 219dca1b00 Merge branch 'develop' into feature/return-total-for-reports Maxim Filippov 2019-09-16 14:40:17 +0300
  • 4714b739a7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-09-16 12:14:48 +0100
  • 63782e770b add stickers sadposter 2019-09-16 12:14:42 +0100
  • 409e701ab8 Merge branch 'fix/develop' into 'develop' rinpatch 2019-09-16 10:59:44 +0000
  • 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'" Egor Kislitsyn 2019-09-16 17:03:37 +0700
  • 4397a3fe4a Merge branch 'fix/signed-fetch-inclusion-test' into 'develop' rinpatch 2019-09-16 10:34:03 +0000
  • e8120944d8 Fix signed fetch inclusion publisher test rinpatch 2019-09-16 13:23:06 +0300
  • fe7fd33126 Merge branch 'revert-4fabf83a' into 'develop' kaniini 2019-09-16 09:09:32 +0000
  • c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'" kaniini 2019-09-16 09:09:21 +0000
  • 4fabf83ad0 Merge branch 'streamer-refactoring' into 'develop' kaniini 2019-09-16 07:44:03 +0000
  • aab264db82 Streamer refactoring Steven Fuchs 2019-09-16 07:44:03 +0000
  • 17142a3720 Merge branch 'feature/delivery-tracking' into 'develop' kaniini 2019-09-16 07:39:58 +0000