This repository has been archived on 2024-07-22 . You can view files and clone it, but cannot push or open issues or pull requests.
Thibaut Girka
4a70792b4a
Merge branch 'master' into glitch-soc/merge-upstream ...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, just a glitch-soc-only dependency too close to a
dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
Not a real conflict, just a change too close to glitch-soc-changed code
for optionally showing boosts in public timelines.
Applied upstream changes.
- `app/views/layouts/application.html.haml`:
Upstream a new, static CSS file, conflict due to glitch-soc's theming
system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +02:00
..
exports
Add CSV export for lists and domain blocks ( #9677 )
2019-01-01 13:44:04 +01:00
migration
Add (back) option to set redirect notice on account without moving followers ( #11994 )
2019-09-29 05:03:19 +02:00
preferences
Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )
2019-06-07 16:51:08 +02:00
two_factor_authentication
Add password challenge to 2FA settings, e-mail notifications ( #11878 )
2019-09-18 16:37:27 +02:00
aliases_controller.rb
Addition of update activity distribution by alias, minor correction ( #11905 )
2019-09-21 09:11:21 +02:00
applications_controller.rb
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
base_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-04 23:04:42 +01:00
deletes_controller.rb
Fix 2FA challenge and password challenge for non-database users ( #11831 )
2019-09-15 21:08:39 +02:00
exports_controller.rb
Add account migration UI ( #11846 )
2019-09-19 20:58:19 +02:00
featured_tags_controller.rb
Fix pinned statuses being shown in a featured hashtag ( #9971 )
2019-02-05 00:27:18 +01:00
flavours_controller.rb
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
identity_proofs_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-10 16:19:56 +02:00
imports_controller.rb
Fix ImportsController param to permit :mode ( #13347 )
2020-03-31 12:43:42 +02:00
migrations_controller.rb
Fix account migration not affecting followers on origin server ( #11980 )
2019-09-29 16:23:13 +02:00
pictures_controller.rb
Allow users to delete their header and avatar ( #13234 )
2020-04-20 14:03:03 +02:00
preferences_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-27 12:14:01 +01:00
profiles_controller.rb
Fix base64-encoded file uploads not being possible ( #12748 )
2020-01-04 01:54:07 +01:00
sessions_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-23 10:51:07 +02:00
two_factor_authentications_controller.rb
Add password challenge to 2FA settings, e-mail notifications ( #11878 )
2019-09-18 16:37:27 +02:00
4a70792b4a