me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9102 commits 2 branches 0 tags 429 MiB
Commit graph

9102 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
f8a3c00755 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-11 15:13:52 +02:00
Eugen Rochko
373fa21cf7 Bump version to 2.8.0 (#10550) 2019-04-10 23:32:08 +02:00
ThibG
cbfdc1adbd Merge pull request #985 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-10 22:33:41 +02:00
Quentí
aee82e3b73 [i18n] Update for Occitan language (#10548) 
* Update activerecord.oc.yml

* Update simple_form.oc.yml

* Fix typo

* Update simple_form.oc.yml

* Remove trailing whitespace
 2019-04-10 22:33:04 +02:00
Thibaut Girka
5a24934449 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 21:19:21 +02:00
Evgeny Petrov
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)
 2019-04-10 20:43:08 +02:00
Eugen Rochko
6302bed0b5 Fix Keybase verification using wrong domain for remote accounts (#10547) 2019-04-10 20:28:43 +02:00
Eugen Rochko
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
 2019-04-10 18:17:24 +02:00
Alex Gessner
ec8b3c46df increase allowable length of remote proof username (#10546) 2019-04-10 18:11:53 +02:00
Alex Gessner
da3d516fcf compare usernames case-insensitively on new proof creation flow (#10544) 
* compare usernames case-insensitively on new proof creation flow

* Fix code style issue
 2019-04-10 18:05:11 +02:00
mayaeh
020c6ae72f i18n: Update Japanese translations (#10536) 
* run i18n-tasks add-missing

* Update Japanese translations.
 2019-04-10 17:36:45 +02:00
Aditoo17
7568f716a1 I18n: Add one more string (#10543) 2019-04-10 17:17:17 +02:00
Aditoo17
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
 2019-04-10 14:52:08 +02:00
Marek Ľach
aced669796 Updates the grammar of the SK translation (#10541) 2019-04-10 14:50:39 +02:00
koyu
fc14f14e20 Updated German translation (#10539) 
* Updated German locales

* Added account approval locales (German)

* Updated JSON locales (German)

* Updated German translation

* Fixed grammar error (German)

* New strings and adjustments (German)
 2019-04-10 14:50:14 +02:00
Jeong Arm
70a6a8aabc Translation - Korean (#10540) 2019-04-10 14:49:40 +02:00
Alix Rossi
73bbfcb482 i18n: Update Corsican translations (#10538) 2019-04-10 14:49:06 +02:00
Eugen Rochko
771dc9235a [Glitch] Fix glitched out "not found" message for non-existing profiles in web UI 
Port 403338108e to glitch-soc
 2019-04-10 09:33:47 +02:00
Eugen Rochko
c97a40647a [Glitch] Add "why do you want to join" field to invite requests 
Port SCSS changes from 7eb05b8724 to glitch-soc
 2019-04-10 09:22:45 +02:00
Thibaut Girka
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.
 2019-04-10 09:16:08 +02:00
Eugen Rochko
01dc793a94 Bump version to 2.8.0rc3 (#10535) 2019-04-10 04:25:09 +02:00
Eugen Rochko
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
 2019-04-10 03:47:11 +02:00
Eugen Rochko
753bb5e701 Change HTML validator to ignore all errors except unmatched tags (#10534) 2019-04-10 03:34:16 +02:00
Eugen Rochko
6d5b05e3d5 Add invite request to pending account notification e-mail (#10528) 
Fix sorting of the pending accounts page
 2019-04-10 00:36:01 +02:00
Eugen Rochko
13c1b5bac8 Add preference to disable e-mails about new pending accounts (#10529) 2019-04-10 00:35:49 +02:00
Yağızhan
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.
 2019-04-09 20:42:01 +02:00
Hinaloe
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
 2019-04-09 17:02:12 +02:00
Eugen Rochko
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
 2019-04-09 23:06:30 +09:00
dependabot[bot]
2c03aa4da8 Bump hamlit-rails from 0.2.2 to 0.2.3 (#10522) 
Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/mfung/hamlit-rails/releases)
- [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.2...v0.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-09 17:23:52 +09:00
dependabot[bot]
5b05a2ea9f Bump bootsnap from 1.4.2 to 1.4.3 (#10523) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.2...v1.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-09 17:23:18 +09:00
Eugen Rochko
55f25ceda3 Fix permission denied bug on approve all/reject all pending accounts (#10519) 2019-04-09 07:19:52 +02:00
Eugen Rochko
ae6c9b4f10 Bump version to 2.8.0rc2 (#10501) 2019-04-09 05:04:11 +02:00
Eugen Rochko
403338108e Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
Quentí
5c9f6740c6 [i18n] Update and correction (#10511) 
* [i18n] Update and correction

* Update oc.json

* Update oc.json
 2019-04-09 07:39:50 +09:00
Thibaut Girka
0405e42c4a Add column title to “Favourited by” and “Boosted by” columns 2019-04-08 21:59:30 +02:00
Alix Rossi
fb93400e7d i18n: Update Corsican translations (#10510) 
* i18n: Update Corsican translations

* i18n: Update Corsican translations
 2019-04-08 19:01:41 +02:00
ThibG
a604f766e0 Fix batch actions not working on pending accounts (#10508) 2019-04-08 18:35:41 +02:00
ThibG
178ad92a9e Merge pull request #983 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-08 18:17:22 +02:00
Thibaut Girka
85ab126f88 Fix pending accounts management 2019-04-08 16:40:11 +02:00
ashleyhull-versent
85a9a248f9 [Glitch] Duplicate values 
Port 8037fa7d2e to glitch-soc
 2019-04-08 16:22:20 +02:00
Eugen Rochko
2b965f8d17 [Glitch] Port SCSS changes from "Improve blocked view of profiles" 
Port public pages SCSS changes from c84c30c542
 2019-04-08 16:20:46 +02:00
Thibaut Girka
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.
 2019-04-08 15:57:56 +02:00
koyu
c66a043591 Updated German locales (#10505) 
* Updated German locales

* Added account approval locales (German)

* Updated JSON locales (German)
 2019-04-08 21:14:08 +09:00
Alix Rossi
a5a7780ad1 i18n: Update Corsican translations (#10504) 2019-04-08 21:12:06 +09:00
Aditoo17
20040927fc i18n: Update Czech translation (#10506) 2019-04-08 21:11:39 +09:00
Takeshi Umeda
21193ed31e Fix config serializer regex (#10487) 2019-04-08 07:55:38 +02:00
Takeshi Umeda
01f46add16 Add tootctl accounts reset-relationships (#10483) 
* Add `tootctl accounts reset`

* Rename reset to reset-relationships

* Improve command description
 2019-04-08 07:46:55 +02:00
ThibG
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
 2019-04-08 07:28:27 +02:00
Jeong Arm
d035f4af41 Translate Korean (#10499) 2019-04-08 12:35:37 +09:00
Hugo "Slaynash" Flores
5858035e39 Updated french translations (#10498) 
* updated "Invalid email or password" french translation

* Updated FR translations ("instance" in now "serveur")
 2019-04-08 09:22:09 +09:00