]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoFix upload progressbar when image resizing is involved
Thibaut Girka [Wed, 24 Apr 2019 15:59:11 +0000 (17:59 +0200)]
Fix upload progressbar when image resizing is involved

6 years agoHide media upload form if no media are attached
Thibaut Girka [Wed, 24 Apr 2019 13:35:27 +0000 (15:35 +0200)]
Hide media upload form if no media are attached

6 years agoMerge pull request #1007 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 24 Apr 2019 17:42:33 +0000 (19:42 +0200)]
Merge pull request #1007 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 24 Apr 2019 13:25:22 +0000 (15:25 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix file upload
Thibaut Girka [Wed, 24 Apr 2019 05:51:35 +0000 (07:51 +0200)]
Fix file upload

6 years agoFix settings modal
Thibaut Girka [Tue, 23 Apr 2019 16:19:35 +0000 (18:19 +0200)]
Fix settings modal

6 years agoBump sidekiq from 5.2.6 to 5.2.7 (#10627)
dependabot[bot] [Tue, 23 Apr 2019 14:39:06 +0000 (16:39 +0200)]
Bump sidekiq from 5.2.6 to 5.2.7 (#10627)

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7.
- [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.6...v5.2.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump capybara from 3.17.0 to 3.18.0 (#10626)
dependabot[bot] [Tue, 23 Apr 2019 09:53:52 +0000 (18:53 +0900)]
Bump capybara from 3.17.0 to 3.18.0 (#10626)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.0.
- [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.17.0...3.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFix stoplight logging to stderr separate from Rails logger (#10624)
Eugen Rochko [Tue, 23 Apr 2019 02:39:48 +0000 (04:39 +0200)]
Fix stoplight logging to stderr separate from Rails logger (#10624)

6 years agoFix sign up button not saying sign up when invite is used (#10623)
Eugen Rochko [Tue, 23 Apr 2019 02:39:21 +0000 (04:39 +0200)]
Fix sign up button not saying sign up when invite is used (#10623)

Fix #10616

6 years ago[Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620)
dependabot[bot] [Tue, 23 Apr 2019 01:02:58 +0000 (10:02 +0900)]
[Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump capybara from 3.16.2 to 3.17.0 (#10602)
dependabot[bot] [Mon, 22 Apr 2019 22:54:51 +0000 (00:54 +0200)]
Bump capybara from 3.16.2 to 3.17.0 (#10602)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.0.
- [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.2...3.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFixed Healthchecks in docker-compose.yml (#10553)
Fabian Schlenz [Mon, 22 Apr 2019 22:54:26 +0000 (00:54 +0200)]
Fixed Healthchecks in docker-compose.yml (#10553)

6 years agoDo not leak local-only toots to remote mentioned users
Thibaut Girka [Mon, 22 Apr 2019 17:10:00 +0000 (19:10 +0200)]
Do not leak local-only toots to remote mentioned users

6 years agoLoad custom CSS rules after standard ones
Thibaut Girka [Thu, 4 Apr 2019 17:38:48 +0000 (19:38 +0200)]
Load custom CSS rules after standard ones

Fixes #933

Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.

They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.

6 years agoAdd support for lists in statuses
Thibaut Girka [Sun, 21 Apr 2019 20:04:19 +0000 (22:04 +0200)]
Add support for lists in statuses

6 years agoDo not switch to italic for status media buttons
Thibaut Girka [Sun, 21 Apr 2019 19:44:31 +0000 (21:44 +0200)]
Do not switch to italic for status media buttons

6 years agoAccept richer text from remote statuses
Thibaut Girka [Wed, 17 Apr 2019 12:23:36 +0000 (14:23 +0200)]
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 agoMerge pull request #1002 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 22 Apr 2019 21:06:54 +0000 (23:06 +0200)]
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix modal items cannot scroll on touch devices
kedama [Mon, 22 Apr 2019 12:55:50 +0000 (21:55 +0900)]
[Glitch] Fix modal items cannot scroll on touch devices

Port d763d39d2628bef123cdc801b2a3a3922b7e37f2 to glitch-soc

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 22 Apr 2019 18:40:04 +0000 (20:40 +0200)]
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 agoFix ReferenceError in dropdown
Thibaut Girka [Mon, 22 Apr 2019 13:41:40 +0000 (15:41 +0200)]
Fix ReferenceError in dropdown

6 years agoFix broken reference to handleSubmit
Thibaut Girka [Sun, 21 Apr 2019 20:59:58 +0000 (22:59 +0200)]
Fix broken reference to handleSubmit

6 years agoCleanup
Thibaut Girka [Sun, 21 Apr 2019 17:07:48 +0000 (19:07 +0200)]
Cleanup

6 years agoMove ComposerPublisher to Compose
Thibaut Girka [Sun, 21 Apr 2019 16:48:33 +0000 (18:48 +0200)]
Move ComposerPublisher to Compose

6 years agoAdd OptionsContainer
Thibaut Girka [Sun, 21 Apr 2019 16:31:26 +0000 (18:31 +0200)]
Add OptionsContainer

6 years agoMove composer Dropdown from features/composer to features/compose
Thibaut Girka [Sun, 21 Apr 2019 15:17:10 +0000 (17:17 +0200)]
Move composer Dropdown from features/composer to features/compose

6 years agoMove ComposerTextareaIcons to TextareaIcons
Thibaut Girka [Sun, 21 Apr 2019 13:57:06 +0000 (15:57 +0200)]
Move ComposerTextareaIcons to TextareaIcons

6 years agoComposerTextarea → AutosuggestTextarea
Thibaut Girka [Sun, 21 Apr 2019 10:44:30 +0000 (12:44 +0200)]
ComposerTextarea → AutosuggestTextarea

6 years agoComposerUploadForm → UploadForm + UploadFormContainer
Thibaut Girka [Sun, 21 Apr 2019 10:09:52 +0000 (12:09 +0200)]
ComposerUploadForm → UploadForm + UploadFormContainer

6 years agoMove PollForm from features/composer to features/compose
Thibaut Girka [Sat, 20 Apr 2019 21:27:20 +0000 (23:27 +0200)]
Move PollForm from features/composer to features/compose

6 years agoInline spoiler input
Thibaut Girka [Sat, 20 Apr 2019 21:02:09 +0000 (23:02 +0200)]
Inline spoiler input

6 years agoComposerReply → ReplyIndicator
Thibaut Girka [Sat, 20 Apr 2019 20:21:28 +0000 (22:21 +0200)]
ComposerReply → ReplyIndicator

6 years agoRefactor Compose*Warning → ContainerWarning
Thibaut Girka [Sat, 20 Apr 2019 20:05:09 +0000 (22:05 +0200)]
Refactor Compose*Warning → ContainerWarning

Regression: only one warning at a time

6 years agofeatures/composer/index.js → ComposeForm
Thibaut Girka [Sat, 20 Apr 2019 19:28:03 +0000 (21:28 +0200)]
features/composer/index.js → ComposeForm

6 years agoDrawerHeader → Header + HeaderContainer
Thibaut Girka [Sat, 20 Apr 2019 18:52:07 +0000 (20:52 +0200)]
DrawerHeader → Header + HeaderContainer

6 years agoDrawerAccount → NavigationBar + NavigationContainer
Thibaut Girka [Sat, 20 Apr 2019 18:32:16 +0000 (20:32 +0200)]
DrawerAccount → NavigationBar + NavigationContainer

6 years ago[Glitch] Show suggested follows on search screen in mobile layout
Eugen Rochko [Mon, 22 Oct 2018 22:08:39 +0000 (00:08 +0200)]
[Glitch] Show suggested follows on search screen in mobile layout

Port ad510db3a19640267f94062756d558a45472af14 to glitch-soc

6 years agoDrawerResults → SearchResults + SearchResultsContainer
Thibaut Girka [Sat, 20 Apr 2019 17:18:26 +0000 (19:18 +0200)]
DrawerResults → SearchResults + SearchResultsContainer

6 years agoRework DrawerResults to make them closer to upstream
Thibaut Girka [Sat, 20 Apr 2019 16:21:11 +0000 (18:21 +0200)]
Rework DrawerResults to make them closer to upstream

6 years agoMove DrawerSearch to Search + SearchContainer
Thibaut Girka [Sat, 20 Apr 2019 15:50:12 +0000 (17:50 +0200)]
Move DrawerSearch to Search + SearchContainer

6 years agoInline DrawerSearchPopout in DrawerSearch
Thibaut Girka [Fri, 19 Apr 2019 19:05:18 +0000 (21:05 +0200)]
Inline DrawerSearchPopout in DrawerSearch

6 years agoRefactor a bit DrawerSearch to make it closer to upstream
Thibaut Girka [Fri, 19 Apr 2019 18:57:43 +0000 (20:57 +0200)]
Refactor a bit DrawerSearch to make it closer to upstream

6 years agoRename flavours/glitch/features/drawer to flavours/glitch/features/compose
Thibaut Girka [Fri, 19 Apr 2019 18:14:32 +0000 (20:14 +0200)]
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose

6 years agoBump aws-sdk-s3 from 1.36.0 to 1.36.1 (#10618)
dependabot[bot] [Mon, 22 Apr 2019 13:03:20 +0000 (15:03 +0200)]
Bump aws-sdk-s3 from 1.36.0 to 1.36.1 (#10618)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.0 to 1.36.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.36.0...v1.36.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump doorkeeper from 5.0.2 to 5.1.0 (#10598)
dependabot[bot] [Mon, 22 Apr 2019 13:02:59 +0000 (15:02 +0200)]
Bump doorkeeper from 5.0.2 to 5.1.0 (#10598)

Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoAllow switching between singe-option and multiple-option polls (#10603)
ThibG [Mon, 22 Apr 2019 12:56:14 +0000 (14:56 +0200)]
Allow switching between singe-option and multiple-option polls (#10603)

6 years agoFix modal items cannot scroll on touch devices (#10605)
kedama [Mon, 22 Apr 2019 12:55:50 +0000 (21:55 +0900)]
Fix modal items cannot scroll on touch devices (#10605)

6 years agoMinor code cleanup (#10613)
ThibG [Mon, 22 Apr 2019 12:55:24 +0000 (14:55 +0200)]
Minor code cleanup (#10613)

6 years agoBump cld3 from 3.2.3 to 3.2.4 (#10617)
dependabot[bot] [Mon, 22 Apr 2019 12:54:19 +0000 (14:54 +0200)]
Bump cld3 from 3.2.3 to 3.2.4 (#10617)

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.3...v3.2.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoi18n: Fix misleading strings in Polish translation (#10615)
marcin mikołajczak [Sun, 21 Apr 2019 20:30:04 +0000 (22:30 +0200)]
i18n: Fix misleading strings in Polish translation (#10615)

6 years agoSmall fix Dutch translation (#10612)
jeroenpraat [Sun, 21 Apr 2019 16:44:51 +0000 (18:44 +0200)]
Small fix Dutch translation (#10612)

* Small fix Dutch translation

* Better descriptive titles

See #10611

6 years agoi18n: Update Catalan translation (#10559)
Yamagishi Kazutoshi [Sun, 21 Apr 2019 02:53:45 +0000 (11:53 +0900)]
i18n: Update Catalan translation (#10559)

* 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

* i18n: Update Catalan translations

* i18n: Update Catalan translations

6 years agoDefault to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg...
Ben Lubar [Sun, 21 Apr 2019 02:53:24 +0000 (21:53 -0500)]
Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)

6 years agoAdd hi.json (#10573)
Yamagishi Kazutoshi [Sun, 21 Apr 2019 02:52:20 +0000 (11:52 +0900)]
Add hi.json (#10573)

6 years agoBump webpush from 0.3.7 to 0.3.8 (#10592)
dependabot[bot] [Sun, 21 Apr 2019 02:49:44 +0000 (04:49 +0200)]
Bump webpush from 0.3.7 to 0.3.8 (#10592)

Bumps [webpush](https://github.com/zaru/webpush) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.7...v0.3.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump lograge from 0.10.0 to 0.11.0 (#10588)
dependabot[bot] [Sun, 21 Apr 2019 02:49:05 +0000 (04:49 +0200)]
Bump lograge from 0.10.0 to 0.11.0 (#10588)

Bumps [lograge](https://github.com/roidrage/lograge) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.10.0...v0.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoUpdate hy.json (#10591)
partev [Sun, 21 Apr 2019 02:48:47 +0000 (22:48 -0400)]
Update hy.json (#10591)

6 years agoTreat meta[property] as a space-separated list (#10604)
Daniel Aleksandersen [Sun, 21 Apr 2019 02:48:19 +0000 (04:48 +0200)]
Treat meta[property] as a space-separated list (#10604)

The @property attribute in HTML is a space-separated list of values.
This change normalizes whitespace and finds the desired value in
the list instead of requiring an exact single-value match.

More details:
https://www.ctrl.blog/entry/rdfa-socialmedia-metadata.html

6 years agoAnimate avatar GIFs on-hover on public profiles (#10549)
Jessica [Sun, 21 Apr 2019 02:47:39 +0000 (19:47 -0700)]
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 agoUpdate NL (Dutch) translation (#10601)
jeroenpraat [Sun, 21 Apr 2019 02:46:08 +0000 (04:46 +0200)]
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 agoUse correct local names for fonts (#10594)
ThibG [Sun, 21 Apr 2019 02:42:02 +0000 (04:42 +0200)]
Use correct local names for fonts (#10594)

6 years agoConfigrationable repository url (#10600)
Sho Kusano [Sun, 21 Apr 2019 02:41:34 +0000 (11:41 +0900)]
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 agoMerge pull request #998 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 19 Apr 2019 11:41:34 +0000 (13:41 +0200)]
Merge pull request #998 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
Thibaut Girka [Fri, 19 Apr 2019 08:48:54 +0000 (10:48 +0200)]
[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals

Port 7f75792bf305eea297c63731600af3b02968aea4 to glitch-soc

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 19 Apr 2019 08:44:10 +0000 (10:44 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoAdd forgotten text
Thibaut Girka [Thu, 18 Apr 2019 22:49:15 +0000 (00:49 +0200)]
Add forgotten text

6 years agoFix keybase indication on dashboard
Thibaut Girka [Thu, 18 Apr 2019 22:47:23 +0000 (00:47 +0200)]
Fix keybase indication on dashboard

6 years agoAllow turning keybase off instance-wide
Thibaut Girka [Wed, 17 Apr 2019 19:50:18 +0000 (21:50 +0200)]
Allow turning keybase off instance-wide

6 years agoSome new strings for Slovak (#10596)
Marek Ľach [Thu, 18 Apr 2019 06:08:59 +0000 (08:08 +0200)]
Some new strings for Slovak (#10596)

6 years agoShift+click on column Back button to return to last pinable column
Thibaut Girka [Mon, 15 Apr 2019 20:23:05 +0000 (22:23 +0200)]
Shift+click on column Back button to return to last pinable column

6 years agoWhen selecting a toot via keyboard, ensure it is scrolled into view
Thibaut Girka [Mon, 15 Apr 2019 18:40:05 +0000 (20:40 +0200)]
When selecting a toot via keyboard, ensure it is scrolled into view

6 years agoFix opening/closing gifv sometimes making the timeline scroll
Thibaut Girka [Tue, 16 Apr 2019 16:45:04 +0000 (18:45 +0200)]
Fix opening/closing gifv sometimes making the timeline scroll

6 years agoadd env var for max length of audio uploads
Izalia Mae [Thu, 11 Apr 2019 11:23:31 +0000 (07:23 -0400)]
add env var for max length of audio uploads

6 years agoBump sidekiq from 5.2.5 to 5.2.6 (#10582)
dependabot[bot] [Tue, 16 Apr 2019 13:00:56 +0000 (22:00 +0900)]
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>
6 years agoBump sidekiq-unique-jobs from 6.0.12 to 6.0.13 (#10580)
dependabot[bot] [Tue, 16 Apr 2019 13:00:15 +0000 (22:00 +0900)]
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>
6 years agoUpdate sk.yml translation again (#10589)
Marek Ľach [Tue, 16 Apr 2019 12:59:54 +0000 (14:59 +0200)]
Update sk.yml translation again (#10589)

* Update sk.yml

* Update sk.yml

* Update sk.yml

6 years agoAllow modal secondary button to shrink and allow wider confirmation modals (#10586)
ThibG [Mon, 15 Apr 2019 23:23:07 +0000 (01:23 +0200)]
Allow modal secondary button to shrink and allow wider confirmation modals (#10586)

Fixes #10531

6 years agoImportant Slovak grammar fixes (#10585)
Marek Ľach [Mon, 15 Apr 2019 22:16:12 +0000 (00:16 +0200)]
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

6 years agoUpdates the Slovak translation further (#10584)
Marek Ľach [Mon, 15 Apr 2019 13:18:51 +0000 (15:18 +0200)]
Updates the Slovak translation further (#10584)

6 years agoi18n: Update Corsican translation (#10583)
Alix Rossi [Mon, 15 Apr 2019 13:18:27 +0000 (15:18 +0200)]
i18n: Update Corsican translation (#10583)

6 years agoBump oj from 3.7.11 to 3.7.12 (#10581)
dependabot[bot] [Mon, 15 Apr 2019 10:51:10 +0000 (19:51 +0900)]
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>
6 years agoBump rubocop from 0.67.1 to 0.67.2 (#10500)
dependabot[bot] [Sat, 13 Apr 2019 12:24:44 +0000 (21:24 +0900)]
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>
6 years agoBump capybara from 3.16.1 to 3.16.2 (#10552)
dependabot[bot] [Sat, 13 Apr 2019 12:24:19 +0000 (21:24 +0900)]
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>
6 years agoSmall SK locale fixes (#10561)
Marek Ľach [Sat, 13 Apr 2019 12:24:00 +0000 (14:24 +0200)]
Small SK locale fixes (#10561)

* Small SK locale fixes

* Update devise.sk.yml

6 years agoNew strings added into the Slovak translation (#10562)
Marek Ľach [Sat, 13 Apr 2019 12:23:52 +0000 (14:23 +0200)]
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

6 years agoAdd new pt-br translations (#10564)
Renato "Lond" Cerqueira [Sat, 13 Apr 2019 12:23:41 +0000 (14:23 +0200)]
Add new pt-br translations (#10564)

6 years agoMerge pull request #987 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 11 Apr 2019 13:14:31 +0000 (15:14 +0200)]
Merge pull request #987 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 11 Apr 2019 13:13:52 +0000 (15:13 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoBump version to 2.8.0 (#10550)
Eugen Rochko [Wed, 10 Apr 2019 21:32:08 +0000 (23:32 +0200)]
Bump version to 2.8.0 (#10550)

6 years agoMerge pull request #985 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 10 Apr 2019 20:33:41 +0000 (22:33 +0200)]
Merge pull request #985 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[i18n] Update for Occitan language (#10548)
Quentí [Wed, 10 Apr 2019 20:33:04 +0000 (22:33 +0200)]
[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

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 10 Apr 2019 19:19:21 +0000 (21:19 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoi18n: Russian localization update (#10515)
Evgeny Petrov [Wed, 10 Apr 2019 18:43:08 +0000 (21:43 +0300)]
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 agoFix Keybase verification using wrong domain for remote accounts (#10547)
Eugen Rochko [Wed, 10 Apr 2019 18:28:43 +0000 (20:28 +0200)]
Fix Keybase verification using wrong domain for remote accounts (#10547)

6 years agoWeblate translations (2019-04-10) (#10545)
Eugen Rochko [Wed, 10 Apr 2019 16:17:24 +0000 (18:17 +0200)]
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 agoincrease allowable length of remote proof username (#10546)
Alex Gessner [Wed, 10 Apr 2019 16:11:53 +0000 (12:11 -0400)]
increase allowable length of remote proof username (#10546)

6 years agocompare usernames case-insensitively on new proof creation flow (#10544)
Alex Gessner [Wed, 10 Apr 2019 16:05:11 +0000 (12:05 -0400)]
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 agoi18n: Update Japanese translations (#10536)
mayaeh [Wed, 10 Apr 2019 15:36:45 +0000 (00:36 +0900)]
i18n: Update Japanese translations (#10536)

* run i18n-tasks add-missing

* Update Japanese translations.

6 years agoI18n: Add one more string (#10543)
Aditoo17 [Wed, 10 Apr 2019 15:17:17 +0000 (17:17 +0200)]
I18n: Add one more string (#10543)