Commit Graph

6696 Commits (4f2bf28a86b0f2b3aa9bd40ad2434c2544271dd8)

Author SHA1 Message Date
nicolas 28884e0860 Merge pull request #2 from Gargron/master
Merge
2016-11-22 17:26:17 +01:00
Eugen Rochko 71c7cd9f6c Merge branch 'nclm-french-translation' 2016-11-22 11:35:15 +01:00
Eugen Rochko 33ccf97c49 Fix broken locales 2016-11-22 11:34:36 +01:00
nicolas 5902e95af9 Update fr.jsx 2016-11-22 10:49:50 +01:00
nicolas a731b0d15a Update fr.yml 2016-11-22 10:39:15 +01:00
nicolas 9725264490 Update simple_form.fr.yml
silenced mode + edits
2016-11-22 10:32:43 +01:00
nicolas 1a9ad408e8 Merging code updates (Unlisted Mode) 2016-11-22 10:25:17 +01:00
nicolas 1555bf8400 Adding French locale to mastodon.jsx 2016-11-22 10:21:56 +01:00
nicolas 2a1b5185b3 Adding French locale to settings_helper.rb 2016-11-22 10:20:28 +01:00
Eugen Rochko 74df3ba1d7 Local accounts can control "silenced" attribute which removes them from public timeline 2016-11-21 23:06:41 +01:00
nicolas 1aeebf8de5 Adding French locale 2016-11-21 22:46:59 +01:00
nicolas 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
nicolas 324fe9b102 Importing devise.fr.yml
From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013
2016-11-21 22:34:50 +01:00
Eugen Rochko 7e8f1061dd Fix #163 - No need for Safari chrome on iOS 2016-11-21 22:33:44 +01:00
nicolas c6ca8f8f2f First version for fr.jsx 2016-11-21 22:06:05 +01:00
Eugen Rochko 0943e98288 Adding option to specify asset server, filter followers query by local accounts
during Fan Out On Write to load less stuff into memory
2016-11-21 22:04:10 +01:00
nicolas 14e9972858 Create fr.jsx 2016-11-21 21:51:34 +01:00
nicolas 8532fe10d6 First version for simple_form.fr.yml 2016-11-21 21:30:13 +01:00
nicolas a100ad0334 First version for fr.yml 2016-11-21 21:25:27 +01:00
nicolas fd49a94259 Create devise.fr.yml 2016-11-21 20:59:41 +01:00
nicolas cdf8b2019a Create doorkeeper.fr.yml 2016-11-21 20:59:13 +01:00
nicolas 2bf59ee5c5 Create simple_form.fr.yml 2016-11-21 20:58:43 +01:00
nicolas d9c0211b88 Create fr.yml 2016-11-21 20:57:28 +01:00
Eugen Rochko 0aeae195cb Better error message in doorkeeper json response 2016-11-21 16:19:35 +01:00
Eugen Rochko 0a68464995 Performance improvement for notifications API 2016-11-21 16:10:42 +01:00
Eugen Rochko 4d100a1b36 Remove some n+1 queries from notifications API 2016-11-21 15:16:04 +01:00
Eugen Rochko 83cdfefa7d Remove orphaned notifications, add scopes param to app create API 2016-11-21 14:59:13 +01:00
Eugen Rochko 2ace00e1e2 Merge branch 'victorhck-master' 2016-11-21 11:05:33 +01:00
Eugen Rochko 4176de708e Fixes for the Spanish translation 2016-11-21 11:05:11 +01:00
Eugen Rochko 3624a8b6dd Try to fix for browsers that don't support notifications 2016-11-21 10:59:59 +01:00
Eugen Rochko 75590bba23 Icon for desktop notifications 2016-11-21 10:55:49 +01:00
Eugen Rochko 524847e4e1 Switch to compose route when replying and compose is not mounted 2016-11-21 10:52:11 +01:00
Eugen Rochko dc8b46ecbc Use old rules for mention notifications as for mentions timeline 2016-11-21 10:37:34 +01:00
Eugen Rochko 80d58c6c04 Desktop notifications 2016-11-21 10:24:50 +01:00
Eugen Rochko a75ad23c83 Fix responsive layout breakpoint, replace mentions column with notifications 2016-11-21 10:03:55 +01:00
Eugen Rochko 3fc7820d6e Call NotifyService about remote reblogs 2016-11-21 09:56:01 +01:00
Eugen Rochko 951843e646 Adding notifications column 2016-11-20 19:39:58 +01:00
Eugen Rochko 38025dfea3 Adding unified streamable notifications 2016-11-20 19:39:58 +01:00
caesarologia 622b48803b Portuguese translation (front-end) 2016-11-20 11:40:26 +01:00
Victorhck 29928a1082 improvements in text made by Ekaitz 2016-11-20 00:52:06 +01:00
Victorhck 6185b4167f fix typos, and suggestions made by Ekaitz 2016-11-20 00:50:45 +01:00
Eugen Rochko 862ce37f4f Fix up Spanish translations 2016-11-19 22:05:26 +01:00
victorhck 308e5875fc Merge branch 'master' of https://github.com/victorhck/mastodon 2016-11-19 18:44:58 +01:00
victorhck 622797f868 Merge remote-tracking branch 'upstream/master' 2016-11-19 18:42:37 +01:00
Victorhck 84a1560274 Finished spanish translation config files 2016-11-19 18:40:03 +01:00
Eugen 132d231107 Fix wrong language declaration 2016-11-19 18:31:36 +01:00
Eugen 9d766cd6bf Fix wrong language declaration 2016-11-19 18:31:21 +01:00
victorhck d3aa9f7961 finished spanish translation config files 2016-11-19 17:45:45 +01:00
Eugen Rochko 575b585024 Graphic emoji in usernames in the "reblogged" string above status 2016-11-19 00:28:42 +01:00
Eugen Rochko b8293cd830 Display human names of locales in dropdown 2016-11-19 00:19:57 +01:00