Age | Commit message (Collapse) | Author |
|
Port f645dad661ba033efdcdd6ca7597e7b8bc7f4f51 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 6a2db10f767879b9072b6c020ebadac4f985ed34 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 2ae751f19d48c12e70a445ce1d01149866b56ce8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 1d07f51039625c2eafa7eb0b1b6d5a7f8cf00e41 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port a5afbb62d25306dc9d28fa8d0e85edf02c63d2a3 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 9d023ed4f6d8a69699d14479d5e12132ea4f4cd2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 8d7fbe7dd9b0a64915a96d342579ab80951be840 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port c5704e75ae1f64742d59747fd931ffcca7a4887d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
* add mouse scroll lock in image expand view
* enhancement
|
|
* add zoom image button
* enhance zoom algorithm & add translation
* code structure
* code structure
* code structure
* enhance grab performance
* rm useless state
* fix behavior on Firefox & scroll lock & horizontal scroll with mousewheel
* remove scroll lock on MouseWheelEvent
* code structure
* enhance algorithm and code structure
* rm Gemfile.lock from tree
* codeclimate
* fix a stupid mistake
|
|
Remove the labels entirely for images instead of putting an empty label.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- Makes permalink to a toot more easily clickable
- Fix clicking between icon and time in fact clicking the display name
- Fix clicking slightly under time in fact clicking the display name
|
|
|
|
|
|
|
|
|
|
Port a549415868fe23e0afaf258c17afafac117d0163 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
port d88a79b4566869ede24958fbff946e357bbb3cb9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 3678b10823a691256ad63c1c4df8dc659dfc3bc0 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `app/services/process_mentions_service.rb`:
glitch-soc local-only handling, ported upstream changes
|
|
|
|
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
|
|
|
|
|
|
|