Commit Graph

  • bdfd72630f ListController: Fix being unable to add / remove users. Lain Soykaf 2021-01-18 16:28:36 +0100
  • c2186a62d5 Merge branch 'release/2.2.2' into 'stable' rinpatch 2021-01-18 14:33:28 +0000
  • 9b68248fd6 pleroma-fe bundle: update to 320418d524a33c20d7d769c8d67a25be81f251ec rinpatch 2021-01-18 17:04:06 +0300
  • 207c185dd6 mix.exs: bump version to 2.2.2 rinpatch 2021-01-18 15:35:15 +0300
  • 605f389038 CHANGELOG.md: Finalize 2.2.2 changelog rinpatch 2021-01-18 16:20:36 +0300
  • 3dc04b9aca Merge branch 'fix/missing_emoji_steal_dir' into 'develop' lain 2021-01-08 13:10:49 +0000
  • 732cc0ce46 Merge branch 'fix/changelog-entries' into 'develop' lain 2021-01-17 13:11:28 +0000
  • cbb1174cbd CHANGELOG.md: Remove wrong entries from Unreleased(patch) rinpatch 2021-01-17 15:55:33 +0300
  • 197606984d update for retired elixir_make package version Alexander Strizhakov 2020-12-22 17:42:23 +0300
  • 0e48c80d7f
    start oban app in migrations and mix tasks Alexander Strizhakov 2021-01-17 09:58:41 +0300
  • 02dbf1c51d
    use explicitly oban migration version Alexander Strizhakov 2021-01-17 09:58:07 +0300
  • 3f88e33a71 [#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to `clear_config/_` to minimize such issues in future. Ivan Tashkinov 2021-01-16 23:05:31 +0300
  • 3e0d1588a4
    mix.exs: Make copyright regexes more precise Haelwenn (lanodan) Monnier 2021-01-16 02:38:37 +0100
  • a17a9dcc4d
    mix.exs: Put template into one variable with ~s[] Haelwenn (lanodan) Monnier 2021-01-16 02:17:24 +0100
  • 99c2e8ed5c
    mix.exs: GNU sed doesn't into proper getopt() Haelwenn (lanodan) Monnier 2021-01-16 02:12:41 +0100
  • 23c6cea889 Add a mix alias to bump copyright Mark Felder 2021-01-15 17:26:02 -0600
  • 41a637c3a6 Split out year Mark Felder 2021-01-15 17:25:43 -0600
  • 3607dfefca Add mix alias to easily add copyright headers to files Mark Felder 2021-01-15 16:53:55 -0600
  • d2382ab5f4 Update Oban to 2.3.4 Mark Felder 2021-01-15 14:58:33 -0600
  • 181060b595 Merge branch 'fix/attachment-cleanup-queues' into 'develop' feld 2021-01-15 21:01:16 +0000
  • f9e0c05ca4 Only run one attachment cleanup job per node Mark Felder 2021-01-15 14:50:32 -0600
  • 3e4f866f04 Revert accidental blank line removal Mark Felder 2021-01-15 13:40:30 -0600
  • 4c82d5e5dd Document removal of toggle_confirmed Mark Felder 2020-10-13 16:10:00 -0500
  • 2c0fe2ea9e Remove toggle_confirmation; require explicit state change Mark Felder 2020-10-13 16:07:36 -0500
  • d36182c088 Change user.confirmation_pending field to user.is_confirmed Mark Felder 2020-10-13 14:29:34 -0500
  • 6c50ac1d3f Readability Mark Felder 2020-10-13 17:16:47 -0500
  • ebd7d1365b Make setting user activation status explicit Mark Felder 2020-10-13 17:16:03 -0500
  • 7516660753 Remove toggle_activation Mark Felder 2020-10-13 16:44:27 -0500
  • a59e32f1dd Add copyright header Mark Felder 2020-10-12 18:33:07 -0500
  • cd1e5d76ab Remove User.restrict_deactivated/1 Mark Felder 2020-10-12 18:21:46 -0500
  • 860b5c7804 Change user.deactivated field to user.is_active Mark Felder 2020-10-12 17:42:27 -0500
  • 63923df0a5 Further simplify changeset logic Mark Felder 2020-10-16 21:50:44 +0000
  • f7e59c28ed Change user.approval_pending field to user.is_approved Mark Felder 2020-10-16 21:44:25 +0000
  • cf367fdbd5 Merge branch 'optimize-command_available' into 'develop' Haelwenn 2021-01-15 04:44:58 +0000
  • d0e0396528 Hack to fix tests not passing. Unclear why the filters are being set to nil. Both of these changes are needed or it doesn't work. Mark Felder 2021-01-14 17:49:37 -0600
  • 8d6e9b25a4 Just validate command is in PATH; forking a shell is wasteful Mark Felder 2021-01-14 16:58:18 -0600
  • 0b725f5d21 Lint Mark Felder 2021-01-14 16:00:32 -0600
  • 12c8ce481c Bump Copyright year Mark Felder 2021-01-14 13:58:52 -0600
  • fb47e83adc Add ConfigDB migration Mark Felder 2021-01-14 13:53:35 -0600
  • fd9a0ac329 BackupTest: Fix s3 test. Lain Soykaf 2021-01-14 20:18:45 +0100
  • 93ce7b0efb Merge branch 'pleroma-password' into 'develop' rinpatch 2021-01-14 18:29:25 +0000
  • c4b74c9c3f Linting. Lain Soykaf 2021-01-14 16:01:14 +0100
  • 39f3683a06 Pbkdf2: Use it everywhere. Lain Soykaf 2021-01-14 15:06:16 +0100
  • 87a31c5c9b Password -> Password.Pbkdf2 Lain Soykaf 2021-01-14 14:49:39 +0100
  • ba234d3c73 Unnecessary duplication here Mark Felder 2021-01-13 12:01:01 -0600
  • 94e5180846 Consistent style Mark Felder 2021-01-13 12:00:48 -0600
  • 5627f3642f Not needed in test.exs Mark Felder 2021-01-13 11:54:45 -0600
  • f0ab60189e truncated_namespace should default to nil Mark Felder 2021-01-13 11:54:00 -0600
  • aff83eb7c1 Linting Lain Soykaf 2021-01-13 16:00:12 +0100
  • 9106048c61 Password: Replace Pbkdf2 with Password. lain 2021-01-13 15:11:11 +0100
  • c7cd9bd591 Password: Add password module lain 2021-01-13 15:09:01 +0100
  • f917285b72 Merge branch 'chores/bump-copyright' into 'develop' Haelwenn 2021-01-13 06:55:12 +0000
  • 56ddd7d717
    COPYING: Bump copyright to 2021 Haelwenn (lanodan) Monnier 2021-01-13 07:53:44 +0100
  • c4439c630f
    Bump Copyright to 2021 Haelwenn (lanodan) Monnier 2021-01-13 07:49:20 +0100
  • 67e888498c Switch another test to Upload.base_url/0 Mark Felder 2021-01-12 16:42:43 -0600
  • 2b93351bd7 Document deprecation Mark Felder 2021-01-12 16:40:29 -0600
  • e87cca97e6 Fix tests relying on old behavior. Use the Upload.base_url, Luke. Mark Felder 2021-01-12 16:35:10 -0600
  • c35e6fb516 Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader Mark Felder 2021-01-12 16:34:24 -0600
  • 12528edc34 Fix another ad-hoc construction of the upload base_url Mark Felder 2021-01-12 16:32:52 -0600
  • 8b28dce82a Deprecate Pleroma.Uploaders.S3, :public_endpoint Mark Felder 2021-01-12 16:31:35 -0600
  • 5453038ce9 Merge branch 'fix/backup-url-on-s3' into 'develop' feld 2021-01-12 20:54:30 +0000
  • 100e34b4a1 Merge branch 'chat-message-pagination' into 'develop' rinpatch 2021-01-12 19:30:44 +0000
  • 7a1cb752dd Pagination: Don't be dos'd by random parameters. lain 2021-01-12 12:59:50 +0100
  • ef59d99833 Simplify. We will always have a result from Upload.base_url/0, so just add it to the list Mark Felder 2021-01-11 14:19:14 -0600
  • 1040881047 Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains Mark Felder 2021-01-11 14:01:31 -0600
  • e1a547d7d3 ChatMessages: Fix pagination headers. lain 2021-01-11 15:30:40 +0100
  • 9887cdf9be Formatting Mark Felder 2021-01-10 09:03:42 -0600
  • be7a76abc0 Merge branch 'feat/format-optional-migrations' into 'develop' rinpatch 2021-01-10 08:40:13 +0000
  • 6b28121897 .formatter.exs: Format optional migrations rinpatch 2021-01-10 11:28:41 +0300
  • ad5338a79c Merge branch 'add_some_information_about_setting_up_a_development_environment' into 'develop' rinpatch 2021-01-10 08:25:36 +0000
  • 6284e8f4b2 Add development section Ilja 2021-01-10 08:25:36 +0000
  • fa63f1b55b Apply 4 suggestion(s) to 2 file(s) feld 2021-01-10 01:34:54 +0000
  • e8bf060e6e Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0 Mark Felder 2021-01-08 17:24:19 -0600
  • 86dcfb4eb9 More places we should be using Upload.base_url Mark Felder 2021-01-08 17:05:55 -0600
  • 530fb5b29e Avoid duplicate Config calls Mark Felder 2021-01-08 16:43:19 -0600
  • 3c936061d5 Apply Upload.base_url for S3 Mark Felder 2021-01-08 10:49:12 -0600
  • ad79983614 Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase Mark Felder 2021-01-07 18:34:30 -0600
  • 5822338f3a Merge branch 'guppe-example' into 'develop' lain 2021-01-08 15:55:48 +0000
  • 7173d35ef8 Merge branch 'confirm-users' into 'develop' lain 2021-01-08 15:36:42 +0000
  • e73c7fa7e5
    Merge remote-tracking branch 'upstream/develop' into confirm-users Alex Gleason 2021-01-08 07:48:19 -0600
  • 1b98cd8610
    Remove ConfirmUserPlug Alex Gleason 2021-01-08 07:47:55 -0600
  • 80167e62dd Merge branch 'fix/missing_emoji_steal_dir' into 'develop' lain 2021-01-08 13:10:49 +0000
  • 7e43abce68 Merge branch 'backup-ids' into 'develop' lain 2021-01-07 19:16:58 +0000
  • 3342f6a7ef
    Backups: render ID in API Alex Gleason 2021-01-07 13:06:22 -0600
  • ac1298fce8 Merge branch 'cleanup/unused-proxy-opts' into 'develop' lain 2021-01-07 16:25:39 +0000
  • bd788c0939 ActivtityPub Test: Add example for guppe actor lain 2021-01-07 16:20:30 +0100
  • cf0eb0c1c5 Merge branch 'object-normalize-refactor' into 'develop' lain 2021-01-07 11:09:18 +0000
  • 4d56aca904 Merge branch 'adminapi-user-email' into 'develop' lain 2021-01-07 10:08:02 +0000
  • f1ca2ac64b Merge branch 'upstream/remote-emoji-support' into 'develop' lain 2021-01-07 10:06:39 +0000
  • 7b8dbaff31
    Call ConfirmUserPlug from Router, not Endpoint Alex Gleason 2021-01-06 15:15:47 -0600
  • 9f6fa5877f
    Add AdminAPI.AccountViewTest Alex Gleason 2021-01-06 11:43:07 -0600
  • 20af025c65
    AdminAPI: return user email Alex Gleason 2021-01-06 11:30:32 -0600
  • 48cd336a72 allow external emoji Roger Braun 2019-02-06 18:05:34 +0100
  • 5e128a6be3 Merge branch 'fix/mediaproxy-config-descriptions' into 'develop' feld 2021-01-05 21:16:33 +0000
  • d69c78ceb9 Remove configurability of upload proxy opts, simplify Mark Felder 2021-01-05 15:06:00 -0600
  • 18296c7473 Merge branch 'fix/emoji-encoding' into 'develop' lain 2021-01-05 20:09:29 +0000
  • f9090e00e6 Add test to validate URLs to custom emojis are properly encoded Mark Felder 2021-01-05 13:58:49 -0600
  • 8864ac65c6 Add dinosaur gif from https://gifs.cc Mark Felder 2021-01-05 13:25:14 -0600
  • 64116f63d9 URI.encode custom emojis Mark Felder 2021-01-05 12:25:30 -0600
  • 20a269ed69 Merge branch 'fix/pagination-regression' into 'develop' lain 2021-01-05 12:40:45 +0000