Commit Graph

16569 Commits

Author SHA1 Message Date
Julian Lam
ec3bb1c727 allowing plugins to define upgrade scripts 2017-10-20 15:34:27 -04:00
Barış Soner Uşaklı
108f84fd19 add type to dbal 2017-10-20 13:51:07 -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
Baris Usakli
8733f51f86 remove test for unused code 2017-10-19 13:13:40 -04:00
Baris Usakli
79598c32d3 remove unused function 2017-10-19 12:56:51 -04:00
Misty (Bot)
05c1a6cfed Latest translations and fallbacks 2017-10-19 09:26:06 +00:00
Barış Soner Uşaklı
797857e1d2 remove old test 2017-10-18 15:06:22 -04:00
Barış Soner Uşaklı
d8dc79e3c7 closes #5992 2017-10-18 14:49:42 -04:00
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
Peter Jaszkowiak
f4355efb30 Optimize translator
- Use `slice` less
- Skip iterations with `indexOf`
2017-10-16 12:03:41 -04:00
Julian Lam
684a66a760 fixes #5989 2017-10-16 10:51:53 -04:00
Barış Soner Uşaklı
73b3e08682 up mentions 2017-10-15 17:54:40 -04:00
Peter Jaszkowiak
189008af75 Optimize translator
- Use `slice` less
- Skip iterations with `indexOf`
2017-10-14 13:47:05 -06: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
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