Jeremy Kescher
|
24e9a23fe6
|
Merge remote-tracking branch 'upstream/main' into develop, bump version
Conflicts:
- .github/workflows/build-image.yml
We're not building an image with GitHub Actions.
|
2023-03-17 07:27:28 +01:00 |
|
Jeremy Kescher
|
ddc4022845
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
# app/lib/feed_manager.rb
# app/services/batched_remove_status_service.rb
# lib/mastodon/feeds_cli.rb
|
2023-03-15 14:13:29 +01:00 |
|
Rodion Borisov
|
32418f0ff3
|
[Glitch] Center the text itself in upload area
Port a52ccd7ad9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-03-15 09:33:48 +01:00 |
|
PauloVilarinho
|
17fb58bff3
|
[Glitch] add modal message when editing toot
Port 8770473dbb to glitch-soc
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-03-15 09:33:14 +01:00 |
|
Jeremy Kescher
|
047286d54e
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
|
2023-03-06 16:33:21 +01:00 |
|
Claire
|
7f3b0dedeb
|
Refactor glitch-soc rich text SCSS
|
2023-03-05 21:31:45 +01:00 |
|
Christian Schmidt
|
1317553f3a
|
[Glitch] Only offer translation for supported languages
Port 5a8c651e8f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-03-05 21:19:04 +01:00 |
|
Terry Garcia
|
9a1bd1c3e9
|
[Glitch] Switched bookmark and favourites around
Port a1347f456e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-03-05 21:07:55 +01:00 |
|
Claire
|
03ac84b0f4
|
[Glitch] Fix duplicate “Publish” button on mobile
Port b55fc883b6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-03-05 21:07:10 +01:00 |
|
Claire
|
bb4e211c86
|
New Crowdin updates (#2118)
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
|
2023-03-05 20:38:18 +01:00 |
|
Christian Schmidt
|
0e476f3c4f
|
[Glitch] Add lang attribute to media and poll options
Port d3eefead30 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-03-05 17:52:53 +01:00 |
|
Jeremy Kescher
|
7318b74ebf
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
# app/models/notification.rb
# config/locales/simple_form.de.yml
|
2023-03-05 12:34:16 +01:00 |
|
Claire
|
b91756fd4d
|
Move misc rules from components/index.scss to components/misc.scss
|
2023-02-25 23:47:21 +01:00 |
|
Claire
|
cc94cc86ae
|
Fix glitch-soc SCSS code style and refactor closer to upstream
|
2023-02-25 23:46:23 +01:00 |
|
Christian Schmidt
|
b632c5a55a
|
[Glitch] Add lang attribute to preview card
Port 8000a8f230 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-25 14:43:57 +01:00 |
|
Tim Lucas
|
28cb77bd07
|
[Glitch] Increase contrast of upload progress background
Port f4f91bc295 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-25 14:43:24 +01:00 |
|
Botao Wang
|
56bec60f25
|
[Glitch] Fix sidebar cut-off on small screens in admin UI
Port 7adde24a95 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-25 14:40:29 +01:00 |
|
Claire
|
31455f05fb
|
[Glitch] Add lang tag to native language names in language picker
Port 7207a98d39 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-25 14:37:05 +01:00 |
|
Renaud Chaput
|
81ef21a0c8
|
[Glitch] Rename JSX files with proper .jsx extension
Port 44a7d87cb1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-25 14:35:31 +01:00 |
|
Claire
|
859eb01aac
|
Fix building vanilla flavor after JSX change
|
2023-02-25 14:28:59 +01:00 |
|
Jeremy Kescher
|
0e634397c3
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
|
2023-02-21 00:40:08 +01:00 |
|
Claire
|
8c8358b3cf
|
[Glitch] Fix focus point of already-attached media not saving after edit
Port b2283b6838 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-19 10:54:04 +01:00 |
|
Christian Schmidt
|
229ab559dc
|
[Glitch] Fix bad type for spellCheck attribute
Port cde13349cb to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-19 10:53:44 +01:00 |
|
Nick Schonning
|
6fdd596cc8
|
[Glitch] Enable ESLint Promise plugin defaults
Port 5e1c0c3d94 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-19 10:53:18 +01:00 |
|
Jeremy Kescher
|
4a6cc45f9d
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
|
2023-02-18 22:38:53 +01:00 |
|
Claire
|
4c68189d2b
|
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
|
2023-02-18 22:05:11 +01:00 |
|
Nick Schonning
|
ea9a1d79df
|
[Glitch] Upgrade to Stylelint 15 with Prettier
Port 0c9d455ea5 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-18 16:02:12 +01:00 |
|
Nick Schonning
|
7e64eef73b
|
[Glitch] Enable ESLint no-useless-escape
Port db2c58d47a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-18 16:02:12 +01:00 |
|
Claire
|
587f6b3b06
|
[Glitch] Enable ESLint import recommended rules
Port eddfb33dfe to glitch-soc
|
2023-02-18 16:02:12 +01:00 |
|
Claire
|
2be88d1930
|
New Crowdin updates (#2111)
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc
|
2023-02-18 11:16:30 +01:00 |
|
Jeremy Kescher
|
8de39432a9
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
# app/javascript/flavours/glitch/actions/interactions.js
# config/initializers/rack_attack.rb
# config/locales/en_GB.yml
|
2023-02-17 00:26:21 +01:00 |
|
Dean Bassett
|
40fc917a86
|
[Glitch] Fix case-sensitive check for previously used hashtags
Port 4da5f77d92 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-13 20:05:36 +01:00 |
|
Claire
|
58291b31fa
|
[Glitch] Fix attached media uploads not being cleared when replying to a post
Port bae17ebe5e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-13 20:04:45 +01:00 |
|
Dean Bassett
|
ee42505452
|
fix hashtag ordering (#2107)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
|
2023-02-12 18:58:02 +01:00 |
|
Claire
|
8eb74c88ec
|
New Crowdin updates (#2100)
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
|
2023-02-12 18:16:08 +01:00 |
|
cadars
|
5e37906083
|
[Glitch] Add scrolling to Compare history modal
Port e8cb3ee827 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-09 13:03:41 +01:00 |
|
Christian Schmidt
|
2dfbdc3f9d
|
[Glitch] Show spinner while loading follow requests
Port c1f32c9c14 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-09 13:02:32 +01:00 |
|
Christian Schmidt
|
8fd6c36243
|
[Glitch] Spell check input fields
Port 67744ee779 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-09 12:59:48 +01:00 |
|
Eugen Rochko
|
95e2cab22e
|
[Glitch] Add setting for status page URL
Port 8f590b0a21 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-09 12:58:11 +01:00 |
|
Claire
|
fa433ac5a6
|
Further JS code style changes
|
2023-02-04 22:31:47 +01:00 |
|
Claire
|
3c451cf88f
|
[Glitch] Fix useless regular-expression character escape detected by CodeQL
|
2023-02-03 21:14:41 +01:00 |
|
Akira Ouchi
|
8ce02aa6e8
|
[Glitch] autofocus the compose form again on /share
Port e73b55184b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-03 20:58:15 +01:00 |
|
Nick Schonning
|
372fa3fe36
|
[Glitch] Update hasOwnProperty calls for ESLint
Port 131e6403cc to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-03 20:57:47 +01:00 |
|
Claire
|
155424e52f
|
[Glitch] Run eslint --fix
I don't like it changing files this way, but it's basically what
c49213f0ea and a few others did.
|
2023-02-03 20:52:07 +01:00 |
|
Nick Schonning
|
ed7cb79723
|
[Glitch] Remove extra semicolons with ESLint autofix
Port d9088ef327 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-03 19:58:44 +01:00 |
|
TAKAHASHI Shuuji
|
1d5395498d
|
[Glitch] chore: remove intersection-observer for old Safari support
Port 9cdd643564 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-03 19:24:32 +01:00 |
|
Christian Schmidt
|
fb9c786baf
|
[Glitch] Add lang attribute to image description textarea and poll option field
Port 2a4f2216d6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-03 19:23:36 +01:00 |
|
Claire
|
ec26f7c1b1
|
New translations en.json (German) (#2097)
[ci skip]
|
2023-01-28 10:20:55 +01:00 |
|
Jeremy Kescher
|
27fdb81b65
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-01-27 00:36:49 +01:00 |
|
Claire
|
d9a078e6d3
|
Add role badges to WebUI (#2096)
* [Glitch] Add role badges to WebUI
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Ensure role name remains readable
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-01-26 23:35:23 +01:00 |
|