Khoa, Le Ngoc 06e637fc4a Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese ...

* upstream/master: (185 commits)
  SECURITY: Upgrade rails.
  FIX: new user summary page was broken
  Version bump to v1.5.0.beta9
  Remove addressable from Discourse.
  UX: change glyph when inviting existing user to a topic
  FIX: Allow for large free disk space
  Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)"
  UX: improve styling of messages and mobile view of messages
  FIX: correct counts on user summary
  FIX: link to filtered down list of badges from summary FEATURE: pick featured badges in summary page
  FIX: do not allow new email to be duplicate FIX: return proper error message when email already exists
  retain unactivated accounts a bit longer default
  FEATURE: blocked users can send and reply to private messages from staff
  Remove Arel patch that has been merged upstream.
  correct path
  little typo
  FIX: Missing tag in CSS.
  PERF: remove 10-20ms of work from every page view
  FIX: remove green background for wiki (this can be re-added via a customization if needed)
  Hotfix for unsubscribe via email
  ...

# Conflicts:
#	.tx/config

2016-01-26 12:44:29 +07:00

..

images

zopflipng on emoji one images

2015-12-22 13:04:39 -08:00

javascripts

FIX: date picker on mobile

2016-01-20 21:06:41 +01:00

403.ar.html

Update Translations

2015-10-11 02:11:28 +11:00

403.bs_BA.html

Update Translations

2015-07-30 22:41:12 +05:30

403.cs.html

