beatrix
|
3b8e78ba9f
|
Merge pull request #272 from KnzkDev/add-en-ja
i18n: Update some locale files
|
2017-12-19 10:35:02 -05:00 |
|
beatrix
|
6cb47f17fc
|
Merge pull request #272 from KnzkDev/add-en-ja
i18n: Update some locale files
|
2017-12-19 10:35:02 -05:00 |
|
ncls7615
|
58e3bd4d71
|
Add en and ja
|
2017-12-19 20:16:48 +09:00 |
|
ncls7615
|
d3b2677775
|
Add en and ja
|
2017-12-19 20:16:48 +09:00 |
|
cwm
|
5b185a0a0f
|
missed a semicolon
|
2017-12-17 22:21:15 -06:00 |
|
cwm
|
14aae9c05c
|
missed a semicolon
|
2017-12-17 22:21:15 -06:00 |
|
cwm
|
1dd4e3791f
|
use makeMapStateToProps
|
2017-12-17 22:00:25 -06:00 |
|
cwm
|
be50e45a74
|
use makeMapStateToProps
|
2017-12-17 22:00:25 -06:00 |
|
cwm
|
d6ca0e29a7
|
use list-ul icon in list header and web/lists
|
2017-12-17 21:25:18 -06:00 |
|
cwm
|
e4ebbf4f07
|
use list-ul icon in list header and web/lists
|
2017-12-17 21:25:18 -06:00 |
|
Jenkins
|
9dd76b5b41
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-17 03:17:14 +00:00 |
|
Jenkins
|
e7fa7fce25
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-17 03:17:14 +00:00 |
|
Peter
|
c9c63c2232
|
Add Slovak translation (#6052)
* Add Slovak translation
* Slovak translation: i18n-normalize
|
2017-12-17 11:26:42 +09:00 |
|
Peter
|
f38e6a14f2
|
Add Slovak translation (#6052)
* Add Slovak translation
* Slovak translation: i18n-normalize
|
2017-12-17 11:26:42 +09:00 |
|
Jenkins
|
b47a89be89
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-16 15:17:12 +00:00 |
|
Jenkins
|
05a2a70ca2
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-16 15:17:12 +00:00 |
|
beatrix
|
978e5e5606
|
Merge pull request #253 from glitch-soc/prevent-local-only-federation
prevent federation of local-only statuses
|
2017-12-16 09:26:48 -05:00 |
|
beatrix
|
e202efdf8a
|
Merge pull request #253 from glitch-soc/prevent-local-only-federation
prevent federation of local-only statuses
|
2017-12-16 09:26:48 -05:00 |
|
beatrix
|
1e4581f9a1
|
Merge pull request #270 from KnzkDev/fix/action_logs
Fix admin/action_logs page
|
2017-12-16 09:25:57 -05:00 |
|
beatrix
|
5325c2ab3e
|
Merge pull request #270 from KnzkDev/fix/action_logs
Fix admin/action_logs page
|
2017-12-16 09:25:57 -05:00 |
|
ncls7615
|
82bff179f4
|
fix admin/action_logs page
|
2017-12-16 20:27:26 +09:00 |
|
ncls7615
|
9e8fa3caee
|
fix admin/action_logs page
|
2017-12-16 20:27:26 +09:00 |
|
kibigo!
|
e59d124be5
|
Fixes #244 to make search results scrollable
|
2017-12-15 12:49:23 -08:00 |
|
kibigo!
|
e677dda07c
|
Fixes #244 to make search results scrollable
|
2017-12-15 12:49:23 -08:00 |
|
Daigo 3 Dango
|
64ae134e7b
|
Remove period from the version number (#6039)
2.1.0. -> 2.1.0
|
2017-12-15 21:38:25 +01:00 |
|
Daigo 3 Dango
|
a434d9c0cc
|
Remove period from the version number (#6039)
2.1.0. -> 2.1.0
|
2017-12-15 21:38:25 +01:00 |
|
David Yip
|
d53f727653
|
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts:
db/schema.rb
|
2017-12-15 12:20:56 -06:00 |
|
David Yip
|
82b2e224a2
|
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts:
db/schema.rb
|
2017-12-15 12:20:56 -06:00 |
|
Jenkins
|
ebfca67b98
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-15 18:17:14 +00:00 |
|
Jenkins
|
40afadfb01
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-15 18:17:14 +00:00 |
|
Eugen Rochko
|
b23c9ab7de
|
Bump version to 2.1.0 🎆
|
2017-12-15 19:14:57 +01:00 |
|
Eugen Rochko
|
a29432f0cd
|
Bump version to 2.1.0 🎆
|
2017-12-15 19:14:57 +01:00 |
|
beatrix
|
c0419dcea8
|
Merge pull request #269 from ncls7615/patch-1
Update ja.js
|
2017-12-15 09:12:54 -05:00 |
|
beatrix
|
e0a573a2ce
|
Merge pull request #269 from ncls7615/patch-1
Update ja.js
|
2017-12-15 09:12:54 -05:00 |
|
NCLS
|
cbc2f1ea5d
|
Update ja.js
|
2017-12-15 19:43:10 +09:00 |
|
NCLS
|
e9a5bde9a0
|
Update ja.js
|
2017-12-15 19:43:10 +09:00 |
|
NCLS
|
b9d1543f7e
|
Update ja.js
|
2017-12-15 19:38:13 +09:00 |
|
NCLS
|
61ed5b972c
|
Update ja.js
|
2017-12-15 19:38:13 +09:00 |
|
Jenkins
|
601f0fe4a3
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-15 01:17:12 +00:00 |
|
Jenkins
|
37254c4f5d
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2017-12-15 01:17:12 +00:00 |
|
Eugen Rochko
|
1079099d2b
|
Bump version to 2.1.0rc6
|
2017-12-15 02:00:28 +01:00 |
|
Eugen Rochko
|
098c7d27fe
|
Bump version to 2.1.0rc6
|
2017-12-15 02:00:28 +01:00 |
|
Eugen Rochko
|
99a208cd8f
|
Do not hide statuses from silenced accounts from other silenced accounts (#6030)
|
2017-12-15 01:54:05 +01:00 |
|
Eugen Rochko
|
3d3b403359
|
Do not hide statuses from silenced accounts from other silenced accounts (#6030)
|
2017-12-15 01:54:05 +01:00 |
|
Naoki Kosaka
|
7da34ff0a3
|
Fix oEmbed image_modal src. (#6027)
|
2017-12-14 23:31:14 +01:00 |
|
Naoki Kosaka
|
25b0d7538e
|
Fix oEmbed image_modal src. (#6027)
|
2017-12-14 23:31:14 +01:00 |
|
Eugen Rochko
|
ef8fc3542b
|
Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
|
2017-12-14 21:35:30 +01:00 |
|
Eugen Rochko
|
a3b2ea599d
|
Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
|
2017-12-14 21:35:30 +01:00 |
|
SerCom_KC
|
19a2ed9a04
|
Improve Chinese (Simplified) Translations (#6024)
* i18n: (zh-CN) Change `工作人员` (staff) to `管理人员`
Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109
* i18n: (zh-CN) Change `协管` to `监察员`
* i18n: (zh-CN) Fix all "Are you" questions
* i18n: (zh-CN) Various improvements
* i18n: (zh-CN) Final clean-up
* i18n: (zh-CN) Change translation for 500
* i18n: (zh-CN) Remove spaces between time distances
* i18n: (zh-CN) Improve translations
|
2017-12-14 19:33:29 +01:00 |
|
SerCom_KC
|
573414f728
|
Improve Chinese (Simplified) Translations (#6024)
* i18n: (zh-CN) Change `工作人员` (staff) to `管理人员`
Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109
* i18n: (zh-CN) Change `协管` to `监察员`
* i18n: (zh-CN) Fix all "Are you" questions
* i18n: (zh-CN) Various improvements
* i18n: (zh-CN) Final clean-up
* i18n: (zh-CN) Change translation for 500
* i18n: (zh-CN) Remove spaces between time distances
* i18n: (zh-CN) Improve translations
|
2017-12-14 19:33:29 +01:00 |
|