Commit graph

1822 commits

Author SHA1 Message Date
Jeremy Kescher
06b9e14a03
Enable editing in web interface 2022-06-23 00:08:40 +02:00
Jeremy Kescher
3ad7552b1c
Merge remote-tracking branch 'upstream/main' into develop 2022-06-21 17:16:49 +02:00
Eugen Rochko
353e2c5d84 [Glitch] Fix contrast of some elements with new brand colors
Port 0391b2a603 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-21 09:00:43 +02:00
Jeremy Kescher
1e066f0108
Merge remote-tracking branch 'upstream/main' into develop 2022-06-16 22:41:04 +02:00
Claire
7a75bce1b4
Fix checkmark on interaction buttons with larger fonts (#1799)
Fixes #1796
2022-06-16 15:37:59 +02:00
Jeremy Kescher
0f889d3828
Update blobCat emoji URL in emoji picker 2022-06-14 00:20:43 +02:00
Jeremy Kescher
bad37d4102
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	public/android-chrome-192x192.png
#	public/apple-touch-icon.png
#	public/browserconfig.xml
#	public/favicon.ico
#	public/mstile-150x150.png
2022-06-13 23:47:34 +02:00
Claire
f938afee72 [Glitch] Fix logo gradient not working on some Safari and Blink-based browsers
Port 37cd984acf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-11 00:09:20 +02:00
Eugen Rochko
b31c32fd61 [Glitch] Change brand color and logotypes
Port SCSS changes from 45aa5781ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-11 00:09:20 +02:00
Jeremy Kescher
a2383b89e2
Merge remote-tracking branch 'upstream/main' 2022-06-10 23:11:12 +02:00
Eugen Rochko
d064476c4a [Glitch] Add administrative webhooks
Port SCSS changes from a2871cd747 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-10 17:04:02 +02:00
Jeremy Kescher
7c64837454
Merge remote-tracking branch 'upstream/main' 2022-06-06 12:19:57 +02:00
Claire
3d841eba69
Fix language indicator text color (#1795)
Fixes #1794
2022-06-06 12:05:57 +02:00
Jeremy Kescher
394a536ae0
Create distinctions between glitch-soc and Catstodon.
Version suffix and string changes.
2022-06-05 10:15:26 +02:00
Jeremy Kescher
356e199cbe
Merge remote-tracking branch 'upstream/main' 2022-06-03 22:01:39 +02:00
Eugen Rochko
7bf37551c8 [Glitch] Change label of publish button to be "Publish" again
Port 628c177ebe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-02 11:11:26 +02:00
Claire
e94c8b9e29 [Glitch] Change language to be carried over on reply
Port 14d7cf39f4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-02 11:09:19 +02:00
Claire
444ac6d6e9 [Glitch] Remove unnused otherAccounts property
Port 2f6416db53 to glitch-soc + other related cleanup

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-02 11:08:05 +02:00
Jeong Arm
1db92b510d [Glitch] Add lang html attr to each posts
Port dc7e2985e6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-02 10:58:54 +02:00
Jeong Arm
bbda3592d8
Translate: Korean (#1790)
* Translate Korean: glitch frontend

* Translate Korean: backend

* Remove unused string

* Fix yaml
2022-05-31 11:41:30 +02:00
Jeremy Kescher
e695bed558
Merge remote-tracking branch 'upstream/main' 2022-05-27 17:42:15 +02:00
Claire
53c89ee44b
Add language indicator icon and local settings for status icons (#1788)
* Add language indicator

* Add local settings for status icons

* Switch to text icon for language
2022-05-27 16:34:29 +02:00
Jeremy Kescher
360d5fb092
Merge remote-tracking branch 'upstream/main' 2022-05-25 17:06:22 +02:00
Claire
444b650094
Add checkmark on top of status icon buttons when they are active (#1783) 2022-05-25 15:09:45 +02:00
Claire
3fd2aadb23
Various code cleanup (#1782)
* Remove duplicate in_chosen_languages definition

* Use `DEFAULT_FIELDS_SIZE` instead of `MAX_FIELDS` to reduce code differences with upstream

* Remove duplicate annotation

* Fix incorrect cross-flavor imports

* Remove deprecated `hide_network` setting (replaced by account column)

* Remove unused KeywordMutesHelper

* Remove trailing spaces

* Remove commit_hash from InstancePresenter, as it has been unused since mid-2017
2022-05-25 12:27:11 +02:00
Jeremy Kescher
66426afd31
Merge remote-tracking branch 'upstream/main' 2022-05-24 17:19:20 +02:00
Claire
4ab3ad3bef
Fix crash in glitch-soc search results when Elasticsearch is disabled (#1780) 2022-05-24 16:10:18 +02:00
Yamagishi Kazutoshi
228ec75048 [Glitch] Fix languages dropdown on light theme
Port e925b06721 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-24 14:23:03 +02:00
Jeremy Kescher
4d1c07e80f
Merge remote-tracking branch 'upstream/main' 2022-05-17 21:11:48 +02:00
Eugen Rochko
2e5fb45be5 [Glitch] Add language dropdown to compose in web UI
Port 0cdb077570 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-16 23:06:29 +02:00
Jeremy Kescher
07c2a11959
Merge remote-tracking branch 'upstream/main' 2022-05-15 21:32:31 +02:00
Claire
dc350be6f5
Use upstream's settings for CW auto-expand and column swiping (#1770)
* Use Mastodon server-side settings for automatically expanding toots with CWs

* Add modal warning about settings changes

* Use Mastodon server-side settings for disabling swiping
2022-05-15 17:30:40 +02:00
Jeremy Kescher
16c8a45c81
Merge remote-tracking branch 'upstream/main' 2022-05-11 17:32:34 +02:00
Eugen Rochko
6fb837aa1d [Glitch] Add limited attribute to accounts in REST API and a warning in web UI
Port b4d373a3df to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 11:59:08 +02:00
Eugen Rochko
bb1a3e902d [Glitch] Remove Keybase integration
Port 7de0ee7aba to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 11:09:20 +02:00
Claire
b356a995c1 [Glitch] Fix block/mute lists showing a follow button when unblocking a user (#18364)
Port 662ed53c18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 09:44:27 +02:00
Jeremy Kescher
89b01152a7
Merge remote-tracking branch 'upstream/main' 2022-05-09 06:52:28 +02:00
Claire
dc1685c1e6 [Glitch] Fix streaming notifications not using quick filter logic
Port f17e73da09 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-08 21:05:56 +02:00
Claire
703c7ae4b9 [Glitch] Fix floating action button obscuring last element
Port 5a448d0d71 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-08 21:05:21 +02:00
Jeremy Kescher
4bfc4068aa
Merge remote-tracking branch 'upstream/main' 2022-05-04 17:40:13 +02:00
Claire
fa22b8ed22 Move DM conversation/timeline tab to column settings switch 2022-05-03 11:45:23 +02:00
Claire
3dd4f40a0e Fix backend terms link not being used 2022-05-03 11:10:58 +02:00
Claire
3093ed1b7d Refactor visibility icon using VisibilityIcon 2022-05-03 11:04:09 +02:00
Claire
e4bec702ac [Glitch] Rename toots to posts in various places, add or reword DM warnings
Port part of be0bc9acbf and 7e244879fe
to glitch-soc
2022-05-03 10:59:23 +02:00
Jeremy Kescher
8d34a2c2f5
Change emoji picker icon to :blobCat:. 2022-05-02 01:20:49 +02:00
Claire
cb9a919ff2 Remove “I don't like it” option from report modal 2022-05-01 21:58:20 +02:00
Eugen Rochko
277c3fa816 [Glitch] Fix being able to scroll away from the loading bar in web UI
Port a8e27ac4d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-01 16:57:35 +02:00
Claire
01c2f47b7f [Glitch] Fix empty “Server rules violation” report option
Port eed5a4bf9c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-04-28 23:43:49 +02:00
Claire
bb12af7250 Swap position of media attachments and polls 2022-04-20 22:07:13 +02:00
Claire
a8d89aabb2 [Glitch] Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream
Port a39bf04fe6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-04-08 20:05:33 +02:00