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.
5 years ago
9d41a410a3
[Glitch] Fix uninformative error message when uploading unsupported image files
...
Port be637146f3
5 years ago
572e89e563
[Glitch] Fix expanded video player issues
...
Port c955f98d36
5 years ago
0f4a8a6487
[Glitch] Set max-width and max-height to gif video
...
Port c5c8f68031
5 years ago
ce33822e2c
[Glitch] Fix and refactor keyboard navigation in dropdown menus
...
Port 80182eda62
5 years ago
221ea4787f
[Glitch] Update Twemoji to 12.1.5
...
Port emoji_map.json changes from 29f5353f8b
5 years ago
7ceeb97f3d
[Glitch] Add local only to hashtag timeline
...
Port front-end changes from 2c7128c7f0
5 years ago
bf9da1e734
[Glitch] Fix uploaded image orientation in some browsers
...
Port a1ce9cbb67
5 years ago
81ef26b67d
[Glitch] Fix not being able to vote
...
Port e12a5635da
5 years ago
4849752a9c
[Glitch] Fix Poll fetchPoll action not being debounced.
...
Port ab8d7c0680
5 years ago
a08a2130f0
[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists
...
Port ec31b1b752
5 years ago
51bbf0b68d
Clean up some dead code
5 years ago
5d2cdeb225
Fix deprecated use of createBrowserHistory
5 years ago
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.
5 years ago
fd7a37c371
[Glitch] Add explanation as to why unlocked accounts may have follow requests
...
Port d3ff06a320
5 years ago
7d5b43d8bb
[Glitch] Add ability to filter audit log in admin UI
...
Port f65568f1d4
5 years ago
b367dd713e
[Glitch] Improve polls: option lengths & redesign
...
Port 37b3985bfa
5 years ago
2e337d850f
[Glitch] Improve toot clicking areas
...
Port part of 1fb92037e4
5 years ago
9175ebf20c
[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW
...
Port cf1fa73347
5 years ago
dcf841545d
[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI
...
Port be2f1597cf
5 years ago
3eede6f64b
[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI
...
Port front-end changes from 0d117c106a
5 years ago
faa56643b8
[Glitch] Fix frontend crash when deleting announcements
...
Port 858d0dd168
5 years ago
60338b2bee
[Glitch] Change poll option hover/active styling to be less confusing
...
Port beb80adb51
5 years ago
9da4bd098c
[Glitch] Fix frontend crash when deleting announcements
...
Port 8758221e73
5 years ago
0ff78befc6
[Glitch] Fix regression in “Edit media” modal in web UI
...
Port 90f3a00062
5 years ago
912f4a2eba
[Glitch] Change the string "hidden" to "blocked" in WebUI
...
Port 310d729745
5 years ago
295dadc9f0
[Glitch] Change local media attachments to perform heavy processing asynchronously
...
Port front-end part of 9660aa4543
5 years ago
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.
5 years ago
7115b0b8c9
Fix missing media description dialog when sending toots with keyboard shortcuts
5 years ago
531658d6cf
Fix posting privacy on secondary button with missing description confirmation dialog
5 years ago
e53622442c
Fix privacy icon being displayed twice in glitch-soc Web UI
...
Fixes #1298
5 years ago
9c29229587
[Glitch] Add support for links to statuses in announcements to be opened in web UI
...
Port aa67036b41
5 years ago
669cf49c54
[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI
...
Port 5e4b649655
5 years ago
fc53d9cc76
[Glitch] Code style improvements in JavaScript
...
Port fd76955f39
5 years ago
35d2189ac8
[Glitch] Change description of privacy levels to be more intuitive in web UI
...
Port 4063f9f278
5 years ago
bdb06f50ec
[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI
...
Port 2e18b1a2a2
5 years ago
3c96a0c21d
[Glitch] Fix too large announcements not being scrollable in web UI
...
Port 503eab1c1f
5 years ago
6211eff739
[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI
...
Port e69a3f54a1
5 years ago
c8f36a71ea
[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI
...
Port 39453de232
5 years ago
eae96cb204
[Glitch] Add tooltips to audio/video player buttons
...
Port 036ba3f510
5 years ago
2f2b48b227
[Glitch] Fix `/web` redirecting to `/web/web` in web UI
...
Port 0f07218e53
5 years ago
0d41fef506
Document alt+enter
5 years ago
bc4de2f661
[Glitch] Add source-mapped stacktrace to error message in web UI
...
Port ff3a11d01d
5 years ago
c9166a5943
[Glitch] Fix old browsers crashing because of missing `finally` polyfill in web UI
...
Port 1314bba68a
5 years ago
955f838f9d
Fix clicking on the “TOOT” button send bogus visibility parameter
5 years ago
40798cba41
Fix alt+enter changing visibility setting without sending toot when toot is empty
5 years ago
3d7fd4a2df
Fix boosting private toots in detailed view
5 years ago
5f61065e74
[Glitch] Fix unread indicator on announcements not being aligned with text in web UI
...
Port 90f04ea064
5 years ago
e443874024
[Glitch] Fix native share button not being displayed for unlisted toots
...
Port 02236332ba
5 years ago
fe9a124f5a
[Glitch] Fix dates (without time) being rendered as datetimes in public pages
...
Port c31d61d7f2
5 years ago
Thibaut Girka
Irie Aoi
D Anzorge
Takeshi Umeda
Gurgen Hayrapetyan
Eugen Rochko
Sasha Sorokin
Mélanie Chauvel (ariasuni)
Daniel Sockwell
mayaeh
Bèr Kessels
koyu