tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
12,804 Commits 20 Branches 113 Tags
Commit Graph

1544 Commits

Author SHA1 Message Date
ThibG
24508bb837 [Glitch] Fix lock icon not being shown when locking account in profile settings 
Port 4babf5b8b5ba8eca5a14f3b2813775240db8f8f1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-01 20:13:51 +02:00
ThibG
511edccf61 [Glitch] Add user notes on accounts 
Port 65506bac3f3fe233b5b7b3241020bd74eb5c9259 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:32:02 +02:00
trwnh
50f5254568 [Glitch] Fix padding on account header 
Port d1c6dd2d277fee0cf65b480adc868c69df952622 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:10:44 +02:00
ThibG
befe8c72dd [Glitch] Fix read marker state not being udpated internally 
Port fa4876a1b93d4bb62038cca75bd5017fe49b59ae to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:09:39 +02:00
ThibG
934bacd05f [Glitch] Change sensitive preview cards to not blur text 
Port a1ad2ad9519fda525858ba5aef86815a6f6385f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:08:24 +02:00
Thibaut Girka
de735286cd Fix public page CSS to match upstream's changes 
Kind of a port of 418f0a33e9bcd8a1a2384b426bb3cc59b712ef98 to glitch-soc
 2020-06-26 13:45:40 +02:00
Mélanie Chauvel
4964490bbd [Glitch] Improve appearence consistency of settings pages 
Port 08cf81f8c1b445eba9972214869c376fe6097efb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:31:17 +02:00
ThibG
327f6309e4 [Glitch] Fix design issues with sensitive preview cards 
Port 1d2b0d2121550bf973e8a334cfa29c6d8749c52c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:28:52 +02:00
ThibG
9a26d2e127 [Glitch] Fix avatar size in public page detailed status 
Port 0a56a4a1bc97aac7c10a70a62361c0edfcb2cc54 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:27:39 +02:00
Eugen Rochko
2bb25c7730 [Glitch] Fix various issues around OpenGraph representation of media 
Port front-end changes (except for audio player) from 662a49dc3f06749936cedd7349092bbe622f0bc6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:23:56 +02:00
ThibG
72d193654b [Glitch] Fix very wide media attachments resulting in too thin a thumbnail 
Port d469247083dbbe5d4f09cc9d13a3ebd400e6068e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 16:01:28 +02:00
Takeshi Umeda
83bc9f68af [Glitch] Fix modifier key to keep the EmojiPicker on macOS 
Port 434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 15:56:43 +02:00
fuyu
51922d7ffa [Glitch] Fix unnecessary gap under of video modal 
Port cb3c6d17804da67d3c0ff233a9ca1c1902f6926f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 15:55:53 +02:00
Thibaut Girka
5d12b63e79 Simplify filtering condition 2020-06-23 16:09:36 +02:00
ash lea
c1377049c6 never filter own posts from timeline 2020-06-23 16:09:36 +02:00
Eugen Rochko
9a641a5a0e [Glitch] Add hints about incomplete remote content to web UI 
Port 3e9dc4044bb7e1ef6131fbd6430ed85b3cc2fcfa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-17 17:48:04 +02:00
ThibG
65a9b788fc [Glitch] Fix initial audio volume not corresponding to what's displayed 
Port 755e8c76ab28a99905c66082757d892939e70c49 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-17 17:20:14 +02:00
fuyu
45fbba2742 [Glitch] Fixed emoji detection problem to append border 
Port b1484cf3ceebe1f1f083e4c06872493dc0a68511 to glitch-soc

Co-authored-by: ThibG <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-17 17:18:42 +02:00
Thibaut Girka
e9d7ca7645 [Glitch] Fix WebUI crash when loading account data before page is loaded 2020-06-09 11:55:07 +02:00
ThibG
00cd919750 [Glitch] Add hotkey for toggling content warning composer field 
Port 6b6a9d0ea362f4e301b56ae817f6c5d1761234b6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:14:20 +02:00
ThibG
304721edc1 [Glitch] Improve rendering of emoji which do not contrast with background 
Port db319c0fdc8a81718a64e0ff905d5ba628551fd2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:07:32 +02:00
Ben Lubar
4657c1a1ca [Glitch] FIX: filters ignore media descriptions 
Port c66403b2579587d8c1448be3ad30dc388d5f29c3 to glitch-soc

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:02:24 +02:00
ThibG
776aff9656 [Glitch] Hide sensitive preview cards with blurhash 
Port 8e96510b2528056e84cf8d0ed68d2e686e566180 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:01:31 +02:00
Yamagishi Kazutoshi
2da2f7f7c2 [Glitch] Fix ref attr for react-textarea-autozsize 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 10:55:52 +02:00
Christopher Choi
c225ac8b9e [Glitch] Adjust flash alert contrast for better readability 
Port b4a8400afd88a2ae8822757e5d30975494be2512 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-01 18:31:45 +02:00
Brian C. Lindner
a8559458c3 [Glitch] Allow Ctrl-click to keep EmojiPicker window open 
Port 64154c5161d4d5c82877fba549d72068cc7f9e16 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-01 18:31:42 +02:00
ariasuni
1f94f4009e Improve appearance of notification cleaning UI 
- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available
 2020-06-01 12:28:27 +02:00
