about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
2020-10-28Make push notifications optionalFire Demon
2020-10-28Merge remote-tracking branch 'upstream/master' into devFire Demon
2020-10-27Fix width of content text fluctuating over time (#15055)mayaeh
2020-10-27Add option to hide notification markersThibaut Girka
2020-10-27Make “Mark media as sensitive” properly translatable (#15051)Mélanie Chauvel
2020-10-27Make visibility icon clickable as part of the time of a toot (#15053)Mélanie Chauvel
- 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
2020-10-27Make click area of video/audio player buttons bigger in WebUI (#15049)Mélanie Chauvel
2020-10-26Add local setting for pop-in player positionThibaut Girka
2020-10-26Add setting to disable the pop-in playerThibaut Girka
2020-10-26Respect glitch-soc's reply counter setting in the pop-in playerThibaut Girka
2020-10-26[Glitch] Fix regressions in icon buttons in web UIEugen Rochko
Port a549415868fe23e0afaf258c17afafac117d0163 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26[Glitch] Add pop-out player for audio/video in web UIEugen Rochko
port d88a79b4566869ede24958fbff946e357bbb3cb9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26[Glitch] Fix follow request notificationsThibG
Port 3678b10823a691256ad63c1c4df8dc659dfc3bc0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes
2020-10-26Fix follow request notifications (#15048)ThibG
2020-10-22Merge remote-tracking branch 'upstream/master' into merge-glitchFire Demon
2020-10-21[Glitch] Fix strings that could not be translatedmayaeh
Port fb5f3be18f50eb5657479196e29d13a905c43ac8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21[Glitch] Change how missing desktop notifications permission is displayedEugen Rochko
Port a69ca294738dbe22bacaf9f1fc5a551d99797b35 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21Move columns-related CSS rules into the appropriate filesThibaut Girka
2020-10-21[Glitch] Fix browser notification permission request logicThibG
Port f54ca3d08e068af07a5b7a8b139e7658b3236db8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21[Glitch] Add duration parameter to muting.OSAMU SATO
Port 96761752eccfc0d239974a24e0cc2d74c6aee7ac to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21[Glitch] Change how CDN_HOST is passed down to make assets build reproducibleThibG
Port 4c45b43cb8a3d902c130729d36d559ec9de23d3e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21[Glitch] Fix unread notification marker not updating when mounting columnThibG
Port dac3e362fd5c3d1be9e5d89149049a7eb2c6bbc4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21[Glitch] Ignore alt-key hotkeys in text fieldsThibG
Port 63770d3aac1611155213e4c903424849cc254519 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21[Glitch] Fix mark as read in notifications to be saved immediatelyTakeshi Umeda
Port bec8b12bb52a57b54b66899b2650a5611d9bd561 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21[Glitch] Fix bell button causing a brief “Cancel follow request” on ↵ThibG
locked accounts Port 82951920f7321fefbdf0628cbb70f2f490f7b716 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2020-10-21Rename Fediverse timeline to the TavernFire Demon
2020-10-21Merge remote-tracking branch 'upstream/master' into devFire Demon
2020-10-21When a local user blocks a server, ask the server to remove their dataFire Demon
2020-10-21Make receiving boosts from Tavern timeline in home feed opt-in; always ↵Fire Demon
aggregate boosts
2020-10-19Glitchsoc translation to 'es' language (#1439)otrapersona
glitch-soc-specific translation to 'es' language
2020-10-16Fix translation string (#14986)mayaeh
2020-10-15Fix strings that could not be translated (#14980)mayaeh
2020-10-15Change how missing desktop notifications permission is displayed (#14985)Eugen Rochko
Add missing controls for new notification type
2020-10-13Change how CDN_HOST is passed down to make assets build reproducible (#14381)ThibG
* 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
2020-10-13Add duration parameter to muting. (#13831)OSAMU SATO
* Adding duration to muting. * Remove useless checks
2020-10-13Fix browser notification permission request logic (#13543)ThibG
* 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
2020-10-10Merge remote-tracking branch 'upstream/master' into devFire Demon
2020-10-09Fix issue checking for last unread notification when there are gaps (#14960)ThibG
2020-10-08Fix issue checking for last unread notification when there are gapsThibaut Girka
2020-10-08Fix unread notification marker not updating when mounting column (#14954)ThibG
2020-10-05Ignore alt-key hotkeys in text fields (#14942)ThibG
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.
2020-10-05Update translation files (#14920)mayaeh
2020-10-04Fix regressions in icon buttons in web UI (#14915)Eugen Rochko
2020-10-01Fix mark as read in notifications to be saved immediately (#14907)Takeshi Umeda
* Fix mark as read in notifications to be saved immediately * fix code style
2020-09-30Fix logging out on mobile (#14901)ThibG
Fixes #14900
2020-09-30Add option to disable swiping motions across the WebUI (#13885)ThibG
Fixes #13882
2020-09-30Merge remote-tracking branch 'upstream/master' into merge-glitchFire Demon
2020-09-29Fix unread notification markers (#14897)Takeshi Umeda