mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-09 19:56:20 +01:00
Code Issues Projects Releases Wiki Activity
12,944 Commits 126 Branches 269 Tags 1 GiB
Commit Graph

1563 Commits

Author SHA1 Message Date
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
D Anzorge
221ea4787f [Glitch] Update Twemoji to 12.1.5 
Port emoji_map.json changes from 29f5353f8b7af331d6dddea4ee1888913361a545 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-20 16:54:01 +02:00
Takeshi Umeda
7ceeb97f3d [Glitch] Add local only to hashtag timeline 
Port front-end changes from 2c7128c7f0ee3073acb9897cda88255982368193 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-20 16:52:56 +02:00
ThibG
bf9da1e734 [Glitch] Fix uploaded image orientation in some browsers 
Port a1ce9cbb67facf705379355b9c8ec19c521b419c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-18 15:48:15 +02:00
ThibG
81ef26b67d [Glitch] Fix not being able to vote 
Port e12a5635da7de5a1c3b08b2ce420ee8a56ae4aff to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-17 22:04:10 +02:00
Gurgen Hayrapetyan
4849752a9c [Glitch] Fix Poll fetchPoll action not being debounced. 
Port ab8d7c0680d7f75826277be4c8eea1ebd396be8a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-17 20:20:06 +02:00
ThibG
a08a2130f0 [Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists 
Port ec31b1b75244c030bb4fb0ccabac7ff8b626db92 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-12 17:01:41 +02:00
Thibaut Girka
51bbf0b68d Clean up some dead code 2020-04-10 14:47:06 +02:00
Thibaut Girka
5d2cdeb225 Fix deprecated use of createBrowserHistory 2020-04-09 17:03:05 +02:00
Thibaut Girka
9101254d0a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
 2020-04-05 18:32:06 +02:00
ThibG
fd7a37c371 [Glitch] Add explanation as to why unlocked accounts may have follow requests 
Port d3ff06a3205130fa10ffc5d736e8206a9725b5df to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-04 21:59:49 +02:00
Eugen Rochko
7d5b43d8bb [Glitch] Add ability to filter audit log in admin UI 
Port f65568f1d400be2e101bd8b533a1b53807f5c757 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-04 21:53:31 +02:00
Sasha Sorokin
b367dd713e [Glitch] Improve polls: option lengths & redesign 
Port 37b3985bfac5ffdc8e452f92869dcdefb5c92594 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:52:53 +02:00
Mélanie Chauvel (ariasuni)
2e337d850f [Glitch] Improve toot clicking areas 
Port part of 1fb92037e432913902a5e5c8a5b673b036d84cb8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:49:43 +02:00
ThibG
9175ebf20c [Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW 
Port cf1fa73347c9ca2b1c4f14521e990feba7509e2e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:46 +02:00
Mélanie Chauvel (ariasuni)
dcf841545d [Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI 
Port be2f1597cf6b010a7ea0ffdc45550f87a7ae9dad  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:03 +02:00
ThibG
3eede6f64b [Glitch] Fix 404 and 410 API errors being silently discarded in WebUI 
Port front-end changes from 0d117c106aa72f78dd5cdd371849dd8ce3120198 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:39:44 +02:00
ThibG
faa56643b8 [Glitch] Fix frontend crash when deleting announcements 
Port 858d0dd168b737a77506d6aa00f6ed582d0e33c6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-27 22:06:42 +01:00
ThibG
60338b2bee [Glitch] Change poll option hover/active styling to be less confusing 
Port beb80adb5150e50717852b39db7b534bc0da9534 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-27 22:06:06 +01:00
Daniel Sockwell
9da4bd098c [Glitch] Fix frontend crash when deleting announcements 
Port 8758221e7344645bc1357578ec1789aa7d46da08 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:31:01 +01:00
ThibG
0ff78befc6 [Glitch] Fix regression in “Edit media” modal in web UI 
Port 90f3a0006243250ced6e7e192f81513d6b731b33 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:30:19 +01:00
mayaeh
912f4a2eba [Glitch] Change the string "hidden" to "blocked" in WebUI 
Port 310d729745ad34b1b039f2ec611b9bda5b73f252 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:29:51 +01:00
Eugen Rochko
295dadc9f0 [Glitch] Change local media attachments to perform heavy processing asynchronously 
Port front-end part of 9660aa4543deff41c60d131e081137f84e771499 to glitch-soc

[API] This makes use of a new media posting API (/api/v2/media), supporting
background processing of uploaded files. For Pleroma's purposes, this could
be handled the same as /api/v1/media since afaik Pleroma doesn't do any
transcoding.

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:26:26 +01:00
Thibaut Girka
9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
 2020-03-22 16:10:44 +01:00
Thibaut Girka
7115b0b8c9 Fix missing media description dialog when sending toots with keyboard shortcuts 2020-03-14 14:59:14 +01:00
Thibaut Girka
531658d6cf Fix posting privacy on secondary button with missing description confirmation dialog 2020-03-14 12:33:50 +01:00
Thibaut Girka
e53622442c Fix privacy icon being displayed twice in glitch-soc Web UI 
Fixes #1298
 2020-03-11 23:25:15 +01:00
ThibG
9c29229587 [Glitch] Add support for links to statuses in announcements to be opened in web UI 
Port aa67036b41d37935210c8b5094ac20c153a62011 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:46:15 +01:00