Commit graph

9179 commits

Author SHA1 Message Date
ThibG
1fecdb013a Use correct local names for fonts (#10594) 2019-04-21 04:42:02 +02:00
Sho Kusano
1af37e09f3 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
2019-04-21 04:41:34 +02:00
ThibG
3316cc1722 Merge pull request #998 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-04-19 13:41:34 +02:00
Thibaut Girka
2da3b24eb8 [Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
Port a6fe7ae53c to glitch-soc
2019-04-19 10:48:54 +02:00
Thibaut Girka
3673665b46 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-19 10:44:10 +02:00
Thibaut Girka
707ae5d37a Add forgotten text 2019-04-19 00:57:39 +02:00
Thibaut Girka
3f40442f49 Fix keybase indication on dashboard 2019-04-19 00:57:39 +02:00
Thibaut Girka
c22175bb86 Allow turning keybase off instance-wide 2019-04-19 00:57:39 +02:00
Marek Ľach
b5850a99aa Some new strings for Slovak (#10596) 2019-04-18 15:08:59 +09:00
Thibaut Girka
619d55358f Shift+click on column Back button to return to last pinable column 2019-04-17 18:40:40 +02:00
Thibaut Girka
a4db307b6a When selecting a toot via keyboard, ensure it is scrolled into view 2019-04-17 10:07:33 +02:00
Thibaut Girka
ae88690fa6 Fix opening/closing gifv sometimes making the timeline scroll 2019-04-16 22:20:23 +02:00
Izalia Mae
baded1cc18 add env var for max length of audio uploads 2019-04-16 16:07:20 +02:00
dependabot[bot]
b3046385f3 Bump sidekiq from 5.2.5 to 5.2.6 (#10582)
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.5 to 5.2.6.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.5...v5.2.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-16 22:00:56 +09:00
dependabot[bot]
3daf6472ef Bump sidekiq-unique-jobs from 6.0.12 to 6.0.13 (#10580)
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.12 to 6.0.13.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.12...v6.0.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-16 22:00:15 +09:00
Marek Ľach
e82b7347a2 Update sk.yml translation again (#10589)
* Update sk.yml

* Update sk.yml

* Update sk.yml
2019-04-16 21:59:54 +09:00
ThibG
a6fe7ae53c Allow modal secondary button to shrink and allow wider confirmation modals (#10586)
Fixes #10531
2019-04-16 08:23:07 +09:00
Marek Ľach
970dfb92a9 Important Slovak grammar fixes (#10585)
* Important grammar fixes for SK Devise translation

* Important Slovak grammar fixes

* Update devise.sk.yml

* Important Slovak grammar fixes

Last batch for today :-)

* Update devise.sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml
2019-04-16 07:16:12 +09:00
Marek Ľach
d6c6431e5c Updates the Slovak translation further (#10584) 2019-04-15 22:18:51 +09:00
Alix Rossi
159d224bba i18n: Update Corsican translation (#10583) 2019-04-15 22:18:27 +09:00
dependabot[bot]
3115bad263 Bump oj from 3.7.11 to 3.7.12 (#10581)
Bumps [oj](https://github.com/ohler55/oj) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-15 19:51:10 +09:00
dependabot[bot]
ba45074471 Bump rubocop from 0.67.1 to 0.67.2 (#10500)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.1 to 0.67.2.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.67.1...v0.67.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-13 21:24:44 +09:00
dependabot[bot]
6dd6444fd3 Bump capybara from 3.16.1 to 3.16.2 (#10552)
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.1 to 3.16.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.16.1...3.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-13 21:24:19 +09:00
Marek Ľach
709b519bed Small SK locale fixes (#10561)
* Small SK locale fixes

* Update devise.sk.yml
2019-04-13 21:24:00 +09:00
Marek Ľach
ff1e9408e4 New strings added into the Slovak translation (#10562)
* New strings added into the Slovak translation

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml
2019-04-13 21:23:52 +09:00
Renato "Lond" Cerqueira
83420b9d41 Add new pt-br translations (#10564) 2019-04-13 21:23:41 +09:00
ThibG
3473c3c8fc Merge pull request #987 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-04-11 15:14:31 +02:00
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