tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,694 Commits 10 Branches 0 Tags
e08b31a70624fe069d2f26bf2078a69e2d48f6aa
Commit Graph

4747 Commits

Author SHA1 Message Date
fuyu
8d7fbe7dd9 Fix wrong seek bar width on media player (#15060) 2020-10-30 13:09:20 +01:00
mayaeh
2ae751f19d Fix width of content text fluctuating over time (#15055) 2020-10-27 13:34:02 +01:00
Thibaut Girka
a81bb14abe Add option to hide notification markers 2020-10-27 11:20:11 +01:00
Mélanie Chauvel
c5704e75ae Make “Mark media as sensitive” properly translatable (#15051) 2020-10-27 03:05:50 +01:00
Mélanie Chauvel
1d07f51039 Make visibility icon clickable as part of the time of a toot (#15053) 
- 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-27 03:00:47 +01:00
Mélanie Chauvel
a5afbb62d2 Make click area of video/audio player buttons bigger in WebUI (#15049) 2020-10-27 02:58:47 +01:00
Thibaut Girka
49ee69f75f Add local setting for pop-in player position 2020-10-26 20:51:28 +01:00
Thibaut Girka
ea5298ab9b Add setting to disable the pop-in player 2020-10-26 20:31:54 +01:00
Thibaut Girka
5ee2b860f9 Respect glitch-soc's reply counter setting in the pop-in player 2020-10-26 20:31:54 +01:00
Eugen Rochko
47edac871c [Glitch] Fix regressions in icon buttons in web UI 
Port a549415868 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-26 19:51:09 +01:00
Eugen Rochko
8f950e540b [Glitch] Add pop-out player for audio/video in web UI 
port d88a79b456 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-26 19:51:09 +01:00
ThibG
ddbb9f0ec4 [Glitch] Fix follow request notifications 
Port 3678b10823 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-26 15:50:48 +01:00
Thibaut Girka
9c34090db8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes
 2020-10-26 15:48:16 +01:00
ThibG
3678b10823 Fix follow request notifications (#15048) 2020-10-26 15:41:28 +01:00
mayaeh
5c60f7eaed [Glitch] Fix strings that could not be translated 
Port fb5f3be18f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 21:49:46 +02:00
Eugen Rochko
4ae4b03974 [Glitch] Change how missing desktop notifications permission is displayed 
Port a69ca29473 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 21:49:46 +02:00
Thibaut Girka
dca05c79a9 Move columns-related CSS rules into the appropriate files 2020-10-21 21:28:47 +02:00
ThibG
b5927301cf [Glitch] Fix browser notification permission request logic 
Port f54ca3d08e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 21:28:47 +02:00
OSAMU SATO
78ad04420c [Glitch] Add duration parameter to muting. 
Port 96761752ec to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 21:28:47 +02:00
ThibG
813c84cd6c [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 
Port 4c45b43cb8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 21:28:47 +02:00
ThibG
842c048c6b [Glitch] Fix unread notification marker not updating when mounting column 
Port dac3e362fd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 19:36:41 +02:00
ThibG
f7306c7b7c [Glitch] Ignore alt-key hotkeys in text fields 
Port 63770d3aac to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 19:34:44 +02:00
Takeshi Umeda
8071613dd7 [Glitch] Fix mark as read in notifications to be saved immediately 
Port bec8b12bb5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 19:33:20 +02:00
ThibG
c3d82027cf [Glitch] Fix bell button causing a brief “Cancel follow request” on locked accounts 
Port 82951920f7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 19:24:32 +02:00
Thibaut Girka
ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream 
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-21 19:10:50 +02:00
otrapersona
29870d2be6 Glitchsoc translation to 'es' language (#1439) 
glitch-soc-specific translation to 'es' language
 2020-10-19 22:17:29 +02:00
mayaeh
4130aef29c Fix translation string (#14986) 2020-10-16 21:41:43 +02:00
mayaeh
fb5f3be18f Fix strings that could not be translated (#14980) 2020-10-15 21:24:58 +02:00
Eugen Rochko
a69ca29473 Change how missing desktop notifications permission is displayed (#14985) 
Add missing controls for new notification type
 2020-10-15 16:24:47 +02:00
ThibG
4c45b43cb8 Change how CDN_HOST is passed down to make assets build reproducible (#14381) 
* 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-13 01:19:35 +02:00
OSAMU SATO
96761752ec Add duration parameter to muting. (#13831) 
* Adding duration to muting.

* Remove useless checks
 2020-10-13 01:01:14 +02:00
ThibG
f54ca3d08e Fix browser notification permission request logic (#13543) 
* 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-13 00:37:21 +02:00
ThibG
dc52a778e1 Fix issue checking for last unread notification when there are gaps (#14960) 2020-10-09 17:12:52 +02:00
Thibaut Girka
cd861c051c Fix issue checking for last unread notification when there are gaps 2020-10-08 22:44:30 +02:00
ThibG
dac3e362fd Fix unread notification marker not updating when mounting column (#14954) 2020-10-08 00:35:27 +02:00
ThibG
63770d3aac Ignore alt-key hotkeys in text fields (#14942) 
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-05 22:04:06 +02:00
mayaeh
5a9ad221bf Update translation files (#14920) 2020-10-05 02:57:38 +02:00
Eugen Rochko
a549415868 Fix regressions in icon buttons in web UI (#14915) 2020-10-04 15:02:36 +02:00
Takeshi Umeda
bec8b12bb5 Fix mark as read in notifications to be saved immediately (#14907) 
* Fix mark as read in notifications to be saved immediately

* fix code style
 2020-10-01 04:17:46 +02:00
ThibG
65136600e3 Fix logging out on mobile (#14901) 
Fixes #14900
 2020-09-30 19:31:17 +02:00
ThibG
78e45a5285 Add option to disable swiping motions across the WebUI (#13885) 
Fixes #13882
 2020-09-30 19:31:03 +02:00
Takeshi Umeda
f5d08f2417 Fix unread notification markers (#14897) 2020-09-29 15:30:56 +02:00
Thibaut Girka
b5edf30160 Fix boost icon not being displayed in boost notifications 2020-09-29 11:05:05 +02:00
ThibG
82951920f7 Fix bell button causing a brief “Cancel follow request” on locked accounts (#14896) 2020-09-28 21:44:29 +02:00
Thibaut Girka
ccfc2b6dce Make explicit in glitch-soc's WebUI when an account is suspended 2020-09-28 18:00:49 +02:00
Eugen Rochko
dadec533ce [Glitch] Fix unreadable placeholder text color in high contrast theme in web UI (#14803) 
Port bbcbf12215 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-28 17:56:16 +02:00
Thibaut Girka
6dde075425 Fix actions being performed before the redux state is set up 2020-09-28 17:49:55 +02:00
ThibG
f8205b7b4a [Glitch] Add paragraph about browser add-ons when encountering some errors 
Port b67caf9be4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-28 17:49:55 +02:00
Eugen Rochko
14869ee656 [Glitch] Add option to be notified when a followed user posts 
Port 974b1b79ce to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-28 17:49:55 +02:00
Eugen Rochko
0a069bffd9 [Glitch] Optimize the process of following someone 
Port front-end changes from 6d59dfa15d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-28 17:49:55 +02:00