ThibG
948f988a04
[Glitch] Fix timeline markers not working on Chrome
...
Port bf68cd3bf0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-29 20:02:30 +02:00
Thibaut Girka
cedf9b81e4
Fix local-only hashtag columns
2020-05-28 15:21:16 +02:00
Thibaut Girka
4e225a769a
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
437f457b9f
[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI
...
Port 006af53406
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28 14:08:05 +02:00
Takeshi Umeda
1420db7e2d
[Glitch] Fix local streaming of hashtag timelines
...
Port 8dd03cf8f2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28 14:05:21 +02:00
Thibaut Girka
22f2f6f43b
Fix Cmd-Enter not working to send toot
...
Fixes #1333
2020-05-26 10:15:35 +02:00
Eugen Rochko
55f1aec9c4
[Glitch] Fix regression in sparkline style in web UI
...
Port bb9edd6321
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-14 18:50:57 +02:00
ThibG
5b9ed6e0c1
[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted
...
Port 9af0613629
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13 23:17:10 +02:00
ThibG
ab970f996b
[Glitch] Fix some account avatars on public pages having incorrect size
...
Port e93c08ab96
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13 23:17:10 +02:00
ThibG
80b1201644
[Glitch] Fix first poll option not being focused when adding a poll
...
Port 60dc5738cb
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13 23:17:10 +02:00
Takeshi Umeda
885b2e3d86
[Glitch] Add remote only to public timeline
...
Port 861661100c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-10 16:19:59 +02:00
ThibG
5a2f0de845
[Glitch] Fix use of inline CSS in public pages
...
Port 20ffc12cda
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-10 16:19:59 +02:00
ThibG
8b8add863e
[Glitch] Fix admin-facing uses of inline CSS
...
Port a30829deee
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:47:58 +02:00
ThibG
3da2cd21fd
[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus
...
Port e88a05f707
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:47:11 +02:00
ThibG
2ac3e3dc07
[Glitch] Fix end-user-facing uses of inline CSS
...
Port 3b7373ed4c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:44:43 +02:00
ThibG
f261370e7c
[Glitch] Refactor/cleanup TIMELINE_DELETE-related code
...
Port df5867f072
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:42:13 +02:00
ThibG
e869a257d8
[Glitch] Fix messed up z-index when NoScript blocks media/previews
...
Port f53bd1bef6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03 21:41:15 +02:00
Thibaut Girka
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.
2020-05-03 21:23:49 +02:00
ThibG
2e92d55b64
[Glitch] Fix uninformative error message when uploading unsupported image files
...
Port cd3a0a17bc
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25 15:29:01 +02:00
ThibG
ed2267b78e
[Glitch] Fix expanded video player issues
...
Port 3526163340
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25 15:28:16 +02:00
Irie Aoi
1e1b72ff72
[Glitch] Set max-width and max-height to gif video
...
Port cf1bf9dda9
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25 15:26:42 +02:00
ThibG
7195bca890
[Glitch] Fix and refactor keyboard navigation in dropdown menus
...
Port 69696c62b1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25 15:24:02 +02:00
D Anzorge
0b8c354379
[Glitch] Update Twemoji to 12.1.5
...
Port emoji_map.json changes from 945c8e207e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-20 16:54:01 +02:00
Takeshi Umeda
6556bd1f67
[Glitch] Add local only to hashtag timeline
...
Port front-end changes from f5606cdab4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-20 16:52:56 +02:00
ThibG
f41a61965a
[Glitch] Fix uploaded image orientation in some browsers
...
Port 2444658e4b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-18 15:48:15 +02:00
ThibG
2c92697ec8
[Glitch] Fix not being able to vote
...
Port 0f3317fbe2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17 22:04:10 +02:00
Gurgen Hayrapetyan
f451095c04
[Glitch] Fix Poll fetchPoll action not being debounced.
...
Port 53f9f8a4ce
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17 20:20:06 +02:00
ThibG
9e12c3f3a7
[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists
...
Port 9d57af78d2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-12 17:01:41 +02:00
Thibaut Girka
6d3e240aa9
Clean up some dead code
2020-04-10 14:47:06 +02:00
Thibaut Girka
79e5f368ed
Fix deprecated use of createBrowserHistory
2020-04-09 17:03:05 +02:00
Thibaut Girka
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.
2020-04-05 18:32:06 +02:00
ThibG
08e4bed98c
[Glitch] Add explanation as to why unlocked accounts may have follow requests
...
Port ffd6f3fa8a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-04 21:59:49 +02:00
Eugen Rochko
04839f5dda
[Glitch] Add ability to filter audit log in admin UI
...
Port 6932e0e2af
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-04 21:53:31 +02:00
Sasha Sorokin
56dba219d1
[Glitch] Improve polls: option lengths & redesign
...
Port abbc0c6a87
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:52:53 +02:00
Mélanie Chauvel (ariasuni)
660a3d2b7a
[Glitch] Improve toot clicking areas
...
Port part of 899ff914da
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:49:43 +02:00
ThibG
0a02eade54
[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW
...
Port 41ca3cdb37
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:45:46 +02:00
Mélanie Chauvel (ariasuni)
989f819191
[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI
...
Port 5a211c478d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:45:03 +02:00
ThibG
61052dfa33
[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI
...
Port front-end changes from 1a993f9675
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02 20:39:44 +02:00
ThibG
5dbcafb998
[Glitch] Fix frontend crash when deleting announcements
...
Port 15c02a7160
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-27 22:06:42 +01:00
ThibG
6adb571c21
[Glitch] Change poll option hover/active styling to be less confusing
...
Port 421a3a8f08
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-27 22:06:06 +01:00
Daniel Sockwell
5e3049158e
[Glitch] Fix frontend crash when deleting announcements
...
Port 577f74ad87
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22 16:31:01 +01:00
ThibG
e9338c7640
[Glitch] Fix regression in “Edit media” modal in web UI
...
Port c5731b4dc7
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22 16:30:19 +01:00
mayaeh
24e4647483
[Glitch] Change the string "hidden" to "blocked" in WebUI
...
Port 4a87cebf48
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22 16:29:51 +01:00
Eugen Rochko
3e87f56ab3
[Glitch] Change local media attachments to perform heavy processing asynchronously
...
Port front-end part of f459919552
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
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.
2020-03-22 16:10:44 +01:00
Thibaut Girka
e16832bc9c
Fix missing media description dialog when sending toots with keyboard shortcuts
2020-03-14 14:59:14 +01:00
Thibaut Girka
03309b0dc5
Fix posting privacy on secondary button with missing description confirmation dialog
2020-03-14 12:33:50 +01:00
Thibaut Girka
9af4ed237c
Fix privacy icon being displayed twice in glitch-soc Web UI
...
Fixes #1298
2020-03-11 23:25:15 +01:00
ThibG
96df38d753
[Glitch] Add support for links to statuses in announcements to be opened in web UI
...
Port a67fd2fbe1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:46:15 +01:00
Mélanie Chauvel (ariasuni)
8dede28b01
[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI
...
Port 399fa48f8e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:45:36 +01:00
Bèr Kessels
96b18a705f
[Glitch] Code style improvements in JavaScript
...
Port b5d7ec71ef
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)
ce8d13d2fb
[Glitch] Change description of privacy levels to be more intuitive in web UI
...
Port 263bedff9e
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)
5325a14430
[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI
...
Port 38a26d5314
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:19:08 +01:00
ThibG
71d28dcfb9
[Glitch] Fix too large announcements not being scrollable in web UI
...
Port 1eae25af56
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:16:43 +01:00
koyu
6a7c4c26f0
[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI
...
Port e899e0dc98
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:15:11 +01:00
ThibG
d668512e64
[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI
...
Port 03d2704430
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 20:14:20 +01:00
Mélanie Chauvel (ariasuni)
787b4748dc
[Glitch] Add tooltips to audio/video player buttons
...
Port 635812f9ea
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08 19:59:42 +01:00
ThibG
aaee86e276
[Glitch] Fix /web
redirecting to /web/web
in web UI
...
Port 13c00dc42c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-25 14:30:43 +01:00
Thibaut Girka
c4b1ae964b
Document alt+enter
2020-02-22 23:07:29 +01:00
Thibaut Girka
b4be41e4c4
[Glitch] Add source-mapped stacktrace to error message in web UI
...
Port 729fe5bfd6
to glitch-soc
2020-02-19 23:31:15 +01:00
ThibG
2f977ac8f3
[Glitch] Fix old browsers crashing because of missing finally
polyfill in web UI
...
Port 3cdaa34783
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-19 23:10:37 +01:00
Thibaut Girka
f9a919ab3e
Fix clicking on the “TOOT” button send bogus visibility parameter
2020-02-16 00:10:45 +01:00
Thibaut Girka
23bf32d2b5
Fix alt+enter changing visibility setting without sending toot when toot is empty
2020-02-14 22:38:24 +01:00
Thibaut Girka
b93d4d2b2a
Fix boosting private toots in detailed view
2020-02-09 22:15:49 +01:00
Eugen Rochko
01a6fa0771
[Glitch] Fix unread indicator on announcements not being aligned with text in web UI
...
Port d85b330558
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-09 12:30:29 +01:00
ThibG
b7008b2cd5
[Glitch] Fix native share button not being displayed for unlisted toots
...
Port 2dae01ff25
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-09 12:29:51 +01:00
ThibG
d0a1423daf
[Glitch] Fix dates (without time) being rendered as datetimes in public pages
...
Port f7deab10a5
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-06 21:41:50 +01:00
fuyu
0c266be79b
[Glitch] Don't display toggle reveal button in video modal when full screen
...
Port b8db3b4cdf
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-06 21:39:26 +01:00
Thibaut Girka
c6b587b115
Fix poll compose form being broken on single-column layout
2020-02-03 11:56:31 +01:00
ThibG
e571f7005e
[Glitch] Change how unread announcements are handled
...
Port 99cf92a3cf
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:31:32 +01:00
Sasha Sorokin
f0aef12b12
[Glitch] Add "Show thread" button to public profiles
...
Port 864c9a2141
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:30:13 +01:00
Eugen Rochko
77e5732816
[Glitch] Fix mascot being too large, and a code style issue
...
Port 7774ac36e5
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:27:51 +01:00
Thibaut Girka
947645c355
When submitting markers, use last displayed notification, not last received one
2020-02-01 19:53:01 +01:00
Thibaut Girka
8c5689775f
Fetch last read notification id to update unread notification count on load
2020-02-01 19:53:01 +01:00
Thibaut Girka
26c449515e
Add support for xmpp: and magnet: URIs to misleading link detection code
2020-01-28 20:25:56 +01:00
Eugen Rochko
4dc279fb9e
[Glitch] Fix design of announcements in admin UI
...
Port 6c643bed6a
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28 19:17:47 +01:00
Eugen Rochko
3ecc114ec6
[Glitch] Change announcements to be collapsed on page load in web UI
...
Port 5bc109eeb7
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28 19:17:06 +01:00
Eugen Rochko
f64a9ae775
[Glitch] Change number animations direction based on decrease or increase
...
Port d67f2c1c25
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:06:03 +01:00
Eugen Rochko
4a882562c6
[Glitch] Add animations to announcement reactions
...
Port 1130c5167c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:05:37 +01:00
ThibG
51bd2205a1
[Glitch] Change last_status_at to be a date, not datetime
...
Port d9cdd58423
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:03:24 +01:00
Eugen Rochko
c7cdca7afb
[Glitch] Fix link colors in announcements
...
Port 3ae0b03603
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:01:46 +01:00
Eugen Rochko
a20b14b6b4
[Glitch] Add streaming API updates for announcements being modified or deleted
...
Port dd68e44cfa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:01:06 +01:00
ThibG
042964971f
[Glitch] Fix status overflowing in report dialog
...
Port 8f37f20ff9
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 15:59:25 +01:00
Thibaut Girka
9f924a3283
Refactor notifications cleaning mode
2020-01-26 14:55:03 +01:00
ThibG
f6b0fc204d
[Glitch] Fix “new items glow” being displayed above settings and announcements
...
Port 234f1be486
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 20:05:36 +01:00
ThibG
2b7a2e2b7a
[Glitch] Fix spurious error and incorrect state change when adding a reaction twice
...
Port 1c85e84b4e
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 19:53:04 +01:00
ThibG
17b9f1efb7
[Glitch] Improve announcements design
...
Port ab01849287
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 16:57:03 +01:00
Eugen Rochko
8caa94f566
[Glitch] Add limit of 8 different reaction types per announcement
...
Port 150c13c4e0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:36:27 +01:00
Eugen Rochko
ac320c111c
[Glitch] Add number animations
...
Port 8ca6f2d3b2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:36:27 +01:00
Eugen Rochko
c97d41eada
[Glitch] Change font size of announcements to be the same as statuses
...
Port b169901439
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:21:13 +01:00
Sasha Sorokin
481b2e5df4
[Glitch] Fix unlocalized dropdown button title
...
Port 51f376aee3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:20:05 +01:00
Thibaut Girka
4c312ad79d
Rename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream
2020-01-25 10:17:13 +01:00
Ben Lubar
cac596b275
[Glitch] minor server-sent events fixes
...
Port front-end changes from 6598ab989b
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-25 10:13:56 +01:00
Thibaut Girka
17f0a69cc8
Fix emoji button styling in glitch-soc
2020-01-24 16:45:29 +01:00
Eugen Rochko
30470b53d6
[Glitch] Add announcements
...
Port front-end changes from f95fd62bac
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-24 16:45:29 +01:00
ThibG
4668a06255
[Glitch] Add “account timeline” filter category
...
Port JS changes from 691b14aaf8
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-24 15:27:15 +01:00
ThibG
d1498df663
[Glitch] Fix unfollow confirmations in account directory
...
Port 5416a793c1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-24 15:25:48 +01:00
Ben Lubar
8a33acc6a9
[Glitch] Add transparent support for EventSource streaming.
...
Port ad7f9fe438
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-24 15:25:19 +01:00
Thibaut Girka
6719b9daa5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream removed an unused function in code that has
been refactored a bit. Removed that function in the corresponding
places.
2020-01-20 18:31:11 +01:00
Thibaut Girka
aa29b38f7c
Add glitch-soc front-end support for many upstream translations
2020-01-20 16:43:18 +01:00