Add public/*.html integration with Transifex

2014-04-11 16:56:22 -04:00

403.da.html

Update Translations

2015-05-06 21:32:11 +05:30

403.de.html

UX: Add missing German locale files

2014-08-29 21:15:08 +02:00

403.es.html

Add missing transation files and update translations

2014-10-16 23:25:34 +05:30

403.fa_IR.html

Update Translations

2015-04-29 22:38:29 +05:30

403.fi.html

Add Finnish

2014-08-21 13:48:42 +03:00

403.fr.html

Add public/*.html integration with Transifex

2014-04-11 16:56:22 -04:00

403.he.html

Update Translations

2015-05-06 21:32:11 +05:30

403.html

Force UTF-8 charset in nginx error pages

2013-06-20 14:54:43 +04:00

403.id.html

Update Translations

2015-05-06 21:32:11 +05:30

403.it.html

Update Translations

2015-10-15 18:19:04 +05:30

403.ja.html

Update Translations

2015-05-06 21:32:11 +05:30

403.ko.html

Update translations

2016-01-08 15:50:00 -05:00

403.nb_NO.html

Update Translations

2015-05-06 21:32:11 +05:30

403.nl.html

Update Translations

2015-05-06 21:32:11 +05:30

403.pl_PL.html

Update Translations

2014-08-26 23:07:10 +05:30

403.pt_BR.html

Update Translations

2015-05-06 21:32:11 +05:30

403.pt.html

Update Translations

2014-12-29 19:06:33 +05:30

403.ro.html

Update Translations

2015-05-06 21:32:11 +05:30

403.ru.html

Update Translations

2014-09-30 19:53:17 +05:30

403.sk.html

Add Slovak locale

2015-12-14 21:55:36 +01:00

403.sq.html

New "sq" language files for Discourse

2014-11-12 21:43:46 +01:00

403.sv.html

Update Translations

2015-05-06 21:32:11 +05:30

403.te.html

Update Translations

2015-02-19 21:41:24 +05:30

403.tr_TR.html

Update Translations

2015-06-15 20:25:53 +05:30

403.uk.html

Update translations from Transifex

2014-04-14 11:53:25 -04:00

403.vi.html

Update translation code

2016-01-22 14:54:48 +07:00

403.zh_CN.html

Update translations

2015-10-02 10:40:28 -04:00

403.zh_TW.html

Update Translations

2015-05-06 21:32:11 +05:30

404.json

…

422.ar.html

add arabic local files

2014-12-07 23:05:24 +03:00

422.bs_BA.html

Update Translations

2015-07-30 22:41:12 +05:30

422.cs.html

Add public/*.html integration with Transifex

2014-04-11 16:56:22 -04:00

422.da.html

Update Translations

2015-05-06 21:32:11 +05:30

422.de.html

UX: Add missing German locale files

2014-08-29 21:15:08 +02:00

422.es.html

Add missing transation files and update translations

2014-10-16 23:25:34 +05:30

422.fa_IR.html

Update Translations

2015-04-29 22:38:29 +05:30

422.fi.html

Add Finnish

2014-08-21 13:48:42 +03:00

422.fr.html

Add public/*.html integration with Transifex

2014-04-11 16:56:22 -04:00

422.he.html

Update Translations

2015-05-06 21:32:11 +05:30

422.html

Force UTF-8 charset in nginx error pages

2013-06-20 14:54:43 +04:00

422.id.html

Update Translations

2015-05-06 21:32:11 +05:30

422.it.html

Update Translations

2015-05-06 21:32:11 +05:30

422.ja.html

Update Translations

2015-05-06 21:32:11 +05:30

422.ko.html

Add missing transation files and update translations

2014-10-16 23:25:34 +05:30

422.nb_NO.html

Update Translations

2015-05-06 21:32:11 +05:30

422.nl.html

Update Translations

2015-05-06 21:32:11 +05:30

422.pl_PL.html

Update translations

2014-09-10 12:32:27 -04:00

422.pt_BR.html

Update Translations

2015-05-06 21:32:11 +05:30

422.pt.html

Update Translations

2015-01-02 19:04:05 +05:30

422.ro.html

Update Translations

2015-05-06 21:32:11 +05:30

422.ru.html

Update Translations

2014-09-30 19:53:17 +05:30

422.sk.html

Add Slovak locale

2015-12-14 21:55:36 +01:00

422.sq.html

New "sq" language files for Discourse

2014-11-12 21:43:46 +01:00

422.sv.html

Update Translations

2015-12-07 23:29:32 +05:30

422.te.html

Add Telugu translation files

2015-02-09 20:46:31 +05:30

422.tr_TR.html

Update Translations

2015-06-15 20:25:53 +05:30

422.uk.html

Update translations from Transifex

2014-04-14 11:53:25 -04:00

422.vi.html

Update translation code

2016-01-22 14:54:48 +07:00

422.zh_CN.html

Update Translations

2015-08-04 13:17:39 +05:30

422.zh_TW.html

Update Translations

2015-05-06 21:32:11 +05:30

500.ar.html

add arabic local files

2014-12-07 23:05:24 +03:00

500.bs_BA.html

Update Translations

2015-07-30 22:41:12 +05:30

500.cs.html

Add public/*.html integration with Transifex

2014-04-11 16:56:22 -04:00

500.da.html

Update Translations

2015-05-06 21:32:11 +05:30

500.de.html

UX: Add missing German locale files

2014-08-29 21:15:08 +02:00

500.es.html

Add missing transation files and update translations

2014-10-16 23:25:34 +05:30

500.fa_IR.html

Update Translations

2015-04-29 22:38:29 +05:30

500.fi.html

Add Finnish

2014-08-21 13:48:42 +03:00

500.fr.html

Add public/*.html integration with Transifex

2014-04-11 16:56:22 -04:00

500.he.html

Update Translations

2015-05-06 21:32:11 +05:30

500.html

Force UTF-8 charset in nginx error pages

2013-06-20 14:54:43 +04:00

500.id.html

Update Translations

2015-05-06 21:32:11 +05:30

500.it.html

Update Translations

2015-07-01 19:23:15 +05:30

500.ja.html

Update Translations

2015-05-06 21:32:11 +05:30

500.ko.html

Update Translations

2015-09-16 19:50:29 +05:30

500.nb_NO.html

Update Translations

2015-05-06 21:32:11 +05:30

500.nl.html

Update Translations

2015-05-06 21:32:11 +05:30

500.pl_PL.html

Update Translations

2014-08-26 23:07:10 +05:30

500.pt_BR.html

Update Translations

2015-05-06 21:32:11 +05:30

500.pt.html

Update Translations

2014-12-29 19:06:33 +05:30

500.ro.html

Update Translations

2015-05-06 21:32:11 +05:30

500.ru.html

Update Translations

2014-09-30 19:53:17 +05:30

500.sk.html

Add Slovak locale

2015-12-14 21:55:36 +01:00

500.sq.html

New "sq" language files for Discourse

2014-11-12 21:43:46 +01:00

500.sv.html

Update Translations

2015-05-06 21:32:11 +05:30

500.te.html

Update Translations

2015-02-19 21:41:24 +05:30

500.tr_TR.html

Add Turkish translation files

2014-12-12 12:13:12 +05:30

500.uk.html

Update translations from Transifex

2014-04-14 11:53:25 -04:00

500.vi.html

Update translation code

2016-01-22 14:54:48 +07:00

500.zh_CN.html

Update Translations

2015-11-20 23:26:48 +05:30

500.zh_TW.html

Update Translations

2015-05-06 21:32:11 +05:30

503.ar.html

add arabic local files

2014-12-07 23:05:24 +03:00

503.bs_BA.html

Update Translations

2015-07-30 22:41:12 +05:30

503.cs.html

Add public/*.html integration with Transifex

2014-04-11 16:56:22 -04:00

503.da.html

Update Translations

2015-05-06 21:32:11 +05:30

503.de.html

UX: Add missing German locale files

2014-08-29 21:15:08 +02:00

503.es.html

Add missing transation files and update translations

2014-10-16 23:25:34 +05:30

503.fa_IR.html

Update Translations

2015-04-13 23:58:48 +05:30

503.fi.html

Add Finnish

2014-08-21 13:48:42 +03:00

503.fr.html

Update Translations

2014-09-30 19:53:17 +05:30

503.he.html

Update Translations

2015-05-06 21:32:11 +05:30

503.html

Force UTF-8 charset in nginx error pages

2013-06-20 14:54:43 +04:00

503.id.html

Update Translations

2015-05-06 21:32:11 +05:30

503.it.html

Update Translations

2015-05-06 21:32:11 +05:30

503.ja.html

Update Translations

2015-05-06 21:32:11 +05:30

503.ko.html

Update Translations

2014-11-17 21:35:06 +05:30

503.nb_NO.html

Update Translations

2015-05-06 21:32:11 +05:30

503.nl.html

Update Translations

2015-05-06 21:32:11 +05:30

503.pl_PL.html

Update Translations

2014-09-30 19:53:17 +05:30

503.pt_BR.html

Update Translations

2015-05-06 21:32:11 +05:30

503.pt.html

Update Translations

2015-01-02 19:04:05 +05:30

503.ro.html

Update Translations

2015-05-06 21:32:11 +05:30

503.ru.html

Update Translations

2014-09-30 19:53:17 +05:30

503.sk.html

Add Slovak locale

2015-12-14 21:55:36 +01:00

503.sq.html

Update Translations

2015-02-25 22:47:17 +05:30

503.sv.html

Update Translations

2015-05-06 21:32:11 +05:30

503.te.html

Add Telugu translation files

2015-02-09 20:46:31 +05:30

503.tr_TR.html

Update Translations

2015-09-14 20:02:40 +05:30

503.uk.html

Update translations from Transifex

2014-04-14 11:53:25 -04:00

503.vi.html

Update translation code

2016-01-22 14:54:48 +07:00

503.zh_CN.html

Update Translations

2015-05-06 21:32:11 +05:30

503.zh_TW.html

Update Translations

2015-05-06 21:32:11 +05:30