mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka de5cc20dd8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
2020-11-14 00:30:36 +01:00
..
chewy
Change tootctl search deploy algorithm (#14300)
2020-07-14 18:10:35 +02:00
controllers
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-14 00:30:36 +01:00
helpers
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-12 22:13:57 +01:00
javascript
Fix minor design issues with fav confirmation modal
2020-11-13 01:14:52 +01:00
lib
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-14 00:30:36 +01:00
mailers
Change account suspensions to be reversible by default (#14726)
2020-09-15 14:37:58 +02:00
models
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-14 00:30:36 +01:00
policies
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-08 14:20:35 +01:00
presenters
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-30 23:00:20 +02:00
serializers
Fix media not being marked sensitive when outgoing CW is set
2020-11-13 01:05:55 +01:00
services
Improve searching for private toots from URL
2020-11-12 23:44:30 +01:00
validators
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-13 22:17:29 +02:00
views
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-12 22:13:57 +01:00
workers
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-14 00:30:36 +01:00