ThibG
9707dbee6f [Glitch] Fix timeline markers in Firefox 
Port cc650bc023e00d07c5796b7602d86597bb437f45 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-29 20:02:30 +02:00
ThibG
9bd30b8dd5 [Glitch] Fix timeline markers not working on Chrome 
Port 5aff2a6957e861162d67c4610277e9bb2a6f8186 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-29 20:02:30 +02:00
Thibaut Girka
e8714530a4 Fix local-only hashtag columns 2020-05-28 15:21:16 +02:00
Thibaut Girka
7a74e46b77 Fix one import being made on mastodon's codebase instead of glitch-soc's 2020-05-28 15:14:12 +02:00
Mélanie Chauvel
0b01492276 [Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI 
Port 40d81620b00f6c4ed30b78f95b443a08e62ae8fa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-28 14:08:05 +02:00
Takeshi Umeda
44ea965557 [Glitch] Fix local streaming of hashtag timelines 
Port 3a1a21ad5725bed7f82b516b4174272c1e931223 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-28 14:05:21 +02:00
Thibaut Girka
c8cee24cb3 Fix Cmd-Enter not working to send toot 
Fixes #1333
 2020-05-26 10:15:35 +02:00
Eugen Rochko
2b75728a80 [Glitch] Fix regression in sparkline style in web UI 
Port c9dcc2d39fb5bd945ecd999e50c08a86cce1aa3e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-14 18:50:57 +02:00
ThibG
d147dd7588 [Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted 
Port 92f85bea528c5eca97a2f075c53f7dcafdf5cb41 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-13 23:17:10 +02:00
ThibG
ef2f98317a [Glitch] Fix some account avatars on public pages having incorrect size 
Port 48503384d00525fe61a038bdb8a55868fdc1db92 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-13 23:17:10 +02:00
ThibG
6a17fa2b99 [Glitch] Fix first poll option not being focused when adding a poll 
Port af6d35627978047724612c027e60cb0a89cb2eef to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-13 23:17:10 +02:00
Takeshi Umeda
559214c33f [Glitch] Add remote only to public timeline 
Port 26b08a3c54847f2816f78c3ac67ace001d3fea1f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-10 16:19:59 +02:00
ThibG
51508e5061 [Glitch] Fix use of inline CSS in public pages 
Port c0b849bdfda8a2386bc85836d2d181890746de98 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-10 16:19:59 +02:00
ThibG
89fcd68b75 [Glitch] Fix admin-facing uses of inline CSS 
Port b8ba977497a53740e66d8db9938382b724283b3a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:47:58 +02:00
ThibG
7ea8b07b93 [Glitch] Fix page incorrectly scrolling when bringing up dropdown menus 
Port 77ec0875ea998072f4bb709bfb9b15e80669eeef to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:47:11 +02:00
ThibG
9e5a216878 [Glitch] Fix end-user-facing uses of inline CSS 
Port 0e362b7678e75cb71ce207fd45dd4dc0d955fdca to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:44:43 +02:00
ThibG
4a5f93c25f [Glitch] Refactor/cleanup TIMELINE_DELETE-related code 
Port ad9c7aefe6618a70c69991b7daf100573a7e27b9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:42:13 +02:00
ThibG
502a0365df [Glitch] Fix messed up z-index when NoScript blocks media/previews 
Port 04eb59986461bc802d4432fe4131e09eadd070c0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:41:15 +02:00
Thibaut Girka
a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior.
 2020-05-03 21:23:49 +02:00
ThibG
9d41a410a3 [Glitch] Fix uninformative error message when uploading unsupported image files 
Port be637146f310d7ec3a49d01e850959514e9e4964 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-25 15:29:01 +02:00
ThibG
572e89e563 [Glitch] Fix expanded video player issues 
Port c955f98d36868e85b0f1939a3a1c58c00babd4e8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-25 15:28:16 +02:00
Irie Aoi
0f4a8a6487 [Glitch] Set max-width and max-height to gif video 
Port c5c8f680317a182c4794505007ef227a4294a18e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-25 15:26:42 +02:00
ThibG
ce33822e2c [Glitch] Fix and refactor keyboard navigation in dropdown menus 
Port 80182eda622e1317bffb6729259b8a81d84251a2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-25 15:24:02 +02:00