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
190eea5691
Remove this useless check
2017-10-13 21:17:57 -06:00
Peter Jaszkowiak
46fafb20b9
Remove string.js dependency
2017-10-13 21:02:41 -06:00
Barış Soner Uşaklı
557dfd5b47
testing new socket.io-client extraHeaders ( #5985 )
...
* testing new socket.io-client extraHeaders
* change mongodb installation
2017-10-13 13:57:30 -04:00
Peter Jaszkowiak
1c5bdcb670
Enable running multiple upgrades at once ( #5984 )
2017-10-13 13:15:18 -04:00
Julian Lam
0efa403a68
invoking the proper ACE Editor mode
2017-10-13 13:12:48 -04:00
Peter Jaszkowiak
f9a1951ec5
Enable running multiple upgrades at once
2017-10-13 11:11:11 -06:00
Julian Lam
bf1e922cab
Removed Thumbs.db from a vendor dir
2017-10-13 12:21:28 -04:00
Julian Lam
8741f7c63c
updated ACP menu label
2017-10-13 12:20:48 -04: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
Julian Lam
ae261e073b
updating markdown and moving app.load back into ajaxify.end
2017-10-13 09:58:26 -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
cfacc4f133
potential fix for #5980
2017-10-12 17:01:01 -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
Misty (Bot)
681e8074d2
Latest translations and fallbacks
2017-10-12 09:25:36 +00: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
Misty (Bot)
91f385dc94
Incremented version number - v1.6.1
2017-10-11 12:22:54 -04:00
Julian Lam
df5178ce78
fixed typo in outgoing route test, and added new test for javascript protocol
2017-10-10 12:17:39 -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
Julian Lam
d37c0cfd67
bumping themes again to remove changes for #5733
2017-10-10 11:16:43 -04:00
Barış Soner Uşaklı
9e9de2edd0
closes #5976
2017-10-10 11:01:16 -04:00
Misty (Bot)
425db49fe8
Latest translations and fallbacks
2017-10-10 09:25:44 +00: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
Misty (Bot)
bb6dcf3779
Latest translations and fallbacks
2017-10-09 09:26:12 +00:00
Andrew Rodrigues
a1a87c7ca1
closes #5969
2017-10-08 00:04:13 -04:00
Misty (Bot)
ea41e39dd2
Latest translations and fallbacks
2017-10-07 09:25:55 +00: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
Misty (Bot)
098b8d9971
Latest translations and fallbacks
2017-10-06 09:25:55 +00: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
dd5651b859
bump composer to test new composer submit behaviour
2017-10-03 14:29:45 -04:00
Julian Lam
d0ec7fdaef
update themes to support #5733
2017-10-03 14:19:29 -04:00
Julian Lam
6852c92ed6
Merge remote-tracking branch 'origin/develop'
2017-10-03 13:37:43 -04:00
RoiEX
e1f180ea3f
Remove uneccessary undefined declaration
2017-10-03 09:47:59 -04:00
RoiEX
ce9a3f20c5
Optimize transition
2017-10-03 09:47:59 -04:00
RoiEX
5e4e523198
Make progress bar finer
2017-10-03 09:47:59 -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
