]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoRemove unused AtomBuilderHelper (#1364)
Matt Jankowski [Tue, 11 Apr 2017 17:31:22 +0000 (13:31 -0400)]
Remove unused AtomBuilderHelper (#1364)

This was used in the views/atom/user_stream.xml.ruby file, which no longer is
used.

8 years agoMoving docs to tootsuite/documentation (#1550)
Eugen [Tue, 11 Apr 2017 16:03:02 +0000 (18:03 +0200)]
Moving docs to tootsuite/documentation (#1550)

8 years agoAdd (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability...
Valentin Ouvrard [Tue, 11 Apr 2017 14:04:56 +0000 (01:04 +1100)]
Add (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability (#1253)

* enable commented volume in docker-compose.yml

* Disable unworking Nginx root directory && Mitigating the HTTPoxy Vulnerability

* add my instance to the list

* enable GZIP on nginx.conf

* readd root /home/mastodon/live/public;

8 years agofix(*): ruby version was updated in .ruby-version but not Vagrant. Make them match...
Gavin Mogan [Tue, 11 Apr 2017 13:06:07 +0000 (06:06 -0700)]
fix(*): ruby version was updated in .ruby-version but not Vagrant. Make them match (#1502)

8 years agoAvoid user enumeration with devise paranoid mode (#1527)
Yann GUERN [Tue, 11 Apr 2017 12:21:15 +0000 (14:21 +0200)]
Avoid user enumeration with devise paranoid mode (#1527)

8 years agoAdjust css for user detail page (#1463)
Corey Dutson [Tue, 11 Apr 2017 12:20:18 +0000 (08:20 -0400)]
Adjust css for user detail page (#1463)

- details a background for contrast
- add 5px padding to the top of the `details-counters` children to line them up with the bio to the right (Which has a 5px padding on the top)

8 years agoAdd Mastodon.tools (#1457)
David Libeau [Tue, 11 Apr 2017 03:30:40 +0000 (05:30 +0200)]
Add Mastodon.tools (#1457)

8 years agoPagination improvements (#1445)
Matt Jankowski [Mon, 10 Apr 2017 23:11:41 +0000 (19:11 -0400)]
Pagination improvements (#1445)

* Replace will_paginate with kaminari

* Use #page instead of #paginate in controllers

* Replace will_paginate.page_gap with pagination.truncate in i18n

* Customize kaminari views to match prior styles

* Set kaminari options to match prior behavior

* Replace will_paginate with paginate in views

8 years agoAdd note about minimum docker-compose version (#1264)
Effy Elden [Mon, 10 Apr 2017 22:39:39 +0000 (08:39 +1000)]
Add note about minimum docker-compose version (#1264)

Add a note to ensure users are using the right version of docker-compose.

8 years agoWhen avatar/header are GIF, generate static versions (#1428)
Eugen [Mon, 10 Apr 2017 22:38:58 +0000 (00:38 +0200)]
When avatar/header are GIF, generate static versions (#1428)

* When avatar/header are GIF, generate static versions.
Account API returns "avatar"/"avatar_static", "header"/"header_static"
Static version is the same as original for other cases
Web UI de-animates avatars in toots, lists of users

Fix #441, fix #596, prerequisite for #1064

* Fix JS test

* Add rake task to generate static avatars/headers from GIF ones, add test

8 years agoRemove order prior to .find_in_batches (#1470)
Matt Jankowski [Mon, 10 Apr 2017 22:38:34 +0000 (18:38 -0400)]
Remove order prior to .find_in_batches (#1470)

The `Status` class has a default order on it, so when this query gets built and
gets all the way to `find_in_batches` there is an order already there.

When `find_in_batches` is run it discards any existing order on the query, and
emits a warning to the logs if there is one there.

This change removes the order prior calling `find_in_batches`, which will stop
the logged warning from occurring as well.

8 years agoDev Tooling fixes (eslint/editorconfig) (#1398)
Gavin Mogan [Mon, 10 Apr 2017 22:36:03 +0000 (15:36 -0700)]
Dev Tooling fixes (eslint/editorconfig) (#1398)

* Add eslint to dev dependancies so it gets installed for the repo

yarn add --dev eslint babel-eslint eslint-plugin-reac

project specific version of eslint, you can globally install eslint-cli
if you want the global runtime, or add .bin to your path

* fix eslint errors about inconsitent returns

* eslint ignore the same as git ignore. allows for eslint .

* Add editorconfig file so everyones editor will be setup to follow the same standards

8 years agoAdd username as a title for mentions (#1385)
Matthias Jouan [Mon, 10 Apr 2017 22:35:35 +0000 (00:35 +0200)]
Add username as a title for mentions (#1385)

Add a title attribute on mention links for both notifications
and mentions in statuses.

Related to #1350

8 years agoAdds error message to mastodon:confirm_email task. (#1476)
Ash Furrow [Mon, 10 Apr 2017 22:13:08 +0000 (18:13 -0400)]
Adds error message to mastodon:confirm_email task. (#1476)

8 years agoAPI param to exclude notification types from response (#1341)
Eugen [Mon, 10 Apr 2017 21:45:29 +0000 (23:45 +0200)]
API param to exclude notification types from response (#1341)

* Add exclude_types param to /api/v1/notifications

* Exclude notification types in web UI through exclude_types in the API

8 years agoClean up generation of account webfinger string (#1477)
Matt Jankowski [Mon, 10 Apr 2017 20:58:06 +0000 (16:58 -0400)]
Clean up generation of account webfinger string (#1477)

* Consolidate webfinger string creation under Account#to_webfinger_s

* Introduce Account#local_username_and_domain for consolidation

8 years agoVersion bumps for ruby and misc gems (#1159)
Matt Jankowski [Mon, 10 Apr 2017 20:47:41 +0000 (16:47 -0400)]
Version bumps for ruby and misc gems (#1159)

* Update rspec-rails to version 3.5.2

* Update addressable to version 2.5.1

* Update autoprefixer-rails to version 6.7.7.1

* Update bullet to version 5.5.1

* Update domain_name to version 0.5.20170404

* Update letter_opener_web to version 1.3.1

* Upate redis-rails to version 5.0.2

* Update active_record_query_trace to version 1.5.4

* Update capistrano-rails to version 1.2.3

* Update dotenv-rails to version 2.2.0

* Update pg to version 0.20.0

* Update tilt to version 2.0.7

* Update warden to version 1.2.7

* Update tins to version 1.13.2

* Update terminal-table to version 1.7.3

* Update oj to version 2.18.5

* Update simplecov to version 0.14.1

* Update uglifier to version 3.1.13

* Update hashdiff to version 0.3.2

* Update webmock to version 2.3.2

* Update devise to version 4.2.1

* Use ruby version 2.4.1

* Update sass to version 3.4.23

* Update puma to version 3.8.2

* Update will_paginate to version 3.1.5

* Update font-awesome-rails to version 4.7.0.1

* Update fuubar to version 2.2.0

* Update pry-rails to version 0.3.6

* Update simple-navigation to version 4.0.5

* Update rubocop to version 0.48.1

* Update doorkeeper to version 4.2.5

* Update faker to version 1.7.3

* Update aws-sdk to version 2.9.5

* Update fabrication to version 2.16.1

* Update hamlit-rails to version 0.2.0

* Update http to version 2.2.1

* Update httplog to version 0.99.2

* Update sidekiq to version 4.2.10

* Update rspec-sidekiq to version 3.0.0

* Update pghero to version 1.6.4

* Update rack-cors to version 0.4.1

* Update i18n-tasks to version 0.9.13

* Update ruby-oembed to version 0.12.0

* Update jquery-rails to version 4.3.1

* Update simple_form to version 3.4.0

* Update react-rails to version 1.11.0

* Update aws-sdk to version 2.9.6

* Update sidekiq-unique-jobs to version 5.0.0

* Update uglifier to version 3.2.0

8 years agoAdd more specific class names to notification divs (#1120)
Chris Martin [Mon, 10 Apr 2017 20:41:52 +0000 (16:41 -0400)]
Add more specific class names to notification divs (#1120)

8 years agoMore SMTP customization (#1372)
Alexander Mankuta [Mon, 10 Apr 2017 19:48:30 +0000 (22:48 +0300)]
More SMTP customization (#1372)

* Allow SMTP auth method customization

* Add SMTP openssl_verify_mode option support

Allows one use self-signed certs with their SMTP server.

* Add SMTP enable_starttls_auto option support

8 years agoKeep newlines in xml (#1397)
Rachel H [Mon, 10 Apr 2017 19:32:45 +0000 (12:32 -0700)]
Keep newlines in xml (#1397)

8 years agoFix #1097 When onClick is falsy, do not make status content clickable (#1434)
Stephen Burgess [Mon, 10 Apr 2017 19:31:26 +0000 (14:31 -0500)]
Fix #1097 When onClick is falsy, do not make status content clickable (#1434)

8 years agoAllow typing a toot while an image uploads (#1429)
Jessica Stokes [Mon, 10 Apr 2017 19:30:58 +0000 (05:30 +1000)]
Allow typing a toot while an image uploads (#1429)

This patch stops disabling the toot text field when an image is uploading. Instead, you can type to your heart's content and when the image uploads it'll append the image URL, and restore the position of your cursor to wherever it was in the toot text just prior. Effectively, the image URL is appended to the toot, and typing is not interrupted at all! ✨

8 years agoFix issue with missing emojify class in views (#1455)
Matt Jankowski [Mon, 10 Apr 2017 19:27:52 +0000 (15:27 -0400)]
Fix issue with missing emojify class in views (#1455)

* Add missing emojify class to landing strip

* Add missing emojify class to simple_status partial

8 years agoAdmin base controller (#1465)
Matt Jankowski [Mon, 10 Apr 2017 19:27:03 +0000 (15:27 -0400)]
Admin base controller (#1465)

* Add Admin::BaseController to wrap admin area

Extracts the setting of the `admin` layout and verifying that users are admins
to a common base class for the admin/ controllers.

* Add basic coverage for admin/reports and admin/settings controllers

8 years agoFix references to "v1" API (#1460)
Alexsander Akers [Mon, 10 Apr 2017 19:11:59 +0000 (21:11 +0200)]
Fix references to "v1" API (#1460)

References to `vi` API version replaced with `v1`

8 years agoAdjust background of emoji panel (#1461)
Corey Dutson [Mon, 10 Apr 2017 18:56:14 +0000 (14:56 -0400)]
Adjust background of emoji panel (#1461)

Addresses #1451 which notes the emoji picker is too light. I agree, so I submit this adjustment.

Changes:
Changed the background to a darkened version of another system color

8 years agoImprove scrolling behaviour (#1415)
Jessica Stokes [Mon, 10 Apr 2017 14:27:30 +0000 (00:27 +1000)]
Improve scrolling behaviour (#1415)

* Replace column margin with padding

This improves horizontal scrolling behaviour significantly; scrolled flex elements are... a little weird.

* Move clear column button styling to css

8 years agoFix icon and emoji sizes (#1403)
Ram Lmn [Mon, 10 Apr 2017 11:02:09 +0000 (16:32 +0530)]
Fix icon and emoji sizes (#1403)

Fixes icons and emoji size issues described in #1233.

8 years agoMinor clarifications (#1386)
Ryan Freebern [Mon, 10 Apr 2017 11:01:43 +0000 (07:01 -0400)]
Minor clarifications (#1386)

8 years agoAdd Russian translation (ru) (#1023)
Ratmir Karabut [Mon, 10 Apr 2017 10:52:06 +0000 (13:52 +0300)]
Add Russian translation (ru) (#1023)

* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

8 years agoFix for Import issue from URL (#1416)
Jantso Porali [Mon, 10 Apr 2017 10:49:34 +0000 (12:49 +0200)]
Fix for Import issue from URL (#1416)

8 years agoAdd search to emoji picker (#1395)
Gavin Mogan [Mon, 10 Apr 2017 07:58:09 +0000 (00:58 -0700)]
Add search to emoji picker (#1395)

8 years agoDo not store last visited URL from API controllers (#1330)
Eugen [Sun, 9 Apr 2017 20:21:52 +0000 (22:21 +0200)]
Do not store last visited URL from API controllers (#1330)

Sign-in redirects you back to last visited URL, but in case of API requests,
this sometimes redirected users to an API URL that, of course, greeted them
with an {"error":"The access token is invalid"}

8 years agoFix #1339 - better Atom titles (#1343)
Eugen [Sun, 9 Apr 2017 18:55:54 +0000 (20:55 +0200)]
Fix #1339 - better Atom titles (#1343)

8 years agoFix /api/v1/accounts/update_credentials tests (#1357)
Eugen [Sun, 9 Apr 2017 18:23:14 +0000 (20:23 +0200)]
Fix /api/v1/accounts/update_credentials tests (#1357)

8 years agoMinor change to Entity on API.md (Relationship) (#1356)
Ornithologist Coder [Sun, 9 Apr 2017 17:10:38 +0000 (19:10 +0200)]
Minor change to Entity on API.md (Relationship) (#1356)

8 years agoupdate portuguese translation (#1280)
Hugo Gameiro [Sun, 9 Apr 2017 16:49:26 +0000 (17:49 +0100)]
update portuguese translation (#1280)

added the missing fields and improved the translation

8 years agoGet handle from atom feed's author/email field instead of guessing from URL (#1344)
ThibG [Sun, 9 Apr 2017 16:43:48 +0000 (18:43 +0200)]
Get handle from atom feed's author/email field instead of guessing from URL (#1344)

The goal of this change is to enhance Mastodon's handling of remote domains
for which the APIs reside on a different host (see issue #1032).

Indeed, when a remote user unknown to Mastodon is mentionned, only its profile
URL (e.g. https://social.example.org/users/User) is known, and Mastodon has to
build a @username@domain handle for it. To do so, Mastodon fetches the user's
atom feed (e.g., https://social.example.org/users/User.atom) and uses its
content to get the username part of the handle, and the URL's host part to
build the domain (e.g., @User@social.example.org). This handle is then used
for a Webfinger request.

In the case where example.org serves the Webfinger info for @User@example.org
and all feeds and APIs are hosted at social.example.org, Mastodon will still
build @User@social.example.org and fail at resolving the account's details
through Webfinger.

This patch changes this behaviour by using the author's email address from
the atom feed to build the handle. In Mastodon-generated atom feeds, the
email address is always the handle it expects for federation.

8 years agoUse HTTP Accept-Language to detect locale (#1166)
David Authier [Sun, 9 Apr 2017 16:40:24 +0000 (18:40 +0200)]
Use HTTP Accept-Language to detect locale (#1166)

* Use HTTP Accept-Language to detect locale

* Fix gem order to comply with codeclimate

* Sort gem to comply with rubocop

* I18n.default_locale fallback when there is no accept-language header

8 years agoMinor API.md changes (#1351)
Ornithologist Coder [Sun, 9 Apr 2017 16:36:03 +0000 (18:36 +0200)]
Minor API.md changes (#1351)

8 years agoMinor change on API.md (#1352)
Ornithologist Coder [Sun, 9 Apr 2017 16:35:51 +0000 (18:35 +0200)]
Minor change on API.md (#1352)

8 years agoAdd comment to settings.yml to nudge admins towards editing values via Web UI (#1289)
R Tucker [Sun, 9 Apr 2017 16:34:29 +0000 (12:34 -0400)]
Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289)

* Put a useful message for new admins on /about/more

I totally failed to realize this file was just defaults.  I think
this message would be a good default for people like me.

* Revert default site description, expand comment

This will keep setup-related stuff from leaking into public views,
while still hopefully keeping over-eager admins from editing this
file unnecessarily before RTFMing.  (e.g., me)

8 years agoAllow users to update their Account in the API (#1179)
David Celis [Sun, 9 Apr 2017 16:33:40 +0000 (09:33 -0700)]
Allow users to update their Account in the API (#1179)

* Allow users to update their Account in the API

It would be nice for API clients to be able to allow users to update
their accounts without having to wrap Mastodon in a web view. This patch
adds an API endpoint to let users submit a PATCH for their account.

Signed-off-by: David Celis <me@davidcel.is>
* Add /api/v1/accounts/update_credentials to the API docs

Signed-off-by: David Celis <me@davidcel.is>
8 years agoHelper cleanup (#1348)
Matt Jankowski [Sun, 9 Apr 2017 15:11:37 +0000 (11:11 -0400)]
Helper cleanup (#1348)

* Remove unused helper files

* Add coverage for application helper

* Add coverage for StreamEntriesHelper #display_name

8 years agoUpdate fr.jsx (#1329)
StefOfficiel [Sun, 9 Apr 2017 12:58:08 +0000 (14:58 +0200)]
Update fr.jsx (#1329)

* Update fr.jsx

* Remove duplicate translation

8 years agoFrench translation update (#1271)
Olivier Humbert [Sun, 9 Apr 2017 12:55:58 +0000 (14:55 +0200)]
French translation update (#1271)

* Update confirmation_instructions.fr.html.erb

consistency across the French translation

* Update

consistency across the French translation

* Update fr.yml

a bunch of consistency across the French translation + a few typos

* Update doorkeeper.fr.yml

consistency across the French translation (punctuation)

8 years agoFrench typo (#1257)
spf [Sun, 9 Apr 2017 12:54:47 +0000 (14:54 +0200)]
French typo (#1257)

* French typo

* Datetime french translation

8 years agoadd empty notifications french translation (#1111)
Jonathan Klee [Sun, 9 Apr 2017 12:54:02 +0000 (14:54 +0200)]
add empty notifications french translation (#1111)

8 years agoClean up about page (#1282)
Matt Jankowski [Sun, 9 Apr 2017 12:47:25 +0000 (08:47 -0400)]
Clean up about page (#1282)

* Add InstancePresenter to expose site details

* Clean up about controller, use instance presenter

8 years agoFixes #1311 margin shouldn't stay fixed (#1312)
Brian Mock [Sun, 9 Apr 2017 12:45:26 +0000 (05:45 -0700)]
Fixes #1311 margin shouldn't stay fixed (#1312)

8 years agoSearch cleanup (#1333)
Matt Jankowski [Sun, 9 Apr 2017 12:45:01 +0000 (08:45 -0400)]
Search cleanup (#1333)

* Clean up SQL output in Tag and Account search methods

* Add basic coverage for Tag.search_for

* Add coverage for Account.search_for

* Add coverage for Account.advanced_search_for

8 years agoIgnore implied formats for catch all route requests (#1340)
Matt Jankowski [Sun, 9 Apr 2017 12:39:41 +0000 (08:39 -0400)]
Ignore implied formats for catch all route requests (#1340)

A request to `/test` would show the custom 404 page, but a request to
`/test.test` would return a 404 with an empty body.

This change ignores the format on incoming catch all route requests, so that the
html 404 page is returned on these requests.

8 years agoFix nonworking clear notices button (#1316)
Rachel H [Sun, 9 Apr 2017 09:35:23 +0000 (02:35 -0700)]
Fix nonworking clear notices button (#1316)

8 years agoAdd env variable to disable prepared statements (#1293)
Eugen [Sun, 9 Apr 2017 03:46:32 +0000 (05:46 +0200)]
Add env variable to disable prepared statements (#1293)

8 years agoAllows setting log level in env variable (#1290)
Ash Furrow [Sat, 8 Apr 2017 23:42:13 +0000 (19:42 -0400)]
Allows setting log level in env variable (#1290)

* Allows setting log level in env variable.

* Made changes based on feedback in #1290.

8 years agoAdds user confirmation rake task (#1300)
Ash Furrow [Sat, 8 Apr 2017 23:09:46 +0000 (19:09 -0400)]
Adds user confirmation rake task (#1300)

* Adds task to confirm user by email.

* Adds documentation for manual confirmation.

8 years agoMake public timelines API not require user context/app credentials (#1291)
Eugen [Sat, 8 Apr 2017 21:39:31 +0000 (23:39 +0200)]
Make public timelines API not require user context/app credentials (#1291)

* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public
Fix #1156 - respect query params when generating pagination links in API

* Apply pagination fix to more APIs

8 years agoFix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
Eugen [Sat, 8 Apr 2017 20:20:08 +0000 (22:20 +0200)]
Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)

* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled

* Clean up

8 years agoImprove responsiveness of registration form and closed banner (#1265)
Pavel Djundik [Sat, 8 Apr 2017 16:31:50 +0000 (19:31 +0300)]
Improve responsiveness of registration form and closed banner (#1265)

8 years agoImprove about page responsiveness (#1252)
Pavel Djundik [Sat, 8 Apr 2017 13:28:23 +0000 (16:28 +0300)]
Improve about page responsiveness (#1252)

8 years agoAdd mst3k.interlinked.me to list of instances (#1235)
Elizabeth Myers [Sat, 8 Apr 2017 11:48:16 +0000 (06:48 -0500)]
Add mst3k.interlinked.me to list of instances (#1235)

8 years agoFix #1141, fix #1126 - Avatar/profile info fetching (#1215)
Eugen [Sat, 8 Apr 2017 11:26:03 +0000 (13:26 +0200)]
Fix #1141, fix #1126 - Avatar/profile info fetching (#1215)

* Fix #1141, fix #1126 - Work through UpdateRemoteProfileService for both <feed> and <entry> top-level tags

* Improve code quality, remove line unrelated to fix

8 years agoUpdate french translation (#1148)
Thomas Citharel [Sat, 8 Apr 2017 11:11:16 +0000 (13:11 +0200)]
Update french translation (#1148)

Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
8 years agoAdd titles to more icons, and change clear notifications icon. (#1101)
Markus Amalthea Magnuson [Sat, 8 Apr 2017 11:07:55 +0000 (13:07 +0200)]
Add titles to more icons, and change clear notifications icon. (#1101)

8 years agoUpdate mastodon.brussels instance name on List of Instances
kadiix [Sat, 8 Apr 2017 11:05:49 +0000 (13:05 +0200)]
Update mastodon.brussels instance name on List of Instances

Correct mastodon.brussels.fr to mastodon.brussels

8 years agoUpdated German translation (#1248)
Nicolai von Neudeck [Sat, 8 Apr 2017 11:04:58 +0000 (13:04 +0200)]
Updated German translation (#1248)

Fixed various spelling and grammar mistakes.
Used more gender-neutral language.

8 years agoFixed two translation errors (#1139)
Sebastian Hübner [Sat, 8 Apr 2017 11:03:11 +0000 (13:03 +0200)]
Fixed two translation errors (#1139)

Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx

8 years agoUpdate simple_form.de.yml (#971)
Korbinian [Sat, 8 Apr 2017 11:02:07 +0000 (13:02 +0200)]
Update simple_form.de.yml (#971)

8 years agoUpdate mastodon.nuzgo.net (#1242)
Thibaut (Eychics) [Sat, 8 Apr 2017 10:34:53 +0000 (12:34 +0200)]
Update mastodon.nuzgo.net (#1242)

Add ipv6 support

8 years agoAdd OTP_SECRET to Heroku app.json (#1246)
James Smith [Sat, 8 Apr 2017 10:31:33 +0000 (11:31 +0100)]
Add OTP_SECRET to Heroku app.json (#1246)

8 years agoRevert "add persistance to Postresql container" (#1251)
Eugen [Sat, 8 Apr 2017 10:25:23 +0000 (12:25 +0200)]
Revert "add persistance to Postresql container" (#1251)

8 years agoUpdated about page in Finnish language (#1170)
Jantso Porali [Sat, 8 Apr 2017 10:17:34 +0000 (12:17 +0200)]
Updated about page in Finnish language (#1170)

* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation

8 years agoFrench translation update (#1188)
Olivier Humbert [Sat, 8 Apr 2017 10:16:49 +0000 (12:16 +0200)]
French translation update (#1188)

* Update fr.yml

one typo fix

* Update simple_form.fr.yml

one translation consistency

8 years agoAdd some missing strings to prevent some React warning in the console (#1230)
Alda Marteau-Hardi [Sat, 8 Apr 2017 10:16:16 +0000 (12:16 +0200)]
Add some missing strings to prevent some React warning in the console (#1230)

8 years agoUse Setting.site_title value for `og:site_name` occurrences (#1194)
Matt Jankowski [Sat, 8 Apr 2017 10:15:40 +0000 (06:15 -0400)]
Use Setting.site_title value for `og:site_name` occurrences (#1194)

* Add helper method to return Setting.site_title

* Use site_title helper in application layout

* Use site_title value for og:site_name

8 years agoMerge pull request #1239 from ineffyble/patch-2
Eugen [Sat, 8 Apr 2017 09:40:43 +0000 (11:40 +0200)]
Merge pull request #1239 from ineffyble/patch-2

Fix my URL

8 years agoMerge pull request #1238 from milmazz/hunter-client
Eugen [Sat, 8 Apr 2017 09:40:20 +0000 (11:40 +0200)]
Merge pull request #1238 from milmazz/hunter-client

Add reference to Elixir client for Mastodon API

8 years agoMerge pull request #887 from valentin2105/master
Eugen [Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)]
Merge pull request #887 from valentin2105/master

add persistance to Postresql container

8 years agoMerge pull request #1115 from vmincev/patch-1
Eugen [Sat, 8 Apr 2017 09:38:54 +0000 (11:38 +0200)]
Merge pull request #1115 from vmincev/patch-1

Update Production-guide.md

8 years agoMerge pull request #1198 from huertanix/patch-1
Eugen [Sat, 8 Apr 2017 09:38:33 +0000 (11:38 +0200)]
Merge pull request #1198 from huertanix/patch-1

Update Heroku-guide.md

8 years agoMerge pull request #1221 from rbaumert/patch-1
Eugen [Sat, 8 Apr 2017 09:37:51 +0000 (11:37 +0200)]
Merge pull request #1221 from rbaumert/patch-1

fixed a sentence in readme

8 years agoMerge pull request #1224 from chrisheninger/patch-1
Eugen [Sat, 8 Apr 2017 09:37:37 +0000 (11:37 +0200)]
Merge pull request #1224 from chrisheninger/patch-1

Add SVG version of logo to repo

8 years agoMerge pull request #1218 from R0ckweb/patch-2
Eugen [Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)]
Merge pull request #1218 from R0ckweb/patch-2

Fix #1141 on remote follow

8 years agoMerge pull request #1216 from tootsuite/fix-default-locale-regression
Eugen [Sat, 8 Apr 2017 09:36:43 +0000 (11:36 +0200)]
Merge pull request #1216 from tootsuite/fix-default-locale-regression

Fix #1165 - Default locale no longer breaks form submissions

8 years agoMerge pull request #1213 from tootsuite/fix-accounts-initial-case
Eugen [Sat, 8 Apr 2017 09:36:35 +0000 (11:36 +0200)]
Merge pull request #1213 from tootsuite/fix-accounts-initial-case

Fix #801 - Respect webfinger's canonical response of username/domain

8 years agoMerge pull request #1225 from tootsuite/yiskah-patch-1
Eugen [Sat, 8 Apr 2017 09:35:40 +0000 (11:35 +0200)]
Merge pull request #1225 from tootsuite/yiskah-patch-1

Close instance list to additions

8 years agoAdd reference to Elixir client for Mastodon API
Milton Mazzarri [Sat, 8 Apr 2017 07:48:52 +0000 (02:48 -0500)]
Add reference to Elixir client for Mastodon API

8 years agoFix my URL
Effy Elden [Sat, 8 Apr 2017 06:22:07 +0000 (16:22 +1000)]
Fix my URL

Update my URL since toot.zone was shut down.

8 years agoMerge branch 'master' into patch-1
rbaumert [Sat, 8 Apr 2017 04:39:24 +0000 (21:39 -0700)]
Merge branch 'master' into patch-1

8 years agoMerge branch 'master' into master
Valentin Ouvrard [Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)]
Merge branch 'master' into master

8 years agoClose instance list to additions
Shel R [Sat, 8 Apr 2017 03:51:30 +0000 (23:51 -0400)]
Close instance list to additions

8 years agoMerge branch 'master' into fix-default-locale-regression
Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:50:21 +0000 (20:50 -0700)]
Merge branch 'master' into fix-default-locale-regression

8 years agoMerge branch 'master' into patch-2
Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:48:27 +0000 (20:48 -0700)]
Merge branch 'master' into patch-2

8 years agoAdd SVG version of logo to repo
Chris Heninger [Sat, 8 Apr 2017 03:40:18 +0000 (20:40 -0700)]
Add SVG version of logo to repo

8 years agoMerge pull request #1137 from Noiwex/patch-1
Shel R [Sat, 8 Apr 2017 03:16:46 +0000 (23:16 -0400)]
Merge pull request #1137 from Noiwex/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 03:15:17 +0000 (23:15 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1197 from blakebarnett/add_indigo_zone_instance
Shel R [Sat, 8 Apr 2017 03:10:25 +0000 (23:10 -0400)]
Merge pull request #1197 from blakebarnett/add_indigo_zone_instance

Add indigo.zone to list of instances

8 years agoMerge branch 'master' into add_indigo_zone_instance
Shel R [Sat, 8 Apr 2017 03:09:50 +0000 (23:09 -0400)]
Merge branch 'master' into add_indigo_zone_instance

8 years agoMerge pull request #1196 from mouse-reeve/list-oulipo-social
Shel R [Sat, 8 Apr 2017 03:09:09 +0000 (23:09 -0400)]
Merge pull request #1196 from mouse-reeve/list-oulipo-social

Adds Oulipo.social to Mastodons list

8 years agoMerge branch 'master' into list-oulipo-social
Shel R [Sat, 8 Apr 2017 03:08:41 +0000 (23:08 -0400)]
Merge branch 'master' into list-oulipo-social