Commit graph

1841 commits

Author SHA1 Message Date
Jeremy Kescher
40d8a08a1e
Merge remote-tracking branch 'upstream/main' into develop 2022-08-01 18:15:52 +02:00
prplecake
991349e6e2
[Glitch] Add ability to follow hashtags in web UI 2022-07-30 20:00:00 -05:00
Mélanie Chauvel
f174ce1048
Use slightly more margin between post buttons (under compose box) (#1816) 2022-07-27 19:17:15 +02:00
Jeremy Kescher
3bf3d99778
Merge remote-tracking branch 'upstream/main' into develop 2022-07-25 17:09:32 +02:00
Claire
18346f4044 Add option to share CW toggle state across instances of a post 2022-07-25 11:57:09 +02:00
Claire
eacde1a130 Regroup CW unfolding settings in their own section 2022-07-24 17:28:47 +02:00
Jeremy Kescher
ed0db58c25
Merge remote-tracking branch 'upstream/main' into develop 2022-07-24 14:27:27 +02:00
Claire
a5f81e1abd Improve interaction between out-of-CW attachments and collapsed toots 2022-07-24 13:16:03 +02:00
Claire
db5b44330d Add explanation for some options in the local settings dialog 2022-07-24 11:11:38 +02:00
Claire
3f4e27ab6f Add local setting toggle to move media attachments outside CWs
Fixes #1812
2022-07-24 11:10:49 +02:00
Jeremy Kescher
ed778cac65
Merge remote-tracking branch 'upstream/main' into develop 2022-07-23 14:51:03 +02:00
Eugen Rochko
1ceebf2710 [Glitch] Change hashtag numbers to have clearer labels in web UI
Port f5d8501138 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:41:39 +02:00
Yamagishi Kazutoshi
969d805e86 [Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
Port d5ca204e89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:39:57 +02:00
Jeremy Kescher
8f969312f7
Merge remote-tracking branch 'upstream/main' into develop 2022-07-20 17:28:29 +02:00
Jeong Arm
7205098ccf [Glitch] Fix badge color not affected
Port f248d95be2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-19 16:11:40 +02:00
Jeremy Kescher
791363f1d2
Merge remote-tracking branch 'upstream/main' into develop 2022-07-18 00:01:32 +02:00
Jeremy Kescher
172e73535e
Make the emoji picker blob cat a static asset 2022-07-12 00:55:35 +02:00
Jeremy Kescher
62e16b7f16
Allow higher-resolution images (4096x4096) 2022-07-07 00:21:05 +02:00
Eugen Rochko
30e7836a19 [Glitch] Add customizable user roles
Port front-end changes from 44b2ee3485 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-05 11:35:32 +02:00
Jeremy Kescher
241aa5a98e
Merge remote-tracking branch 'upstream/main' into develop 2022-06-29 22:35:47 +02:00
Eugen Rochko
485b43ed7e [Glitch] Add notifications for new reports
Port 2936f42a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 13:13:10 +02:00
Claire
f218e633b4 [Glitch] [SSR only] Revamp post filtering system
Port CSS and JS for Server-Side Rendered pages from 02851848e9

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 11:35:28 +02:00
mayaeh
97f81577f1 [Glitch] Fixed the setting page's logo that is not displayed on the smartphone
Port 65ad589848 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 11:21:58 +02:00
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