Commit graph

  • e76115989a Move config templates to priv so they can be found in releases rinpatch 2019-06-21 19:30:25 +0300
  • 259ffe0062 Fixed branch name substitutions for mix version (to comply to SemVer format). Ivan Tashkinov 2019-06-21 17:19:29 +0300
  • b6af80f769 Revert "Merge branch 'fix/ogp-title' into 'develop'" feld 2019-06-21 11:36:32 +0000
  • fc6e661672 Fix rate limiter tests Egor Kislitsyn 2019-06-21 16:47:16 +0700
  • 89fead9250 Default DB configuration to false and set the default database name to pleroma instead of pleroma_dev rinpatch 2019-06-21 06:42:04 +0300
  • d55358f370 Merge branch 'develop' into release-docs rinpatch 2019-06-21 06:41:13 +0300
  • 4bec121798 Do not set ownership group in chown commands rinpatch 2019-06-21 06:39:03 +0300
  • e824025c52 Remove a useless echo rinpatch 2019-06-21 06:37:38 +0300
  • 16e9304cec Change to long adduser options because the short ones only work on busybox rinpatch 2019-06-21 06:32:34 +0300
  • 4669a56aa3 Add notes on RUM indexes rinpatch 2019-06-21 06:22:34 +0300
  • f9515a3611 Add a note about RUM indexes package on Debian/Ubuntu rinpatch 2019-06-21 06:14:02 +0300
  • d3d98beaad Correct package names for Debian rinpatch 2019-06-21 06:04:39 +0300
  • 267f6bedd8 Formatting rinpatch 2019-06-21 05:57:46 +0300
  • dd23888774 OTP release install guide sceleton rinpatch 2019-06-21 05:48:13 +0300
  • 7e35bdbd3c Copy the nginx config to the release directory rinpatch 2019-06-21 05:46:47 +0300
  • ddf5e6254a Fix nginx webroot method config rinpatch 2019-06-21 05:46:21 +0300
  • 2437f51284 Merge branch 'fix/config-gen-releases' into 'develop' rinpatch 2019-06-20 21:25:34 +0000
  • 3b48876cf0 Merge branch 'fix/dynamic-configuration' into 'develop' lain 2019-06-20 17:43:57 +0000
  • 32320c1ee9 Fixes for dynamic configuration Alexander Strizhakov 2019-06-20 17:43:57 +0000
  • e3e8a7dc0e Disable rpc for instance gen rinpatch 2019-06-20 18:27:17 +0300
  • f07003e218 Fixed mix version computed for underscore-containing branches to be of SemVer format. Ivan Tashkinov 2019-06-20 17:54:16 +0300
  • 45c67550f5 Merge branch 'develop' into fix/config-gen-releases rinpatch 2019-06-20 11:51:16 +0300
  • ba584364e9 Merge branch 'feature/release-update-script' into 'develop' rinpatch 2019-06-20 08:50:26 +0000
  • 0e31d195af Apply suggestion to rel/files/bin/pleroma_ctl rinpatch 2019-06-20 08:12:56 +0000
  • 4974988f03 Export PLEROMA_BUILD_BRANCH rinpatch 2019-06-20 11:02:05 +0300
  • 630ac6a921 docs: better description for mrf anti link spam William Pitcock 2019-06-20 03:01:03 +0000
  • 69070e641d Allow setting upload/static directories in the config generator rinpatch 2019-06-20 03:59:16 +0300
  • 144e2e3e0b Remove deprecated dedupe_media from the config template rinpatch 2019-06-20 03:40:00 +0300
  • fe3a830b80 Remove a useless binding from config template call rinpatch 2019-06-20 02:34:19 +0300
  • f8c64dd4c0 Release Tasks: Ensure the application is loaded before getting the modules rinpatch 2019-06-20 02:20:20 +0300
  • 8c7a382027 Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions instead of aliasing rinpatch 2019-06-20 02:05:19 +0300
  • 524a66806d Merge branch 'user_sign_out_mix_task' into 'develop' rinpatch 2019-06-19 19:51:38 +0000
  • 363618207c Apply suggestion to lib/mix/tasks/pleroma/user.ex Ivan Tashkinov 2019-06-19 19:39:53 +0000
  • 71fb75b7ef User sign out mix task. Ivan Tashkinov 2019-06-19 22:29:36 +0300
  • 21dacd4b15 unbreak polls William Pitcock 2019-06-19 16:33:49 +0000
  • 736d8ad6be implement anti link spam MRF William Pitcock 2019-06-19 15:57:44 +0000
  • 6f380ee337 merge sadposter 2019-06-19 14:20:26 +0100
  • 2571e07fba pleroma_ctl: Rename arch to flavour because it also includes the libc rinpatch 2019-06-19 14:59:12 +0300
  • 66f2cdcdb0 pleroma_ctl: add an update command rinpatch 2019-06-19 14:53:16 +0300
  • a6e3169cfc Make possible to override the branch name via a env variable rinpatch 2019-06-19 14:40:39 +0300
  • cb4fcc740c Merge branch 'logger-level-for-migration-tasks' into 'develop' rinpatch 2019-06-19 10:33:33 +0000
  • e4fa6b99ac aliases for mix tasks Alexander Strizhakov 2019-06-19 10:33:33 +0000
  • df2dab69a7 Merge branch 'begone-the-dot-hack' into 'develop' rinpatch 2019-06-19 10:22:23 +0000
  • 5c6c4ce634 Merge branch 'fix/rich-media-hashtags-again' into 'develop' lain 2019-06-19 08:48:41 +0000
  • 90e47d4357 Merge branch 'update-frontend-c4fcdc71' into 'develop' lain 2019-06-19 08:37:34 +0000
  • a0a1361888 Refactor pleroma_ctl copying to a generic function for copying files into the release dir rinpatch 2019-06-19 03:51:59 +0300
  • 035368d363 Rich Media: Skip Microformats hashtags rinpatch 2019-06-19 00:31:30 +0300
  • 431a41b459 Update bundled pleroma-fe to c4fcdc71 rinpatch 2019-06-19 00:04:00 +0300
  • 966317e052 Merge branch 'deps/update-auto-linker' into 'develop' lain 2019-06-18 20:47:36 +0000
  • a392ad52ad Merge branch 'fix/mastoapi-sanitize-display-name' into 'develop' lain 2019-06-18 20:47:07 +0000
  • 64bc7ac619 Minor edit (comment). Ivan Tashkinov 2019-06-18 17:15:26 +0300
  • 9f45f93949 Added more redirect_uri checks to prevent redirect to not explicitly listed URI. Ivan Tashkinov 2019-06-18 17:00:49 +0300
  • f30a3241d2 Deps: Update auto_linker rinpatch 2019-06-18 16:08:18 +0300
  • c7acca2abb Mastodon API: Sanitize display names rinpatch 2019-06-18 14:09:15 +0300
  • c4e4f7d0e4 Add proper error handling for when the post exceeds character limits rinpatch 2019-06-18 05:05:05 +0300
  • dce27de733 Mastodon API: Remove the dot hack rinpatch 2019-06-18 05:04:41 +0300
  • 3d76420512 Merge branch 'feature/pleroma-ctl-rpc' into 'develop' Haelwenn 2019-06-18 01:57:32 +0000
  • 448d739b25 pleroma_ctl: Run mix tasks using rpc instead of eval rinpatch 2019-06-18 00:17:47 +0300
  • 49a49d3763 Merge branch 'removing-test-errors' into 'develop' rinpatch 2019-06-17 14:16:23 +0000
  • c34327b22e Merge branch 'fix/sanitize-report-content' into 'develop' Haelwenn 2019-06-16 18:05:00 +0000
  • f0fc2da964 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-06-16 17:43:10 +0100
  • 2e2edcb461 capturing errors Alex S 2019-06-16 19:42:29 +0800
  • 0f59265a50 salmon fix Alex S 2019-06-16 18:49:24 +0800
  • efa445a75b Merge branch 'issues/570' into 'develop' rinpatch 2019-06-16 10:33:25 +0000
  • a04bf131e0 [#570] add user:notification stream Maksim 2019-06-16 10:33:25 +0000
  • 57d54a9f09 Merge branch 'fix/991-version-generation' into 'develop' rinpatch 2019-06-16 10:18:47 +0000
  • bf6aa6f1a8 Fix report content stopping to be nullable rinpatch 2019-06-16 12:57:58 +0300
  • 549a410fda Merge branch 'fix-for-new-isntances' into 'develop' lain 2019-06-16 10:01:15 +0000
  • 7a4228be5a fix for new instances Alexander Strizhakov 2019-06-16 10:01:15 +0000
  • 451593f45e no print version to the shell Alex S 2019-06-16 11:48:15 +0800
  • 44de34d170 Credo fixes rinpatch 2019-06-16 01:35:45 +0300
  • 641bcaa44e Sanitize HTML in ReportView rinpatch 2019-06-16 01:30:32 +0300
  • e943905bd7 Add tests for report view rinpatch 2019-06-16 01:30:14 +0300
  • 135c196769 Merge branch 'bugfix/980-polls-double-vote' into 'develop' lain 2019-06-15 15:13:48 +0000
  • 37ee6c6e2c Merge branch 'update/phoenix-and-plug' into 'develop' lain 2019-06-15 15:09:14 +0000
  • 52b1b0e45d Merge branch '963_oob_oauth_redirect_fix' into 'develop' kaniini 2019-06-15 13:45:50 +0000
  • 9b908697dd OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f and this leftover artifact breaks compiling now. Mark Felder 2019-06-15 07:04:01 -0500
  • 2ad5a8511d Update Phoenix to 1.4.8 Mark Felder 2019-06-15 07:03:26 -0500
  • fb4af26d75 Merge branch 'feature/add-chat-token-to-masto-api' into 'develop' rinpatch 2019-06-15 09:56:01 +0000
  • 0632ed2f87 Apply suggestion to CHANGELOG.md lain 2019-06-15 09:27:27 +0000
  • 6745bc951c Documentation: Document chat token response. lain 2019-06-15 11:11:45 +0200
  • 5ea6e26da0 Changelog: Document chat token. lain 2019-06-15 11:02:05 +0200
  • a440cf856d Mastodon API: Return the token needed for the chat. lain 2019-06-15 10:59:35 +0200
  • e02f22d779 bugfix Alex S 2019-06-15 16:36:13 +0800
  • 501705438f little fix Alex S 2019-06-15 16:24:49 +0800
  • baf58c1234 version generation Alex S 2019-06-15 12:02:21 +0800
  • 62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' rinpatch 2019-06-14 16:49:28 +0000
  • 270f09dbc2 Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop' kaniini 2019-06-14 15:45:05 +0000
  • c2ca1f22a2 it is changed in compile time Alexander Strizhakov 2019-06-14 15:45:05 +0000
  • b7fc722a2e Merge branch 'fix-rate-limit-test' into 'develop' rinpatch 2019-06-14 14:50:19 +0000
  • ce823fa88e Fix rate limit test Egor Kislitsyn 2019-06-14 19:24:31 +0700
  • 7f48b90bfb Merge branch 'fix/hashtag-rich-media' into 'develop' lain 2019-06-14 11:52:04 +0000
  • a971b35785 Merge branch 'issues/948-account-search' into 'develop' lain 2019-06-14 11:39:57 +0000
  • ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following) Maksim 2019-06-14 11:39:57 +0000
  • d0ebc0edf3 Fix hashtags being picked up by rich media parser rinpatch 2019-06-14 14:34:42 +0300
  • f045d1437c Merge branch 'patch-2' into 'develop' lain 2019-06-14 09:42:04 +0000
  • 58a094b605 Add copyright info to containment.ex Egor 2019-06-14 09:26:36 +0000
  • 28cb9edde9 Merge branch '986-document-how-to-disable-rate-limiting' into 'develop' lain 2019-06-14 09:26:26 +0000
  • 774637a2f4 Mastodon API: Document changes. lain 2019-06-14 11:24:09 +0200
  • eac298083f MastodonAPI: Add a way to update the background image. lain 2019-06-14 11:19:22 +0200