268417daf3
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-19 10:44:10 +02:00
546688aa1d
Add forgotten text
2019-04-19 00:57:39 +02:00
93199c9566
Fix keybase indication on dashboard
2019-04-19 00:57:39 +02:00
d83068016b
Allow turning keybase off instance-wide
2019-04-19 00:57:39 +02:00
3d70ec470a
Some new strings for Slovak ( #10596 )
2019-04-18 15:08:59 +09:00
e3c1472040
Shift+click on column Back button to return to last pinable column
2019-04-17 18:40:40 +02:00
8d57c0e70e
When selecting a toot via keyboard, ensure it is scrolled into view
2019-04-17 10:07:33 +02:00
fbec0edf08
Fix opening/closing gifv sometimes making the timeline scroll
2019-04-16 22:20:23 +02:00
f11ad4023c
add env var for max length of audio uploads
2019-04-16 16:07:20 +02:00
15ec1a738e
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
c469e48e03
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
a8c6feb7ee
Update sk.yml translation again ( #10589 )
...
* Update sk.yml
* Update sk.yml
* Update sk.yml
2019-04-16 21:59:54 +09:00
7f75792bf3
Allow modal secondary button to shrink and allow wider confirmation modals ( #10586 )
...
Fixes #10531
2019-04-16 08:23:07 +09:00
9254bbe875
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
b2d9dcf5e5
Updates the Slovak translation further ( #10584 )
2019-04-15 22:18:51 +09:00
4ca402ffbd
i18n: Update Corsican translation ( #10583 )
2019-04-15 22:18:27 +09:00
d20b1bab24
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
9588cf82ce
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
bce757fdd8
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
b4acbd1a30
Small SK locale fixes ( #10561 )
...
* Small SK locale fixes
* Update devise.sk.yml
2019-04-13 21:24:00 +09:00
43a2154575
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
d305d8747d
Add new pt-br translations ( #10564 )
2019-04-13 21:23:41 +09:00
bb50ec2e66
Merge pull request #987 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-11 15:14:31 +02:00
f5b4e9a54a
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-11 15:13:52 +02:00
6afab2587d
Bump version to 2.8.0 ( #10550 )
2019-04-10 23:32:08 +02:00
31e4fcb006
Merge pull request #985 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-10 22:33:41 +02:00
21193b0a12
[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
2f422b708f
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-10 21:19:21 +02:00
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)
2019-04-10 20:43:08 +02:00
a9f130b8d8
Fix Keybase verification using wrong domain for remote accounts ( #10547 )
2019-04-10 20:28:43 +02:00
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
2019-04-10 18:17:24 +02:00
d431c810d3
increase allowable length of remote proof username ( #10546 )
2019-04-10 18:11:53 +02:00
154106c0c3
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
9e2a1f1838
i18n: Update Japanese translations ( #10536 )
...
* run i18n-tasks add-missing
* Update Japanese translations.
2019-04-10 17:36:45 +02:00
2e01a9b20d
I18n: Add one more string ( #10543 )
2019-04-10 17:17:17 +02:00
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
2019-04-10 14:52:08 +02:00
3dea62bfa2
Updates the grammar of the SK translation ( #10541 )
2019-04-10 14:50:39 +02:00
6402701965
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
4595168863
Translation - Korean ( #10540 )
2019-04-10 14:49:40 +02:00
a5c60f87b1
i18n: Update Corsican translations ( #10538 )
2019-04-10 14:49:06 +02:00
92e1950194
[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI
...
Port 56f29c38b6
2019-04-10 09:33:47 +02:00
fa4b51a110
[Glitch] Add "why do you want to join" field to invite requests
...
Port SCSS changes from 8b69a66380
2019-04-10 09:22:45 +02:00
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.
2019-04-10 09:16:08 +02:00
830c2a9ccb
Bump version to 2.8.0rc3 ( #10535 )
2019-04-10 04:25:09 +02:00
9b0d8f74cb
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
400397c0c7
Change HTML validator to ignore all errors except unmatched tags ( #10534 )
2019-04-10 03:34:16 +02:00
46cb36fd2c
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
36b39fbac5
Add preference to disable e-mails about new pending accounts ( #10529 )
2019-04-10 00:35:49 +02:00
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.
2019-04-09 20:42:01 +02:00
48f466daf1
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
Thibaut Girka
Marek Ľach
Izalia Mae
dependabot[bot]
Alix Rossi
Renato "Lond" Cerqueira
Eugen Rochko
Quentí
Evgeny Petrov
Alex Gessner
mayaeh
Aditoo17
koyu
Jeong Arm
Yağızhan
Hinaloe