Eugen Rochko
2a4499bb23
Merge branch 'master' into skylight
2017-04-08 22:27:03 +02:00
Eugen
9acdb166e8
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
2017-04-08 22:20:08 +02:00
Pavel Djundik
470eb0042e
Improve responsiveness of registration form and closed banner ( #1265 )
2017-04-08 18:31:50 +02:00
Pavel Djundik
fc146a19cc
Improve about page responsiveness ( #1252 )
2017-04-08 15:28:23 +02:00
Elizabeth Myers
941a593ea8
Add mst3k.interlinked.me to list of instances ( #1235 )
2017-04-08 21:48:16 +10:00
Eugen Rochko
e258d05848
Merge branch 'master' into skylight
2017-04-08 13:27:04 +02:00
Eugen
982fef811e
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
2017-04-08 13:26:03 +02:00
Eugen Rochko
7c81c0f7cb
Merge branch 'master' into skylight
2017-04-08 13:24:25 +02:00
Thomas Citharel
41f8fde83e
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>
2017-04-08 13:11:16 +02:00
Markus Amalthea Magnuson
157f0a2aa7
Add titles to more icons, and change clear notifications icon. ( #1101 )
2017-04-08 13:07:55 +02:00
kadiix
49043f644d
Update mastodon.brussels instance name on List of Instances
...
Correct mastodon.brussels.fr to mastodon.brussels
2017-04-08 21:05:49 +10:00
Nicolai von Neudeck
c803f5b440
Updated German translation ( #1248 )
...
Fixed various spelling and grammar mistakes.
Used more gender-neutral language.
2017-04-08 13:04:58 +02:00
Sebastian Hübner
f860eb7d71
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
2017-04-08 13:03:11 +02:00
Korbinian
8f9a11b642
Update simple_form.de.yml ( #971 )
2017-04-08 13:02:07 +02:00
Thibaut (Eychics)
c6b0707cf6
Update mastodon.nuzgo.net ( #1242 )
...
Add ipv6 support
2017-04-08 20:34:53 +10:00
James Smith
b79c80b620
Add OTP_SECRET to Heroku app.json ( #1246 )
2017-04-08 20:31:33 +10:00
Eugen
211920b622
Revert "add persistance to Postresql container" ( #1251 )
2017-04-08 12:25:23 +02:00
Jantso Porali
01d8003867
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
2017-04-08 12:17:34 +02:00
Olivier Humbert
ed3dfd0bee
French translation update ( #1188 )
...
* Update fr.yml
one typo fix
* Update simple_form.fr.yml
one translation consistency
2017-04-08 12:16:49 +02:00
Alda Marteau-Hardi
35eff3f2d0
Add some missing strings to prevent some React warning in the console ( #1230 )
2017-04-08 12:16:16 +02:00
Matt Jankowski
ca44c13455
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
2017-04-08 12:15:40 +02:00
Eugen
a345eb44fc
Merge pull request #1239 from ineffyble/patch-2
...
Fix my URL
2017-04-08 11:40:43 +02:00
Eugen
7b814d5bcb
Merge pull request #1238 from milmazz/hunter-client
...
Add reference to Elixir client for Mastodon API
2017-04-08 11:40:20 +02:00
Eugen
9f9f4b248e
Merge pull request #887 from valentin2105/master
...
add persistance to Postresql container
2017-04-08 11:39:25 +02:00
Eugen
3660f01f60
Merge pull request #1115 from vmincev/patch-1
...
Update Production-guide.md
2017-04-08 11:38:54 +02:00
Eugen
a2ec54a20b
Merge pull request #1198 from huertanix/patch-1
...
Update Heroku-guide.md
2017-04-08 11:38:33 +02:00
Eugen
e33dcb79c6
Merge pull request #1221 from rbaumert/patch-1
...
fixed a sentence in readme
2017-04-08 11:37:51 +02:00
Eugen
7d5ea5c170
Merge pull request #1224 from chrisheninger/patch-1
...
Add SVG version of logo to repo
2017-04-08 11:37:37 +02:00
Eugen
33849acfa7
Merge pull request #1218 from R0ckweb/patch-2
...
Fix #1141 on remote follow
2017-04-08 11:37:13 +02:00
Eugen
c141f0a886
Merge pull request #1216 from tootsuite/fix-default-locale-regression
...
Fix #1165 - Default locale no longer breaks form submissions
2017-04-08 11:36:43 +02:00
Eugen
55d03da303
Merge pull request #1213 from tootsuite/fix-accounts-initial-case
...
Fix #801 - Respect webfinger's canonical response of username/domain
2017-04-08 11:36:35 +02:00
Eugen
2c3a730eae
Merge pull request #1225 from tootsuite/yiskah-patch-1
...
Close instance list to additions
2017-04-08 11:35:40 +02:00
Milton Mazzarri
b04cbb9f5d
Add reference to Elixir client for Mastodon API
2017-04-08 02:48:52 -05:00
Effy Elden
75aade3de2
Fix my URL
...
Update my URL since toot.zone was shut down.
2017-04-08 16:22:07 +10:00
rbaumert
ac0b84534e
Merge branch 'master' into patch-1
2017-04-07 21:39:24 -07:00
Valentin Ouvrard
3c48c9ac2e
Merge branch 'master' into master
2017-04-08 15:11:20 +11:00
Shel R
ecf0320a78
Close instance list to additions
2017-04-07 23:51:30 -04:00
Kurtis Rainbolt-Greene
40703b96fa
Merge branch 'master' into fix-default-locale-regression
2017-04-07 20:50:21 -07:00
Kurtis Rainbolt-Greene
1e4453405b
Merge branch 'master' into patch-2
2017-04-07 20:48:27 -07:00
Chris Heninger
0ad694f96b
Add SVG version of logo to repo
2017-04-07 20:40:18 -07:00
Shel R
541c538f9b
Merge pull request #1137 from Noiwex/patch-1
...
Update List-of-Mastodon-instances.md
2017-04-07 23:16:46 -04:00
Shel R
50910d1543
Merge branch 'master' into patch-1
2017-04-07 23:15:17 -04:00
Shel R
4ff8653d6c
Merge pull request #1197 from blakebarnett/add_indigo_zone_instance
...
Add indigo.zone to list of instances
2017-04-07 23:10:25 -04:00
Shel R
17690f51a2
Merge branch 'master' into add_indigo_zone_instance
2017-04-07 23:09:50 -04:00
Shel R
cf80cb5e8b
Merge pull request #1196 from mouse-reeve/list-oulipo-social
...
Adds Oulipo.social to Mastodons list
2017-04-07 23:09:09 -04:00
Shel R
315ff648c8
Merge branch 'master' into list-oulipo-social
2017-04-07 23:08:41 -04:00
Shel R
41923d1c6b
Merge pull request #1186 from Aguay-val/patch-2
...
Add mastodon.fun
2017-04-07 23:07:50 -04:00
Shel R
63686fd36f
Merge branch 'master' into patch-2
2017-04-07 23:05:08 -04:00
Shel R
ae9d2f4a32
Merge branch 'master' into patch-1
2017-04-07 23:03:07 -04:00
Shel R
741bbba6ff
Merge branch 'master' into patch-1
2017-04-07 22:59:07 -04:00
