619d55358f
Shift+click on column Back button to return to last pinable column
6 years ago
a4db307b6a
When selecting a toot via keyboard, ensure it is scrolled into view
6 years ago
ae88690fa6
Fix opening/closing gifv sometimes making the timeline scroll
6 years ago
5a24934449
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4c19204392
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
6302bed0b5
Fix Keybase verification using wrong domain for remote accounts ( #10547 )
6 years ago
a0000b9a94
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
ec8b3c46df
increase allowable length of remote proof username ( #10546 )
6 years ago
da3d516fcf
compare usernames case-insensitively on new proof creation flow ( #10544 )
...
* compare usernames case-insensitively on new proof creation flow
* Fix code style issue
6 years ago
db70d35c3f
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
aced669796
Updates the grammar of the SK translation ( #10541 )
6 years ago
771dc9235a
[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI
...
Port 403338108e
6 years ago
c97a40647a
[Glitch] Add "why do you want to join" field to invite requests
...
Port SCSS changes from 7eb05b8724
6 years ago
cde0ac1aa7
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
75ab8cef8f
Change the groupings of menu items in settings navigation ( #10533 )
...
* Change the groupings of menu items in settings navigation
Fix #10307
* Remove unused translations
6 years ago
753bb5e701
Change HTML validator to ignore all errors except unmatched tags ( #10534 )
6 years ago
6d5b05e3d5
Add invite request to pending account notification e-mail ( #10528 )
...
Fix sorting of the pending accounts page
6 years ago
13c1b5bac8
Add preference to disable e-mails about new pending accounts ( #10529 )
6 years ago
6286ace752
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
da343470c4
Allow set the voting period to just 5 minutes ( #10525 )
...
* Add spec of PollValidator for #10190
* Raise fraction less than 1 second
* format
* simplify time initialize
6 years ago
7eb05b8724
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
55f25ceda3
Fix permission denied bug on approve all/reject all pending accounts ( #10519 )
6 years ago
403338108e
Fix glitched out "not found" message for non-existing profiles in web UI ( #10517 )
6 years ago
5c9f6740c6
[i18n] Update and correction ( #10511 )
...
* [i18n] Update and correction
* Update oc.json
* Update oc.json
6 years ago
0405e42c4a
Add column title to “Favourited by” and “Boosted by” columns
6 years ago
a604f766e0
Fix batch actions not working on pending accounts ( #10508 )
6 years ago
85ab126f88
Fix pending accounts management
6 years ago
85a9a248f9
[Glitch] Duplicate values
...
Port 8037fa7d2e
6 years ago
2b965f8d17
[Glitch] Port SCSS changes from "Improve blocked view of profiles"
...
Port public pages SCSS changes from c84c30c542
6 years ago
5c8f9a3220
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
c66a043591
Updated German locales ( #10505 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
6 years ago
a5a7780ad1
i18n: Update Corsican translations ( #10504 )
6 years ago
20040927fc
i18n: Update Czech translation ( #10506 )
6 years ago
21193ed31e
Fix config serializer regex ( #10487 )
6 years ago
110dbb5286
Export and import show_reblogs together with following list ( #10495 )
...
* Refactor imports
* Export show_reblogs when exporting list of followed users
* Add support for importing show_reblogs with following collection
* Fix tests
6 years ago
d035f4af41
Translate Korean ( #10499 )
6 years ago
4f8beb3717
i18n: Update Japanese translations ( #10494 )
...
* Update Japanese translations
* Update Japanese translations.
6 years ago
c84c30c542
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 0317f37c6f#10442 )"
This reverts commit 4cd944d364
6 years ago
c34a7f5bd2
Add batch actions for approving and rejecting pending accounts ( #10469 )
6 years ago
d48f53cf1a
Fix admin validation being too strict about usernames ( #10449 )
...
* Fix admin validation being too strict about usernames
Fix #10446
* Strip Setting.site_contact_username consistently throughout the codebase
6 years ago
1409a529dd
Improve sk translation further ( #10484 )
...
* Further improving Slovak translation
* Update sk.json
6 years ago
b0348d0f92
tinyfix 2: unrequired arguments ( #10471 )
...
* unrequired argument
* unrequired argument
6 years ago
0e7c4d0c69
i18n: Update Polish translation ( #10479 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
6 years ago
705a2b7615
Updates the Slovak translation ( #10477 )
...
* Update sk.json
* Update sk.json
* Update sk.json
6 years ago
4c20f5376a
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
8037fa7d2e
Duplicate values ( #10470 )
6 years ago
3964cc964d
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
729b3841c3
[Glitch] Update poll remaining time just like with status timestamps
...
Port 6e024f0d7a
6 years ago
a835ea0e8f
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
f46cd7f002
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
Evgeny Petrov
Eugen Rochko
Alex Gessner
Aditoo17
Marek Ľach
Yağızhan
Hinaloe
Quentí
ashleyhull-versent
koyu
Alix Rossi
Takeshi Umeda
Jeong Arm
mayaeh
marcin mikołajczak
jeroenpraat
spla