Commit graph

114 commits

Author SHA1 Message Date
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
Khoa, Le Ngoc
003399bf96 Update translation code 2016-01-22 14:54:48 +07:00
Régis Hanol
fc3bedaaed Merge pull request #3921 from gschlager/locale-sk
Add Slovak locale
2016-01-20 15:38:48 +01:00
Arpit Jalan
bfa4e6b69c Update Translations 2016-01-19 01:29:19 +05:30
Neil Lalonde
d732c0876a Update translations 2016-01-08 15:50:00 -05:00
Arpit Jalan
593c22eda1 Update Translations 2016-01-04 21:01:49 +05:30
root
e0ffce1cad Add locale for Vietnamese 2016-01-03 10:05:28 +00:00
Arpit Jalan
90d15ba588 Update Translations 2015-12-29 23:16:17 +05:30
Arpit Jalan
47410f1b99 Update Translations 2015-12-23 17:01:43 +05:30
Neil Lalonde
fe10f3e0a3 Update translations 2015-12-18 10:48:02 -05:00
Gerhard Schlager
e56f8fa471 Add Slovak locale 2015-12-14 21:55:36 +01:00
Arpit Jalan
b227897c44 Update Translations 2015-12-07 23:29:32 +05:30
Arpit Jalan
04593b8fef Update Translations 2015-12-01 01:09:45 +05:30
Arpit Jalan
bde05fd334 Update Translations 2015-11-23 19:25:06 +05:30
Arpit Jalan
6ec336e56f Update Translations 2015-11-20 23:26:48 +05:30
Arpit Jalan
951bfb6186 Update Translations 2015-11-09 21:14:02 +05:30
Arpit Jalan
a44c2f6ea3 Update Translations 2015-11-02 17:49:57 +05:30
Arpit Jalan
574805b682 Update Translations 2015-10-30 18:16:52 +05:30
Arpit Jalan
c3cadbb4d8 Update Translations 2015-10-26 22:38:34 +05:30
Régis Hanol
515fc49727 FIX: replace polls with a link in emails 2015-10-22 19:10:07 +02:00
Arpit Jalan
717be06f17 Update Translations 2015-10-20 23:11:42 +05:30
Arpit Jalan
06f616792d Update Translations 2015-10-15 18:19:04 +05:30
Arpit Jalan
43cd0912e6 Update Translations 2015-10-11 02:11:28 +11:00
Neil Lalonde
1e5ad6f219 Update translations 2015-10-02 10:40:28 -04:00
Arpit Jalan
a2e8e5f90b Update Translations 2015-09-29 12:30:01 +05:30
Gerhard Schlager
bb52042b46 FIX: Add missing pluralization keys to poll plugin locale 2015-09-27 21:36:57 +02:00
Régis Hanol
26c743a962 FIX: disable poll dialect when poll plugin is disabled 2015-09-14 20:11:03 +02:00
Arpit Jalan
b8c3187a94 Update Translations 2015-08-31 22:19:30 +05:30
Arpit Jalan
e1575746f2 Update Translations 2015-08-20 17:33:13 +05:30
Arpit Jalan
73f547b019 Update Translations 2015-08-10 23:41:05 +05:30
Arpit Jalan
e53bf294ef Update Translations 2015-08-04 13:17:39 +05:30
Arpit Jalan
62a59ef7c0 Update Translations 2015-07-30 22:41:12 +05:30
Arpit Jalan
e01d196bda Update Translations 2015-07-22 22:57:18 +05:30
Luke GB
9f31c3d235 Expose poll_maximum_options to client
At present this doesn't actually seem to be exposed to the client.

I discovered this by accident whilst trying to write my own plugin:

7b6d6b76eb/app/models/site_setting.rb (L17-L18)
2015-07-19 21:41:14 +01:00
Arpit Jalan
fc977771a3 Update Translations 2015-07-16 19:18:02 +05:30
Sam
00aaa692ac Merge pull request #3574 from gschlager/patch-2
FIX: Remove invalid translation keys from polls plugin
2015-07-15 16:53:37 +10:00
Arpit Jalan
63b5a6c4e0 Update Translations 2015-07-09 18:57:52 +05:30
Neil Lalonde
9a0e4bb96e Update translations 2015-07-01 17:09:37 -04:00
Gerhard Schlager
5eaf95b328 FIX: Remove invalid translation keys from polls plugin
And it changes the file header since it was wrong.
2015-06-28 01:31:03 +02:00
Arpit Jalan
db02dbb0da Update Translations 2015-06-26 20:30:13 +05:30
Neil Lalonde
4b6cf528ce update translations 2015-06-19 11:29:13 -04:00
Arpit Jalan
6148ae8775 Update Translations 2015-06-17 22:05:22 +05:30
Arpit Jalan
436e84c6c1 Update Translations 2015-06-15 20:25:53 +05:30
Neil Lalonde
d9efb37ec7 Update translations 2015-06-11 15:35:01 -04:00
Arpit Jalan
45a7c314c2 Update Translations 2015-06-03 20:39:08 +05:30
Régis Hanol
c240a8bd80 FIX: make sure we can't vote on deleted polls 2015-06-01 22:31:47 +02:00
Arpit Jalan
1ac4e60c90 Update Translations 2015-06-01 23:33:27 +05:30
Régis Hanol
f736b6face FIX: validate poll parameters when type=multiple 2015-06-01 19:28:05 +02:00
Arpit Jalan
5880313e84 Update Translations 2015-05-26 20:08:20 +05:30
Arpit Jalan
56544f2048 Update Translations 2015-05-21 00:24:12 +05:30