Takeshi Umeda
559214c33f
[Glitch] Add remote only to public timeline
...
Port 26b08a3c54
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 c0b849bdfd
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 b8ba977497
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 77ec0875ea
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 0e362b7678
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 ad9c7aefe6
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 04eb599864
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 be637146f3
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 c955f98d36
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 c5c8f68031
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 80182eda62
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 29f5353f8b
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 2c7128c7f0
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 a1ce9cbb67
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 e12a5635da
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 ab8d7c0680
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 ec31b1b752
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 d3ff06a320
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 f65568f1d4
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 37b3985bfa
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 1fb92037e4
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 cf1fa73347
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 be2f1597cf
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 0d117c106a
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 858d0dd168
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 beb80adb51
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 8758221e73
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 90f3a00062
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 310d729745
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 9660aa4543
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 aa67036b41
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:46:15 +01:00
Mélanie Chauvel (ariasuni)
669cf49c54
[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI
...
Port 5e4b649655
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:45:36 +01:00
Bèr Kessels
fc53d9cc76
[Glitch] Code style improvements in JavaScript
...
Port fd76955f39
to glitch-soc
* JS-linter: fix trailing comma's
* Configure eslinter to ignore this onchange error.
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:43:53 +01:00
Mélanie Chauvel (ariasuni)
35d2189ac8
[Glitch] Change description of privacy levels to be more intuitive in web UI
...
Port 4063f9f278
to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:37:13 +01:00
Mélanie Chauvel (ariasuni)
bdb06f50ec
[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI
...
Port 2e18b1a2a2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:19:08 +01:00
ThibG
3c96a0c21d
[Glitch] Fix too large announcements not being scrollable in web UI
...
Port 503eab1c1f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:16:43 +01:00
6211eff739
[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI
...
Port e69a3f54a1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:15:11 +01:00
ThibG
c8f36a71ea
[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI
...
Port 39453de232
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:14:20 +01:00
Mélanie Chauvel (ariasuni)
eae96cb204
[Glitch] Add tooltips to audio/video player buttons
...
Port 036ba3f510
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 19:59:42 +01:00
ThibG
2f2b48b227
[Glitch] Fix /web
redirecting to /web/web
in web UI
...
Port 0f07218e53
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-25 14:30:43 +01:00
Thibaut Girka
0d41fef506
Document alt+enter
2020-02-22 23:07:29 +01:00
Thibaut Girka
bc4de2f661
[Glitch] Add source-mapped stacktrace to error message in web UI
...
Port ff3a11d01d
to glitch-soc
2020-02-19 23:31:15 +01:00