Thibaut Girka
8753e5317f
Better distinguish titles from text
6 years ago
Thibaut Girka
3631c3314a
Remove extra margin in paragraphs inside blockquotes
6 years ago
Thibaut Girka
9b86707b1e
Make bold text bolder
6 years ago
Thibaut Girka
5a8495dabe
Remove margins around `p` tags in lists
6 years ago
Thibaut Girka
ef249a2718
Rename status__text to status__content__text for consistency with upstream
6 years ago
Thibaut Girka
adbb174c9c
Fix status header display in toot mobile menu
6 years ago
Thibaut Girka
ef1504d625
Fix upload progressbar when image resizing is involved
6 years ago
Thibaut Girka
ffab9d626a
Hide media upload form if no media are attached
6 years ago
Thibaut Girka
416aa832e5
Fix file upload
6 years ago
Thibaut Girka
3d722b0c4e
Fix settings modal
6 years ago
Thibaut Girka
27e8354914
Add support for lists in statuses
6 years ago
Thibaut Girka
659f972bed
Do not switch to italic for status media buttons
6 years ago
Thibaut Girka
2e3640ecbb
Accept richer text from remote statuses
...
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
6 years ago
kedama
039e35560c
[Glitch] Fix modal items cannot scroll on touch devices
...
Port d763d39d26
to glitch-soc
6 years ago
Thibaut Girka
a9eaa780f5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
6 years ago
Thibaut Girka
c3fa4e8e07
Fix ReferenceError in dropdown
6 years ago
Thibaut Girka
d779ec1f0e
Fix broken reference to handleSubmit
6 years ago
Thibaut Girka
e949861176
Cleanup
6 years ago
Thibaut Girka
faff152ae5
Move ComposerPublisher to Compose
6 years ago
Thibaut Girka
df951c319c
Add OptionsContainer
6 years ago
Thibaut Girka
14028655df
Move composer Dropdown from features/composer to features/compose
6 years ago
Thibaut Girka
4c6221929f
Move ComposerTextareaIcons to TextareaIcons
6 years ago
Thibaut Girka
47faf47ed5
ComposerTextarea → AutosuggestTextarea
6 years ago
Thibaut Girka
a243567a3e
ComposerUploadForm → UploadForm + UploadFormContainer
6 years ago
Thibaut Girka
c5f49a92dc
Move PollForm from features/composer to features/compose
6 years ago
Thibaut Girka
f1a22e33e2
Inline spoiler input
6 years ago
Thibaut Girka
8fd599fb40
ComposerReply → ReplyIndicator
6 years ago
Thibaut Girka
f72af5794d
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
6 years ago
Thibaut Girka
1bc4b8a0a5
features/composer/index.js → ComposeForm
6 years ago
Thibaut Girka
281a82d878
DrawerHeader → Header + HeaderContainer
6 years ago
Thibaut Girka
9a2f10fe8b
DrawerAccount → NavigationBar + NavigationContainer
6 years ago
Eugen Rochko
9b9816aba6
[Glitch] Show suggested follows on search screen in mobile layout
...
Port ad510db3a1
to glitch-soc
6 years ago
Thibaut Girka
149aa07409
DrawerResults → SearchResults + SearchResultsContainer
6 years ago
Thibaut Girka
67771e6d65
Rework DrawerResults to make them closer to upstream
6 years ago
Thibaut Girka
ab3e8fc542
Move DrawerSearch to Search + SearchContainer
6 years ago
Thibaut Girka
c92ab35b19
Inline DrawerSearchPopout in DrawerSearch
6 years ago
Thibaut Girka
c19b983986
Refactor a bit DrawerSearch to make it closer to upstream
6 years ago
Thibaut Girka
eed2c9dd44
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
6 years ago
ThibG
0e78862b61
Allow switching between singe-option and multiple-option polls ( #10603 )
6 years ago
kedama
d763d39d26
Fix modal items cannot scroll on touch devices ( #10605 )
6 years ago
ThibG
bdec58b514
Minor code cleanup ( #10613 )
6 years ago
Yamagishi Kazutoshi
80c9cb0eb3
Add hi.json ( #10573 )
6 years ago
partev
d210d0a655
Update hy.json ( #10591 )
6 years ago
Jessica
01b1c377b1
Animate avatar GIFs on-hover on public profiles ( #10549 )
...
* Third time is the charm?
* Use full asset URL for data-static and data-original
̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
6 years ago
jeroenpraat
951f8d5b44
Update NL (Dutch) translation ( #10601 )
...
* Update NL language strings
Have to do it this way, cause this file is locked on Weblate
* fix
* Update simple_form.nl.yml
* Update nl.yml
6 years ago
ThibG
6e620dcab1
Use correct local names for fonts ( #10594 )
6 years ago
Sho Kusano
3e6c7f3617
Configrationable repository url ( #10600 )
...
* config: Add GITHUB_REPOSITORY for repository name
* config: Add SOURCE_BASE_URL for repository url
* Show source_url and repository name on getting started
6 years ago
Thibaut Girka
8b7b65e995
[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
...
Port 7f75792bf3
to glitch-soc
6 years ago
Thibaut Girka
268417daf3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
e3c1472040
Shift+click on column Back button to return to last pinable column
6 years ago
Thibaut Girka
8d57c0e70e
When selecting a toot via keyboard, ensure it is scrolled into view
6 years ago
Thibaut Girka
fbec0edf08
Fix opening/closing gifv sometimes making the timeline scroll
6 years ago
ThibG
7f75792bf3
Allow modal secondary button to shrink and allow wider confirmation modals ( #10586 )
...
Fixes #10531
6 years ago
Renato "Lond" Cerqueira
d305d8747d
Add new pt-br translations ( #10564 )
6 years ago
Thibaut Girka
2f422b708f
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Evgeny Petrov
5dd14dfded
i18n: Russian localization update ( #10515 )
...
* i18n: Updated ru.json for Russian language
* i18n: Updated ru.yml
* Normalize ru.yml
* i18n: Updated simple_form.ru.yml
* i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings
* Added new strings to ru.json
* Deleted unused (?) string
* i18n: Added recent strings (Settings refactor)
6 years ago
Eugen Rochko
793b0513eb
Weblate translations (2019-04-10) ( #10545 )
...
* Translated using Weblate (Occitan)
Currently translated at 95.7% (780 of 815 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Greek)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (French)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Arabic)
Currently translated at 97.4% (372 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (French)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Thai)
Currently translated at 75.4% (288 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/
* Translated using Weblate (German)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/
* Translated using Weblate (Slovak)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/
* Translated using Weblate (Persian)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Kazakh)
Currently translated at 99.0% (378 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* i18n-tasks normalize
* yarn manage:translations
* Fix empty string in Occitan
6 years ago
Aditoo17
4e59f709aa
I18n: Final Czech translation 🇨🇿 ( #10542 )
...
* I18n: Update Czech translation
* I18n: Why do you want to join translation
* I18n: Translating a bunch of more stuff
6 years ago
Marek Ľach
3dea62bfa2
Updates the grammar of the SK translation ( #10541 )
6 years ago
Eugen Rochko
92e1950194
[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI
...
Port 56f29c38b6
to glitch-soc
6 years ago
Eugen Rochko
fa4b51a110
[Glitch] Add "why do you want to join" field to invite requests
...
Port SCSS changes from 8b69a66380
to glitch-soc
6 years ago
Thibaut Girka
5085559b15
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
6 years ago
Yağızhan
2cb16c20a6
Fixed terrible grammar and translated the most ( #10527 )
...
The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.
I'll come back and finish the translation.
6 years ago
Eugen Rochko
8b69a66380
Add "why do you want to join" field to invite requests ( #10524 )
...
* Add "why do you want to join" field to invite requests
Fix #10512
* Remove unused translations
* Fix broken registrations when no invite request text is submitted
6 years ago
Eugen Rochko
56f29c38b6
Fix glitched out "not found" message for non-existing profiles in web UI ( #10517 )
6 years ago
Quentí
ba1a78d168
[i18n] Update and correction ( #10511 )
...
* [i18n] Update and correction
* Update oc.json
* Update oc.json
6 years ago
Thibaut Girka
cb410f80a4
Add column title to “Favourited by” and “Boosted by” columns
6 years ago
ashleyhull-versent
ac071d65de
[Glitch] Duplicate values
...
Port bd365cc38b
to glitch-soc
6 years ago
Eugen Rochko
df42de68e5
[Glitch] Port SCSS changes from "Improve blocked view of profiles"
...
Port public pages SCSS changes from 67b3b62b98
6 years ago
Thibaut Girka
f5f6d23d55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
6 years ago
koyu
3f036ac6b8
Updated German locales ( #10505 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
6 years ago
Alix Rossi
6e111152e0
i18n: Update Corsican translations ( #10504 )
6 years ago
Aditoo17
ae58bbd705
i18n: Update Czech translation ( #10506 )
6 years ago
Jeong Arm
619bbc23ef
Translate Korean ( #10499 )
6 years ago
mayaeh
a265696991
i18n: Update Japanese translations ( #10494 )
...
* Update Japanese translations
* Update Japanese translations.
6 years ago
Eugen Rochko
67b3b62b98
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 120544067f
.
* Revert "Hide blocking accounts from blocked users (#10442 )"
This reverts commit 62bafa20a1
.
* Improve blocked view of profiles
- Change "You are blocked" to "Profile unavailable"
- Hide following/followers in API when blocked
- Disable follow button and show "Profile unavailable" on public profile as well
6 years ago
Marek Ľach
78a8a99b0b
Improve sk translation further ( #10484 )
...
* Further improving Slovak translation
* Update sk.json
6 years ago
ashleyhull-versent
2b68fe5442
tinyfix 2: unrequired arguments ( #10471 )
...
* unrequired argument
* unrequired argument
6 years ago
marcin mikołajczak
4be7952892
i18n: Update Polish translation ( #10479 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
6 years ago
Marek Ľach
e0137c5884
Updates the Slovak translation ( #10477 )
...
* Update sk.json
* Update sk.json
* Update sk.json
6 years ago
jeroenpraat
48a52c9372
Dutch (nl) translation ( #10474 )
...
* Translation Dutch
* Update activerecord.nl.yml
* Update devise.nl.yml
* Update nl.yml
* Update nl.yml
* Update devise.nl.yml
* Update nl.yml
6 years ago
ashleyhull-versent
bd365cc38b
Duplicate values ( #10470 )
6 years ago
ThibG
30500dff7c
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ThibG
be6885eb93
[Glitch] Update poll remaining time just like with status timestamps
...
Port daab45d4ae
to glitch-soc
6 years ago
Thibaut Girka
1682ac5717
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/following_accounts_controller.rb
Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
Some code has been change upstream, but it has been
moved to app/javascript/core/settings.js in glitch-soc.
Applied the changes there.
6 years ago
spla
26bd9fa508
i18n: update Catalan translation ( #10458 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
6 years ago
Thibaut Girka
14bad3f472
Do not handle clicks in detailed status content
6 years ago
ThibG
daab45d4ae
Update poll remaining time just like with status timestamps ( #10466 )
6 years ago
ThibG
d07b0c038f
Hopefully fix input text selection quirks on iOS ( #10463 )
...
Fix #10448 (hopefully)
6 years ago
Jeong Arm
f984f2ea4e
Esperanto translations ( #10461 )
...
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
6 years ago
Renato "Lond" Cerqueira
83190fffc7
Re-dd PT-br translations ( #10459 )
6 years ago
spla
3f75b0929e
i18n: update catalan translations ( #10455 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
6 years ago
Aditoo17
0705e4b177
I18n: Improve Czech translation ( #10454 )
6 years ago
Thibaut Girka
12dae9d583
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
6 years ago
ThibG
62bafa20a1
Hide blocking accounts from blocked users ( #10442 )
...
* Revert "Add indication that you have been blocked in web UI (#10420 )"
This reverts commit bd02ec6daa
.
* Revert "Add `blocked_by` relationship to the REST API (#10373 )"
This reverts commit 9745de883b
.
* Hide blocking accounts from search results
* Filter blocking accouts from account followers
* Filter blocking accouts from account's following accounts
* Filter blocking accounts from “reblogged by” and “favourited by” lists
* Remove blocking account from URL search
* Return 410 on trying to fetch user data from a user who blocked us
* Return 410 in /api/v1/account/statuses for suspended or blocking accounts
* Fix status filtering when performing URL search
* Restore some React improvements
Restore some cleanup from bd02ec6daa
* Refactor by adding `without_blocking` scope
6 years ago
mayaeh
abdf225353
i18n: Update Japanese translations ( #10427 )
...
* Update Japanese translations.
run yarn manage:translations && i18n-tasks add-missing
* Update Japanese translations.
* Fix mistake
* Change to be concise.
6 years ago
Eugen Rochko
b9b472d519
[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile
...
Port 79227d153b
to glitch-soc
6 years ago
Eugen Rochko
59551ece31
[Glitch] Fix search in web UI not setting a limit, restore limit of 10
...
Port 379c3e237f
to glitch-soc, but changing
the 5 limit to 10, since that's what we had previously
6 years ago
Thibaut Girka
4444d8f9b3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Jeong Arm
51625d3423
Remove unused code ( #10426 )
6 years ago