2225 Commits (ffe81043987b0bfe77ef20f9308da54244f4083f)

Author SHA1 Message Date
Thibaut Girka ffe8104398 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Sasha Sorokin b5426b4e9a Little improvements to filters settings page (#12793)
5 years ago
Thibaut Girka 2591cedcad Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 413cb7e861 Fix base64-encoded file uploads not being possible (#12748)
5 years ago
Eugen Rochko bf2b425057 Fix resource_owner_from_credentials in Doorkeeper initializer (#12743)
5 years ago
Eugen Rochko e8b07657c2 Fix uncaught query param encoding errors (#12741)
5 years ago
Sasha Sorokin dd8d0c7d9d Add translation project promotion link (#12736)
5 years ago
Thibaut Girka fa4a92e340 Merge branch 'master' into glitch-soc/master
5 years ago
Sasha Sorokin ecd71339db Use different strings on exports page (#12569)
5 years ago
ThibG 069718f6d6 Remove unused translatable strings (#12643)
5 years ago
Alice Gaudon a285b3c63c Admin setting to disable default follows (#12566)
5 years ago
Sasha Sorokin 1cc1840170 Avoid using pluralize on moderation pages (#12589)
5 years ago
Thibaut Girka e859334b33 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko b3f365f605 Add `S3_OVERRIDE_PATH_STYLE` environment variable (#12594)
5 years ago
Eugen Rochko 0769ef8277 Add `tootctl media remove-orphans` (#12568)
5 years ago
Thibaut Girka 2cc60e8b09 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Takeshi Umeda 58dd9698c3 Add basic support for group actors (#12071)
5 years ago
tateisu f00f6bdd36 add S3_OPEN_TIMEOUT environment variable (#12459)
5 years ago
Mathieu Brunot 128a7ab7eb Add an LDAP Mail attribute config (#12053)
5 years ago
Thibaut Girka 93167b3665 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Mathieu Brunot 462788cb12 Convert LDAP username (#12461)
5 years ago
Sasha Sorokin 33696a4b44 Split relationships page strings (#12502)
5 years ago
ThibG 4b0a6d79dd Add ability to filter reports by target account domain (#12154)
5 years ago
ntl-purism 58e52929be LDAP & PAM added to OAuth password grant strategy (#7999) (#12390)
5 years ago
Thibaut Girka e48f63787d Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Sasha Sorokin 67e19f7977 Improve notifications page (#12497)
5 years ago
Yamagishi Kazutoshi 4ca914f4c0 Use override_csp options on pghero (#12489)
5 years ago
Thibaut Girka 06b56ac4b7 Fix weird edge case in load_schema
5 years ago
Thibaut Girka 8a037844d5 Revert CircleCI and some webpack changes to match upstream
5 years ago
Thibaut Girka d0be1d0cde Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
dependabot-preview[bot] 1346774607 Bump webpacker from 4.0.7 to 4.2.0 (#12416)
5 years ago
Thibaut Girka 562534a9d3 Override Migrator.new instead of Migrator#initialize, it's easier to understand
5 years ago
Thibaut Girka 13f738e229 Add documentation about the migration hack
5 years ago
Thibaut Girka f046c03787 Monkey-patch Rails' migrator to ignore duplicate migrations across Mastodon and glitch-soc
5 years ago
Thibaut Girka a96375d2ef Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 25993fc00d Fix inconsistent interpolations test by ignoring single plural keys (#12394)
5 years ago
Eugen Rochko d144122718 Fix localization test failing due to order of locale definitions (#12393)
5 years ago
Eugen Rochko bf3c777751 Add kn, mr, ur to available locales (#12379)
5 years ago
Eugen Rochko 8eac21be16 New Crowdin translations (#12146)
5 years ago
ThibG 517c1cd062 Add bookmarks (#7107)
5 years ago
ThibG f73c977caa Fix broken admin audit log in whitelist mode (#12303)
5 years ago
Thibaut Girka 79b802f10c Fix build with new sass-loader
5 years ago
Thibaut Girka 09430e7028 Disable minimization in test environment
5 years ago
Thibaut Girka e7655951d7 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Yamagishi Kazutoshi fdda54272d Change message of public timeline for local only (#12224)
5 years ago
Thibaut Girka e76f4056e5 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Faye Duxovni 6bca6dbc2d Add setting for whether to crop images in unexpanded toots (#12126)
5 years ago
ThibG 17d472b91b Add link to search for users connected from the same IP address (#12157)
5 years ago
Soft. Dev 4b059fdfde change string from Disable to Disable login (#12201)
5 years ago
Thibaut Girka 9da6fc00ff Merge branch 'master' into glitch-soc/merge-upstream
5 years ago