Age | Commit message (Collapse) | Author |
|
|
|
Port fb5f3be18f50eb5657479196e29d13a905c43ac8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port a69ca294738dbe22bacaf9f1fc5a551d99797b35 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port f54ca3d08e068af07a5b7a8b139e7658b3236db8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 96761752eccfc0d239974a24e0cc2d74c6aee7ac to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 4c45b43cb8a3d902c130729d36d559ec9de23d3e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port dac3e362fd5c3d1be9e5d89149049a7eb2c6bbc4 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 63770d3aac1611155213e4c903424849cc254519 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port bec8b12bb52a57b54b66899b2650a5611d9bd561 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
locked accounts
Port 82951920f7321fefbdf0628cbb70f2f490f7b716 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
|
|
glitch-soc-specific translation to 'es' language
|
|
|
|
|
|
Add missing controls for new notification type
|
|
* Change how CDN_HOST is passed down to make assets build reproducible
* Change webpacker/webpack configuration to dynamically load publicPath based on meta header
* Fix embedded layout missing the cdn-host meta header
|
|
* Adding duration to muting.
* Remove useless checks
|
|
* Add notification permission handling code
* Request notification permission when enabling any notification setting
* Add badge to notification settings when permissions insufficient
* Disable alerts by default, requesting permission and enable them on onboarding
|
|
|
|
|
|
|
|
Fixes #14862
This used to be the case until #13987, which introduced a hotkey to toggle
the Content Warning field.
Unfortunately, MacOS relies on the “alt” key for many things, including
composing text (see #14862), therefore, even if that makes the CW toggle
hotkey significantly less useful, it makes sense to not interfere with
composing toots.
|
|
|
|
|
|
* Fix mark as read in notifications to be saved immediately
* fix code style
|
|
Fixes #14900
|
|
Fixes #13882
|
|
|
|
|
|
accounts (#14896)
|
|
|
|
UI (#14803)
Port bbcbf12215a5ec69362a769c1bae9c630eda0ed4 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port b67caf9be48294bef290eea69e90d98223fcf3eb to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 974b1b79ce58e6799e5e5bb576e630ca783150de to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port front-end changes from 6d59dfa15d873da75c731b79367ab6b3d1b2f5a5 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port fcb9350ff8cdc83388f75de6b031410df8aa8a56 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port eaea2311aaaf030e4a2f5d03be6131d0716fdaf7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port aab867b0e8119ecee78dabe8007f3c033e734b6d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 91eecd1b3c95807be00535b58ebfd85e549d77e0 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `Gemfile.lock`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
Upstream changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/models/user.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc not preventing moved accounts from logging
in.
Ported upstream changes while keeping the ability for moved accounts to log
in.
- `app/policies/status_policy.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's ability to hide followers count.
Ported upstream changes.
- `app/services/process_mentions_service.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `package.json`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
|
|
Fix #11160
|
|
* Add unread notification markers
Fixes #14804
* Allow IntersectionObserverArticle's children to be updated
|
|
|
|
|
|
|
|
* Add bell button
Fix #4890
* Remove duplicate type from post-deployment migration
* Fix legacy class type mappings
* Improve query performance with better index
* Fix validation
* Remove redundant index from notifications
|
|
|
|
|