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

..

client.ar.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.bs_BA.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.cs.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.da.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.de.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.en.yml

FEATURE: first pass at user summary page

2016-01-20 15:14:25 +11:00

client.es.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.fa_IR.yml

Update translations

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

client.fi.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.fr.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.he.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.id.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.it.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.ja.yml

Update translations

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

client.ko.yml

Update translations

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

client.nb_NO.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.nl.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.pl_PL.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.pt_BR.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.pt.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.ro.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.ru.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.sk.yml

Add Slovak locale

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

client.sq.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.sv.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.te.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.tr_TR.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.uk.yml

Update Translations

2016-01-04 21:01:49 +05:30

client.vi.yml

Update translation code

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

client.zh_CN.yml

Update Translations

2016-01-19 01:29:19 +05:30

client.zh_TW.yml

Update Translations

2016-01-04 21:01:49 +05:30

plurals.rb

change fa key to fa_IR in plurals.rb

2015-04-09 01:39:59 +04:30

server.ar.yml

Update Translations

2016-01-19 01:29:19 +05:30

server.bs_BA.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.cs.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.da.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.de.yml

Update Translations

2016-01-19 01:29:19 +05:30

server.en.yml

little typo

2016-01-21 15:05:03 +01:00

server.es.yml

Update Translations

2016-01-19 01:29:19 +05:30

server.fa_IR.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.fi.yml

Update Translations

2016-01-19 01:29:19 +05:30

server.fr.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.he.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.id.yml

Update translations

2015-12-18 10:48:02 -05:00

server.it.yml

Update Translations

2016-01-19 01:29:19 +05:30

server.ja.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.ko.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.nb_NO.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.nl.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.pl_PL.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.pt_BR.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.pt.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.ro.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.ru.yml

Update Translations

2016-01-19 01:29:19 +05:30

server.sk.yml

Add Slovak locale

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

server.sq.yml

Include backups among items uploadable to s3

2016-01-16 18:08:27 -08:00

server.sv.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.te.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.tr_TR.yml

Update Translations

2016-01-19 01:29:19 +05:30

server.uk.yml

Update Translations

2016-01-04 21:01:49 +05:30

server.vi.yml

Update translation code

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

server.zh_CN.yml

Update Translations

2016-01-19 01:29:19 +05:30

server.zh_TW.yml

Update Translations

2016-01-04 21:01:49 +05:30

transliterate.de.yml

FEATURE: Adds transliteration of German umlauts in slugs

2015-02-27 23:53:58 +01:00

transliterate.en.yml

FEATURE: Adds transliteration of German umlauts in slugs

2015-02-27 23:53:58 +01:00

transliterate.ru.yml

FEATURE: Adds transliteration of German umlauts in slugs

2015-02-27 23:53:58 +01:00

transliterate.vi.yml

FEATURE: Adds Vietnamese transliterations

2015-02-28 00:46:39 +01:00