Baris Usakli
6a6dc7ef06
closes #5990
2017-10-16 15:35:46 -04:00
Baris Usakli
8a499e09ed
fix nconf lowercasing
2017-10-16 13:51:47 -04:00
Barış Soner Uşaklı
5e6d8ea566
handle 404 first
2017-10-14 08:34:04 -04:00
Peter Jaszkowiak
60a42aa651
Merge branch 'translator-optimization' into develop
2017-10-13 21:23:44 -06:00
Peter Jaszkowiak
cf289b9228
Merge remote-tracking branch 'origin/master' into develop
2017-10-13 21:23:04 -06:00
Peter Jaszkowiak
46fafb20b9
Remove string.js dependency
2017-10-13 21:02:41 -06:00
Peter Jaszkowiak
1c5bdcb670
Enable running multiple upgrades at once ( #5984 )
2017-10-13 13:15:18 -04:00
Peter Jaszkowiak
f9a1951ec5
Enable running multiple upgrades at once
2017-10-13 11:11:11 -06:00
Julian Lam
6a93bc140b
Merge remote-tracking branch 'origin/master' into develop
2017-10-13 12:02:24 -04:00
Julian Lam
b44cfacda1
resolve XSS vulnerability in flags pages
2017-10-13 11:54:16 -04:00
Baris Usakli
9101400264
closes #5961
2017-10-12 17:57:25 -04:00
Baris Usakli
c5f58f73a7
closes #5974
2017-10-12 17:05:15 -04:00
Julian Lam
9cbf1597cd
Merge remote-tracking branch 'origin/master' into develop
2017-10-12 14:01:14 -04:00
Baris Usakli
68bcfb2883
closes #5975
2017-10-12 13:54:53 -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
Barış Soner Uşaklı
410e825bc0
fix upgrade script changing brand:logo to absolute path
2017-10-11 17:52:03 -04:00
Barış Soner Uşaklı
645410131d
closes #5942
2017-10-11 16:51:52 -04:00
Julian Lam
72502ff992
utilising whitelist instead of blacklisting javascript protocol
2017-10-10 11:48:06 -04:00
Julian Lam
5863d64d27
prevent inline js payloads from executing in outgoing page
2017-10-10 11:35:17 -04:00
Barış Soner Uşaklı
67ba6bb820
closes #5977
2017-10-10 11:26:41 -04:00
Barış Soner Uşaklı
9e9de2edd0
closes #5976
2017-10-10 11:01:16 -04:00
Peter Jaszkowiak
1c35213934
Fix #5970 and forking while debugging ( #5965 )
...
* Fix forking while debugging
Debugger address in use no longer happens
* Fix cropper error
2017-10-09 11:40:36 -04:00
Dravere
8d5ef79e9c
Smtp emailer change without restart ( #5957 )
...
* SMTP fallback transport setup during app startup and config update
* Verbose logging message to see when SMTP fallback transport is setup
2017-10-06 07:36:43 -04:00
Barış Soner Uşaklı
227c245fb2
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# package.json
2017-10-05 11:40:58 -04:00
Barış Soner Uşaklı
0de692188f
check topic.cid
2017-10-05 11:39:35 -04: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
Julian Lam
6852c92ed6
Merge remote-tracking branch 'origin/develop'
2017-10-03 13:37:43 -04:00
RoiEX
1fd160a4e6
Add Support for Firefox OSD
2017-10-03 09:43:33 -04:00
Julian Lam
2086a64a5e
fixes #5947
2017-10-03 09:40:52 -04:00
Barış Soner Uşaklı
b70f328520
closes #5948
2017-10-02 19:27:57 -04:00
Peter Jaszkowiak
da9da8190f
Bump dependencies
...
Bumping eslint & configs meant making some linting fixes
For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
2017-10-02 09:24:27 -04:00
Peter Jaszkowiak
dc87d7fc0f
Use .js instead of .jst
...
Fix #5934
2017-09-23 12:51:20 -06:00
Barış Soner Uşaklı
f989988178
closes #1668
2017-09-22 10:26:03 -04:00
Barış Soner Uşaklı
2185480c4e
switch to eachSeries
2017-09-21 19:25:54 -04:00
Baris Usakli
8276e20254
closes #5937
2017-09-21 14:30:12 -04:00
Baris Usakli
852396e60d
closes #5903
2017-09-21 13:50:24 -04:00
Barış Soner Uşaklı
4c0d430819
only return minimal info for pending and invited users
2017-09-15 17:07:43 -04:00
Julian Lam
dea372a5c5
fixes #5932
2017-09-14 10:15:05 -04:00
Julian Lam
8b0e6611d9
fixed incorrect parameter passed into hook
2017-09-12 18:55:47 -04:00
Julian Lam
c373f85726
Merge remote-tracking branch 'origin/master' into develop
2017-09-12 13:58:07 -04:00
Julian Lam
9f4e92fa13
closes #5925
2017-09-12 13:46:51 -04:00
Barış Soner Uşaklı
1019feb569
fix method name
2017-09-12 11:51:38 -04:00
Barış Soner Uşaklı
f42119673f
fix string cids in post summaries
2017-09-12 11:41:52 -04:00
Julian Lam
38a7030639
Revert "Merge pull request #5923 from NodeBB/patch-5922"
...
This reverts commit f8ddabc8844976d13013
2017-09-11 15:37:18 -04: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
Baris Usakli
b56d6f8b50
make call to db in /ping and /sping
2017-09-08 14:39:50 -04:00
Julian Lam
a6b993ef6c
updating 500-embed to load after page is fully loaded, #5733
2017-09-08 11:55:37 -04:00
Julian Lam
26d4c18340
Merge remote-tracking branch 'origin/master' into develop
2017-09-08 11:40:54 -04:00
