cedf9b81e4
Fix local-only hashtag columns
4 years ago
4e225a769a
Fix one import being made on mastodon's codebase instead of glitch-soc's
4 years ago
437f457b9f
[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI
...
Port 006af53406
4 years ago
1420db7e2d
[Glitch] Fix local streaming of hashtag timelines
...
Port 8dd03cf8f2
4 years ago
22f2f6f43b
Fix Cmd-Enter not working to send toot
...
Fixes #1333
4 years ago
55f1aec9c4
[Glitch] Fix regression in sparkline style in web UI
...
Port bb9edd6321
4 years ago
5b9ed6e0c1
[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted
...
Port 9af0613629
4 years ago
ab970f996b
[Glitch] Fix some account avatars on public pages having incorrect size
...
Port e93c08ab96
4 years ago
80b1201644
[Glitch] Fix first poll option not being focused when adding a poll
...
Port 60dc5738cb
4 years ago
885b2e3d86
[Glitch] Add remote only to public timeline
...
Port 861661100c
4 years ago
5a2f0de845
[Glitch] Fix use of inline CSS in public pages
...
Port 20ffc12cda
4 years ago
8b8add863e
[Glitch] Fix admin-facing uses of inline CSS
...
Port a30829deee
4 years ago
3da2cd21fd
[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus
...
Port e88a05f707
4 years ago
2ac3e3dc07
[Glitch] Fix end-user-facing uses of inline CSS
...
Port 3b7373ed4c
4 years ago
f261370e7c
[Glitch] Refactor/cleanup TIMELINE_DELETE-related code
...
Port df5867f072
4 years ago
e869a257d8
[Glitch] Fix messed up z-index when NoScript blocks media/previews
...
Port f53bd1bef6
4 years ago
dfa13deaa1
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.
4 years ago
2e92d55b64
[Glitch] Fix uninformative error message when uploading unsupported image files
...
Port cd3a0a17bc
4 years ago
ed2267b78e
[Glitch] Fix expanded video player issues
...
Port 3526163340
4 years ago
1e1b72ff72
[Glitch] Set max-width and max-height to gif video
...
Port cf1bf9dda9
4 years ago
7195bca890
[Glitch] Fix and refactor keyboard navigation in dropdown menus
...
Port 69696c62b1
4 years ago
0b8c354379
[Glitch] Update Twemoji to 12.1.5
...
Port emoji_map.json changes from 945c8e207e
4 years ago
6556bd1f67
[Glitch] Add local only to hashtag timeline
...
Port front-end changes from f5606cdab4
4 years ago
f41a61965a
[Glitch] Fix uploaded image orientation in some browsers
...
Port 2444658e4b
4 years ago
2c92697ec8
[Glitch] Fix not being able to vote
...
Port 0f3317fbe2
4 years ago
f451095c04
[Glitch] Fix Poll fetchPoll action not being debounced.
...
Port 53f9f8a4ce
4 years ago
9e12c3f3a7
[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists
...
Port 9d57af78d2
5 years ago
6d3e240aa9
Clean up some dead code
5 years ago
79e5f368ed
Fix deprecated use of createBrowserHistory
5 years ago
c13682bc0d
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.
5 years ago
08e4bed98c
[Glitch] Add explanation as to why unlocked accounts may have follow requests
...
Port ffd6f3fa8a
5 years ago
04839f5dda
[Glitch] Add ability to filter audit log in admin UI
...
Port 6932e0e2af
5 years ago
56dba219d1
[Glitch] Improve polls: option lengths & redesign
...
Port abbc0c6a87
5 years ago
660a3d2b7a
[Glitch] Improve toot clicking areas
...
Port part of 899ff914da
5 years ago
0a02eade54
[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW
...
Port 41ca3cdb37
5 years ago
989f819191
[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI
...
Port 5a211c478d
5 years ago
61052dfa33
[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI
...
Port front-end changes from 1a993f9675
5 years ago
5dbcafb998
[Glitch] Fix frontend crash when deleting announcements
...
Port 15c02a7160
5 years ago
6adb571c21
[Glitch] Change poll option hover/active styling to be less confusing
...
Port 421a3a8f08
5 years ago
5e3049158e
[Glitch] Fix frontend crash when deleting announcements
...
Port 577f74ad87
5 years ago
e9338c7640
[Glitch] Fix regression in “Edit media” modal in web UI
...
Port c5731b4dc7
5 years ago
24e4647483
[Glitch] Change the string "hidden" to "blocked" in WebUI
...
Port 4a87cebf48
5 years ago
3e87f56ab3
[Glitch] Change local media attachments to perform heavy processing asynchronously
...
Port front-end part of f459919552
5 years ago
99fc46d023
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.
5 years ago
e16832bc9c
Fix missing media description dialog when sending toots with keyboard shortcuts
5 years ago
03309b0dc5
Fix posting privacy on secondary button with missing description confirmation dialog
5 years ago
9af4ed237c
Fix privacy icon being displayed twice in glitch-soc Web UI
...
Fixes #1298
5 years ago
96df38d753
[Glitch] Add support for links to statuses in announcements to be opened in web UI
...
Port a67fd2fbe1
5 years ago
8dede28b01
[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI
...
Port 399fa48f8e
5 years ago
96b18a705f
[Glitch] Code style improvements in JavaScript
...
Port b5d7ec71ef
5 years ago
Thibaut Girka
Mélanie Chauvel
Takeshi Umeda
Eugen Rochko
Irie Aoi
D Anzorge
Gurgen Hayrapetyan
Sasha Sorokin
Daniel Sockwell
mayaeh
Bèr Kessels