2d2b114d9b
Update fr.yml ( #1600 )
...
Mistake on %{link} variable
2017-04-12 19:56:09 +02:00
bf7306636e
Allow import/export of mutes list ( #1541 )
...
* Allow export of mutes list
* Allow importing of mutes list
* Refactor to use Settings::Exports::BaseController and DRY up exports code
2017-04-12 18:20:44 +02:00
7fd5075806
Added missing Spanish translations strings ( #1292 )
...
* Added missing Spanish translations strings
* fix bad translation
* resolve conflict with tootsuite/master
* agreements from spanish community
* Add some missing strings
2017-04-12 17:16:40 +02:00
cd2324b07b
Make Reporting admin section translatable ( #1549 )
...
* Make Reporting admin section translatable
And translate it into english and french
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Make subject of emails translatable and improve french translation
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Make error pages translatable and translate them in english and french
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Translate site setting section
* Insert instance in registration emails and improve them a bit
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-12 17:11:49 +02:00
b2c1df5c20
Working translation for Norwegian. ( #1611 )
2017-04-12 17:07:51 +02:00
a3bfac26fb
Add Traditional Chinese, Hong Kong translation (zh-HK) ( #1544 )
...
* Added Chinese Traditional Hong Kong (zh-HK) for Ruby
* Added translations for Ruby.
* Added Chinese Traditional Hong Kong (zh-HK) for JS
* Added translations for javascript code.
* Rearrange language references in mastodon.jsx
* Break `addLocaleData` into multiple lines. Make future commit more readable.
* Roughly re-sort the languages in alphabetical orders
(only manually put English on top because it is default).
* Sort application.rb locale with alphabetical order
With exception that English (default language) goes first.
Improve code readability.
* Resort language selection box alphabetically
Sort HUMAN_LOCALES in the alphabetical order of display name
(except English, the default language, come first).
Improve usability.
2017-04-12 08:50:50 +02:00
c471e5c694
Update french locale ( #1525 )
...
* Update devise.fr.yml fixing minor typos
* add missing strings
* Fix a translation and add translation for devise part
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-11 21:54:40 +02:00
601d93bfc3
Add Japanese translation ( #1552 )
...
* add device.ja.yml
* update device.ja.yml
* add file simple_form.ja.yml
* 👍 Added doorkeeper.ja.yml
* add ja.yml
* Update doorkeeper.ja.yml
fixed url to uri
* update ja.yml
* fix some translations
* fix japanese grammar of a translate
* fix some translates
* fix ja.yml
* add ja.jsx
* add Japanese user mail views
* Added japanese translate locales
* Added :ja to available_locales
こっちも
* Added "日本語" to HUMAN_LOCALES
* Imported/Added ja to addLocaleData
* update ja.jsx
2017-04-11 21:52:09 +02:00
58a75b4bed
Revised finnish translation ( #1537 )
2017-04-11 21:41:40 +02:00
b1b9d0fee7
Update language files ( #1516 )
...
* 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
* fix for Amazon S3/Minio instance setups
If you were using S3 or Minio for your files, this will fix the Import issue :)
* update translation according to issue #1515
See issue #1515
* update translation for issue #1515
see issue #1515
2017-04-11 21:41:29 +02:00
b440b2a9ee
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
2017-04-11 20:43:56 +02:00
e7d77f4e13
Allow user to disable the boost confirm dialog in preferences
2017-04-11 10:10:16 -04:00
fcec9fcd99
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
2017-04-11 01:11:41 +02:00
ac50bab158
Add Russian translation (ru) ( #1023 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
2017-04-10 12:52:06 +02:00
d473a092e3
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)
2017-04-09 14:55:58 +02:00
3bfac1374d
French typo ( #1257 )
...
* French typo
* Datetime french translation
2017-04-09 14:54:47 +02:00
b532134503
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
a9863c1708
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
201019e2c3
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
58fcc553f3
Update simple_form.de.yml ( #971 )
2017-04-08 13:02:07 +02:00
3c063ae050
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
10a0055a2a
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
3b9a56d4b3
Merge branch 'master' into master
2017-04-07 22:21:21 -04:00
1a82d2bde6
Use I18n for media attachment validation errors
...
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
2017-04-07 14:23:18 -04:00
fb0ce9d38d
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
783de713cd
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
5c414eeb45
updated blocking translation
2017-04-05 14:53:35 +02:00
16d14e854b
updated two-way auth and preferences translation
2017-04-05 14:49:29 +02:00
d49612327a
updated translation for about page
2017-04-05 14:47:42 +02:00
c0295924bc
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
c33a8ce307
updated reblog to boost translation
...
Since it is that :D
2017-04-05 09:57:25 +02:00
7ea7713997
udpdated display_name translation
2017-04-05 09:52:31 +02:00
b97a8236fb
updated reblog translation
2017-04-05 09:51:35 +02:00
d9f1e07c6c
Fix spec
2017-04-05 03:31:26 +02:00
05de364fbc
Merge pull request #863 from Eychics/master
...
Add closed_registrations message on French language
2017-04-05 03:11:13 +02:00
c571ed77d7
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
cc82f3adff
Merge pull request #866 from kklleemm/patch-1
...
Fix typos on french translations
2017-04-05 03:06:41 +02:00
45c3772ddb
Merge pull request #792 from chapeaumeinfreund/master
...
Updated and fixed german orthography
2017-04-05 03:05:50 +02:00
27b758f328
Merge pull request #790 from chapeaumeinfreund/patch-1
...
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
2f7da4167f
Merge pull request #805 from nevillepark/master
...
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
ba8744d0a7
Fix typos on french translations
2017-04-04 19:09:54 +02:00
6afd3a6eab
Add closed_registrations message on French language
2017-04-04 18:58:19 +02:00
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
0c0e1c2519
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
0c0acb22e6
updated translation
2017-04-04 08:29:53 +02:00
7b297cc6d2
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
d6d192c914
added Esperanto (eo)
2017-04-03 20:22:50 +02:00
c23ef9a706
Fix norwegian translation being malformed
2017-04-03 19:50:55 +02:00
ce9bb73e96
Updated and fixed orthography
2017-04-03 19:10:48 +02:00
b8324b3aed
Updated and fixed german orthography
2017-04-03 19:01:17 +02:00
6ebe31e716
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
c1f52eaff1
Add Norwegian locale
2017-04-03 16:32:03 +02:00
e74a4efa20
another typo. fuck me
2017-04-03 14:56:13 +02:00
54db5aa06c
fixed an sneaky peaky tpy
2017-04-03 14:54:53 +02:00
bed61b7cc4
add finnish translation
...
add finnish translation
2017-04-03 14:43:07 +02:00
aa77d63da9
add finnish translation
...
add finnish translation
2017-04-03 14:20:50 +02:00
35ad63910d
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
cbff9a2e15
finnish translation
...
finnish translation
2017-04-03 13:25:46 +02:00
5045c23636
updated final translation
...
updated final translation
2017-04-03 13:07:09 +02:00
7606beb4dd
Create new translation file
...
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
38bf31d425
Improve french translation
2017-04-03 11:04:00 +02:00
7d5921dd5c
Improve French translation
...
Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03 03:16:37 +02:00
066b904205
Fix typo in simple_form.fr.yml
2017-04-02 14:04:06 -07:00
b7554089cb
Improve translation of data import in fr.yml
2017-04-02 14:03:57 -07:00
6162adec16
Better translation for revoked token in doorkeeper.fr.yml
2017-04-02 14:03:41 -07:00
53e0834cf4
Fix date format in doorkeeper.fr.yml
2017-04-02 14:03:31 -07:00
180edd4baa
Add locale in devise.fr.yml
2017-04-01 23:38:40 -07:00
9ba1d01fe4
Add french translation for "scopes" in doorkeeper.fr.yml
2017-04-01 23:35:11 -07:00
cfc96a619c
Fix small typo in doorkeeper.fr.yml
2017-04-01 23:34:37 -07:00
ef1c4de714
Complete localization of in simple_form.fr.yml
2017-04-01 23:26:26 -07:00
b256d43b14
Improve french locales on the backend (WIP)
2017-04-01 23:15:49 -07:00
be9accbacc
Fix #700 - hide spoilers on static pages
2017-03-31 13:54:36 +02:00
244da78105
Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )
2017-03-30 19:42:33 +02:00
74fb333eb7
Fix up some localizations
2017-03-26 13:22:38 +02:00
58c9d97d07
🌐 add simplified chinese language
2017-03-26 14:13:18 +08:00
e4205b09d1
🚧 chinese translation WIP
2017-03-24 19:03:14 +08:00
017e3b7da8
🌐 add chinese language file
2017-03-24 18:53:41 +08:00
8785e271bf
Improved landing page
2017-03-21 19:18:37 +01:00
47c74efa85
Add landing strip
2017-03-20 03:36:29 +01:00
b339e488fe
Export follow/block lists as CSV
2017-03-19 20:29:41 +01:00
5c7b222769
Promote Apps ( #670 )
...
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
0cb5a2a0a7
Add digest e-mails
2017-03-04 00:00:48 +01:00
a741049a77
Fix #104 - Style OAuth authorized applications page
...
Add ability to search accounts by display name
2017-02-27 00:15:00 +01:00
a83dc927d8
Fix #587 - Display TOTP secret next to QR code
2017-02-13 20:56:03 +01:00
32580cc661
Site title is now a setting
2017-02-10 22:37:11 +01:00
3f854bd75c
Add link to other instances text
...
Text for link to other instances
2017-02-10 13:08:47 -05:00
b1f2683ecc
Add API modifiers to limit returned toots from public/hashtag timelines
...
to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen
2017-02-06 23:16:20 +01:00
38b7551359
Add "open in web" link to detailed public status pages
2017-01-30 23:01:37 +01:00
c58da52e9f
Split 2FA login into two prompts
2017-01-28 20:43:38 +01:00
557de8e24c
Update settings to re-use admin layout, one big navigation tree, improve settings forms
2017-01-28 03:56:10 +01:00
9b8670c939
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
959e064186
Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text
...
Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations
2017-01-25 01:29:16 +01:00
5d88ef90c9
Fix tests, add applications to eager loading/cache for statuses, fix
...
application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464 until it's consistent with non-animated version
2017-01-15 14:01:33 +01:00
21c888fefd
Add a textual 'Back to Mastodon' link in footer of settings pages
2017-01-15 11:03:35 +11:00
f2667139ad
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
4293e132d1
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
b115602bb7
"Reblog" -> "boost" in more places
...
A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI
2017-01-04 18:00:50 -08:00
df2f14d2dd
Adding remote follow button
2017-01-01 19:54:34 +01:00
57f6f80838
Add ability to use remote follow function on other sites
2016-12-29 16:54:54 +01:00
fde1917a54
Add preferences for follow request notification e-mails
2016-12-26 22:04:16 +01:00
cef68b9b1c
Follow requests send e-mail notifications, but are excluded from notifications API
...
Better initial state for unlisted/nsfw toggles
2016-12-26 21:52:03 +01:00
6a54df90c8
Replacing follow requests in the settings area with in-UI column
2016-12-26 21:33:51 +01:00
302051ffcb
Add page for authorizing/rejecting follow requests
2016-12-23 00:04:52 +01:00
6931b9bf32
Adjust wording
2016-12-22 23:24:46 +01:00
77cd58545d
Re-enable Webfinger for locked accounts but don't handle "follow" events
...
coming in via Salmon.
Currently no way to prevent remote follows, but they will only receive public
and unlisted posts
2016-12-22 23:17:57 +01:00
238233440f
Follow call on locked account creates follow request instead
...
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
2016-12-22 23:03:57 +01:00
090e3a245d
Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen
2016-12-21 00:13:13 +01:00
4bfaca1470
Merge pull request #356 from victorhck/master
...
added two missings spanish translations
2016-12-18 21:22:46 +01:00
346aae50b0
Adjusting public display of statuses to look similar to logged-in UI,
...
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive
content behind a spoiler on public pages
2016-12-18 19:47:11 +01:00
b254629157
added to missings spanish translations
2016-12-14 18:43:00 +01:00
7fb69d5153
Fix translations
2016-12-09 11:52:09 +01:00
7a08597e6e
Fix some translation errors.
2016-12-07 21:13:57 +02:00
8266ff2d69
Final steps for Ukrainian translation
2016-12-07 20:39:22 +02:00
83cb3eecd2
Merge pull request #338 from stamak/uk.yml
...
Add Ukrainian localization file uk.yml
2016-12-05 12:30:07 +01:00
01623e2650
Add Ukrainian localization file uk.yml
...
Closes : #337
2016-12-05 07:40:45 +02:00
e5e702a976
Adding configurable e-mail blacklist
2016-12-04 19:07:02 +01:00
5c6faa8cc4
Add Ukrainian localization file doorkeeper.uk.yml
...
Closes : #334
2016-12-03 09:46:26 +02:00
3966353feb
Fix line endings for Portuguese locale
2016-12-01 17:27:47 +00:00
8260628fc8
Fix pt translations, improve pre-cache queries, removing will_paginate
...
from accounts/tags because it's a terribly inefficient way to paginate
large sets of data
2016-12-01 16:26:25 +01:00
1028ee341b
Create pt localisation files in /config/locales/
2016-11-30 23:04:53 -01:00
8d4ef0b6c3
Per-status control for unlisted mode, also federation for unlisted mode
...
Fix #233 , fix #268
2016-11-30 21:34:59 +01:00
329b2a326d
Normalize localizations, add stub for admin/accounts
2016-11-30 15:32:26 +01:00
313ebb4962
Merge pull request #275 from kodacs/master
...
Hungarian translation for Mastodon.
2016-11-26 18:33:48 +01:00
2774adc6fe
fixing yamls for #275
2016-11-25 13:57:37 +01:00
9849c564de
fix #275
2016-11-25 13:35:08 +01:00
8cd2d6a174
Merge branch 'master' into french-translation
2016-11-25 13:33:00 +01:00
3958b6c655
Update simple_form.fr.yml
2016-11-25 13:30:52 +01:00
9798cf624a
Normalized locale files
2016-11-25 13:15:07 +01:00
8183330361
Merge pull request #273 from nclm/french-translation
...
French localisation update
2016-11-25 13:14:30 +01:00
ea0846645a
Fix #65 - Options to block notifications from people you don't follow/who don't follow you
2016-11-25 13:13:16 +01:00
6d952d6815
Server side HU translation + Toot fix.
2016-11-25 12:43:23 +01:00
283623e3d4
Update simple_form.fr.yml
2016-11-25 09:25:31 +01:00
ed8361b57a
Update fr.yml
2016-11-25 09:25:29 +01:00
cb19a97e3e
Update doorkeeper.fr.yml
...
e
2016-11-23 14:47:41 +01:00
85e53eb127
Update doorkeeper.fr.yml
2016-11-23 14:45:31 +01:00
33ccf97c49
Fix broken locales
2016-11-22 11:34:36 +01:00
a731b0d15a
Update fr.yml
2016-11-22 10:39:15 +01:00
9725264490
Update simple_form.fr.yml
...
silenced mode + edits
2016-11-22 10:32:43 +01:00
1a9ad408e8
Merging code updates (Unlisted Mode)
2016-11-22 10:25:17 +01:00
74df3ba1d7
Local accounts can control "silenced" attribute which removes them from public timeline
2016-11-21 23:06:41 +01:00
d20ba4c34c
Importing doorkeeper.fr.yml
...
From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml
2016-11-21 22:39:20 +01:00
324fe9b102
Importing devise.fr.yml
...
From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013
2016-11-21 22:34:50 +01:00
8532fe10d6
First version for simple_form.fr.yml
2016-11-21 21:30:13 +01:00
a100ad0334
First version for fr.yml
2016-11-21 21:25:27 +01:00
fd49a94259
Create devise.fr.yml
2016-11-21 20:59:41 +01:00
cdf8b2019a
Create doorkeeper.fr.yml
2016-11-21 20:59:13 +01:00
2bf59ee5c5
Create simple_form.fr.yml
2016-11-21 20:58:43 +01:00
d9c0211b88
Create fr.yml
2016-11-21 20:57:28 +01:00
29928a1082
improvements in text made by Ekaitz
2016-11-20 00:52:06 +01:00
6185b4167f
fix typos, and suggestions made by Ekaitz
2016-11-20 00:50:45 +01:00
132d231107
Fix wrong language declaration
2016-11-19 18:31:36 +01:00
9d766cd6bf
Fix wrong language declaration
2016-11-19 18:31:21 +01:00
d3aa9f7961
finished spanish translation config files
2016-11-19 17:45:45 +01:00
42fb16ec3a
Activating Spanish i18n
2016-11-19 00:10:47 +01:00
c12e893e7e
Spanish translation for devise.es.yml
2016-11-18 23:57:03 +01:00
84db0df531
finished spanish translation for es.yml
2016-11-18 23:04:26 +01:00
689077f743
started sp translations config locales
2016-11-18 20:39:40 +01:00
a82a15a38e
Adding german localization
2016-11-18 15:53:46 +01:00
b8e6ca45e5
Add user locale setting
2016-11-16 17:56:31 +01:00
1b61e404b4
Localizations for most server-side strings
2016-11-16 00:55:33 +01:00
0e956910c3
Adding some localizations
2016-11-15 23:02:57 +01:00
6657414266
Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting
...
to the API
2016-10-22 19:39:44 +02:00
9f2df5672e
use consistent capitalization for subject lines
2016-10-06 11:16:59 +01:00
043ff2f616
Update default devise wording to include reference to Mastodon
...
Fix #68
2016-10-06 07:45:07 +02:00
3441361568
Adding simple_form, adding profile settings, header image
2016-03-12 20:47:22 +01:00
ab6696e855
Adding doorkeeper, adding a REST API
...
POST /api/statuses Params: status (text contents), in_reply_to_id (optional)
GET /api/statuses/:id
POST /api/statuses/:id/reblog
GET /api/accounts/:id
GET /api/accounts/:id/following
GET /api/accounts/:id/followers
POST /api/accounts/:id/follow
POST /api/accounts/:id/unfollow
POST /api/follows Params: uri (e.g. user@domain)
OAuth authentication is currently disabled, but the API can be used with HTTP Auth.
2016-03-07 12:42:33 +01:00
7e93da3f8d
Removing grape and adding devise
2016-03-05 13:12:24 +01:00
9c4856bdb1
Initial commit
2016-02-20 22:53:20 +01:00
CgX