Commit Graph

2138 Commits

Author SHA1 Message Date
Misty (Bot)
671f357b6d Latest translations and fallbacks 2017-11-06 09:25:17 +00:00
Misty (Bot)
6958ec1f1f Latest translations and fallbacks 2017-11-05 09:25:31 +00:00
Misty (Bot)
9728b80c38 Latest translations and fallbacks 2017-11-04 09:24:51 +00:00
Misty (Bot)
9fce645d80 Latest translations and fallbacks 2017-11-03 09:24:11 +00:00
Julian Lam
7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 2017-11-02 14:13:48 -04:00
Misty (Bot)
3853c741d3 Latest translations and fallbacks 2017-11-02 09:25:12 +00:00
Barış Soner Uşaklı
18f4f27fe0 closes #6024 2017-10-31 18:03:54 -04:00
Julian Lam
e42ff47e5c closes #6018 2017-10-31 12:19:28 -04:00
Barış Soner Uşaklı
25cd21fba8 closes #6019 2017-10-31 10:53:28 -04:00
Barış Soner Uşaklı
d5d6748c71 closes #6013 2017-10-30 20:20:14 -04:00
Baris Usakli
47143a4a09 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-10-30 15:29:26 -04:00
Baris Usakli
a500e0019c closes #6005 2017-10-30 15:26:17 -04:00
Misty (Bot)
6f02974762 Latest translations and fallbacks 2017-10-30 09:25:27 +00:00
Peter Jaszkowiak
62ae171432 Merge remote-tracking branch 'origin/master' into develop 2017-10-23 17:13:35 -06:00
Misty (Bot)
2929d4b1df Latest translations and fallbacks 2017-10-23 09:25:55 +00:00
Misty (Bot)
2920fc0dfa Latest translations and fallbacks 2017-10-22 09:25:22 +00:00
Peter Jaszkowiak
ab8465d7b6 Make deprecation warnings more clear (#5996)
* Add these as warnings

To be removed in next major version

* Make ACP search's purpose more clear

* Only warn once per deprecated path
2017-10-20 15:47:08 -04:00
Misty (Bot)
92684757c6 Latest translations and fallbacks 2017-10-20 09:25:58 +00:00
Baris Usakli
c4310395c9 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
2017-10-19 13:54:56 -04:00
Baris Usakli
19dc7da42f closes #5994 2017-10-19 13:53:05 -04:00
Misty (Bot)
05c1a6cfed Latest translations and fallbacks 2017-10-19 09:26:06 +00:00
Julian Lam
8741f7c63c updated ACP menu label 2017-10-13 12:20:48 -04:00
Julian Lam
9cbf1597cd Merge remote-tracking branch 'origin/master' into develop 2017-10-12 14:01:14 -04:00
Julian Lam
cd6dcff38b Split up customJS into customHTML and customJS for better organisation (#5981)
* WIP

* fixed customJS not actually working in footer

* Moving scripts to footer, #5980

* Added upgrade scripts for #5980
2017-10-12 13:38:27 -04:00
Baris Usakli
500c978a26 closes #5944 2017-10-12 13:03:43 -04:00
Misty (Bot)
681e8074d2 Latest translations and fallbacks 2017-10-12 09:25:36 +00:00
Misty (Bot)
425db49fe8 Latest translations and fallbacks 2017-10-10 09:25:44 +00:00
Misty (Bot)
bb6dcf3779 Latest translations and fallbacks 2017-10-09 09:26:12 +00:00
Misty (Bot)
ea41e39dd2 Latest translations and fallbacks 2017-10-07 09:25:55 +00:00
Misty (Bot)
098b8d9971 Latest translations and fallbacks 2017-10-06 09:25:55 +00:00
Dravere
38900a9964 Smtp emailer issue 5951 (#5954)
* Fixed typo at emailer.js line 66 (serice -> service)

* When custom SMTP user and password is empty no authentication is attempted

* Added options to choose custom smtp connection security

* Made custom smtp connection security strings translatable

* Changed switch to if-else for custom smtp security option

* Fixed emailer.js lint errors

* Move custom setting to top of list
2017-10-04 18:26:44 -04:00
Misty (Bot)
47bbe846cb Latest translations and fallbacks 2017-10-02 09:24:20 +00:00
Misty (Bot)
3227e778a2 Latest translations and fallbacks 2017-09-20 09:23:50 +00:00
Misty (Bot)
8f0e48aa40 Latest translations and fallbacks 2017-09-19 09:23:49 +00:00
Misty (Bot)
bb65ecd8b8 Latest translations and fallbacks 2017-09-18 09:23:51 +00:00
Misty (Bot)
6ea82515cc Latest translations and fallbacks 2017-09-17 09:23:31 +00:00
Misty (Bot)
ce59a78aa4 Latest translations and fallbacks 2017-09-16 09:27:37 +00:00
Misty (Bot)
b840b96a4a Latest translations and fallbacks 2017-09-15 09:23:50 +00:00
Misty (Bot)
252be54b32 Latest translations and fallbacks 2017-09-14 09:23:59 +00:00
Misty (Bot)
d47c5a7bb0 Latest translations and fallbacks 2017-09-13 09:24:05 +00:00
Misty (Bot)
3872c97bed Latest translations and fallbacks 2017-09-12 09:24:10 +00:00
Julian Lam
b5e1b4a9c4 fallbacks for #5922 2017-09-11 15:39:36 -04:00
Julian Lam
4c82539e83 updated goback text, #5922 2017-09-11 15:38:10 -04:00
Julian Lam
38a7030639 Revert "Merge pull request #5923 from NodeBB/patch-5922"
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
2017-09-11 15:37:18 -04:00
Julian Lam
3c335cb451 added post-queue translations and fallbacks 2017-09-11 12:54:06 -04:00
Misty (Bot)
09e2234611 Latest translations and fallbacks 2017-09-11 09:23:32 +00:00
Misty (Bot)
f00d5a6e13 Latest translations and fallbacks 2017-09-10 09:23:16 +00:00
Misty (Bot)
5b19675093 Latest translations and fallbacks 2017-09-09 09:23:27 +00:00
Julian Lam
f8ddabc884 Merge pull request #5923 from NodeBB/patch-5922
Fix #5922
2017-09-08 15:58:14 -04:00
Peter Jaszkowiak
f40d37ad48 Fix #5922 2017-09-08 13:23:30 -06:00