Commit Graph

13475 Commits

Author SHA1 Message Date
barisusakli
cbafbab107 closes #4986 2016-08-27 14:25:30 +03:00
barisusakli
e964ca1486 up composer 2016-08-27 14:08:26 +03:00
barisusakli
50aac3c6a4 closes #4979 closes #4984 2016-08-27 14:06:14 +03:00
barisusakli
b933385b76 partially revert fa9f1ac7fe
extending module.exports instead of overwriting fixes the issue
2016-08-27 12:58:08 +03:00
barisusakli
3dae8f5529 up themes 2016-08-27 12:55:18 +03:00
Barış Soner Uşaklı
559b01afac Merge pull request #4987 from pichalite/register-page
minor design tweaks to register page
2016-08-27 11:36:25 +03:00
pichalite
05ad373b80 minor design tweaks to register page 2016-08-27 06:34:18 +00:00
barisusakli
c8f270ec67 another validator.escape fix 2016-08-27 02:01:41 +03:00
Barış Soner Uşaklı
8a847df4fd Merge pull request #4985 from pichalite/require-translator
require translator instead of global
2016-08-27 01:52:45 +03:00
barisusakli
fa9f1ac7fe fix dependency errors 2016-08-27 01:52:08 +03:00
barisusakli
56118ec1da fix 500-embed.tpl 2016-08-27 01:42:56 +03:00
pichalite
400da256f1 require translator instead of global 2016-08-26 22:19:33 +00:00
barisusakli
324fbcf325 merge 2016-08-27 00:45:48 +03:00
psychobunny
d1b9d1be6a fixed acp/users + acp/tags 2016-08-26 17:43:55 -04:00
barisusakli
805b452ae1 closes #4981 2016-08-27 00:37:13 +03:00
psychobunny
b5850a3bca Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-26 17:33:10 -04:00
psychobunny
ebfb857195 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/meta/tags.js
2016-08-26 17:33:07 -04:00
Julian Lam
d74aa0bd49 up composer @pichalite 2016-08-26 17:33:02 -04:00
psychobunny
0afa55517f fixed app.loadJQueryUI; minified jquery-ui.js; removed jqueryui from cold load payload; fixed broken image paths 2016-08-26 17:31:57 -04:00
Anil Mandepudi
addabf8e6e fix privileges in file upload and jquery-ui in tags (#4983) 2016-08-26 17:30:43 -04:00
psychobunny
8b9f004b7b Revert "fixed app.loadJQueryUI and minified jquery-ui.js"
This reverts commit 2c9c14ff7d.
2016-08-26 17:07:34 -04:00
psychobunny
2c9c14ff7d fixed app.loadJQueryUI and minified jquery-ui.js 2016-08-26 17:02:21 -04:00
Julian Lam
be96704d5d possible fix for #4981 2016-08-26 15:56:11 -04:00
Julian Lam
7ca6bc25c7 removing commented out code 2016-08-26 15:39:12 -04:00
Julian Lam
785f4fc5a0 updating to jQuery 3.x on frontend and ACP 2016-08-26 15:36:50 -04:00
barisusakli
89f550ce7c moved middleware requires 2016-08-26 19:40:14 +03:00
barisusakli
56c4e13316 another dependency fix and test 2016-08-26 19:33:16 +03:00
barisusakli
6d946425fa fix tests, circular deps 2016-08-26 19:13:05 +03:00
barisusakli
df7cfe2146 missing favicon dep 2016-08-26 19:12:55 +03:00
barisusakli
a0f2e8a8ec use req.uid 👍 2016-08-26 18:55:44 +03:00
barisusakli
8f408faf46 organize middlewares
removed app.locals.middleware
middlewares can be required anywhere, ie in controllers
2016-08-26 18:50:37 +03:00
barisusakli
f5941cbf1c removed unused requires 2016-08-26 17:14:13 +03:00
Julian Lam
25cd772e0e closes #4766 2016-08-26 10:04:44 -04:00
Julian Lam
e9770b6bd5 firing client-side hook when settingsv1 saves 2016-08-26 10:04:44 -04:00
Julian Lam
9198008907 forcing ACP settingsv1 to wait a beat before firing client-side hook so client-side scripts can register listeners first 2016-08-26 10:04:44 -04:00
barisusakli
3c1a4876d7 removed unused vars 2016-08-26 17:01:11 +03:00
barisusakli
5c83075806 moved variables parse to ajaxify.js 2016-08-26 16:39:09 +03:00
NodeBB Misty
b7fbc7a531 Latest translations and fallbacks 2016-08-26 09:03:14 -04:00
barisusakli
de34a98636 up themes 2016-08-26 13:08:29 +03:00
barisusakli
e5ecb333f9 closes #4978 2016-08-26 12:53:00 +03:00
barisusakli
97f0d2438f up timeout to 500ms 2016-08-26 12:33:44 +03:00
barisusakli
1339c4155d up composer 2016-08-26 11:19:19 +03:00
Julian Lam
275f5e32e8 adding back Bootswatch paper variables override 2016-08-25 17:23:06 -04:00
barisusakli
c8ba61ac7b closes #4791 2016-08-26 00:05:40 +03:00
Julian Lam
2428d5e442 Update bootstrap in ACP
Also fixed #4872 by moving user creation modal to root level
(outside of .panel)
2016-08-25 16:10:33 -04:00
barisusakli
2544287269 closes #4977 2016-08-25 22:16:54 +03:00
barisusakli
056942ea4d up themes 2016-08-25 22:01:56 +03:00
barisusakli
f7540a7edc closes #4811 2016-08-25 21:56:17 +03:00
Julian Lam
aa45db53f9 update persona 2016-08-25 14:23:53 -04:00
Julian Lam
4dd5d1877f update themes 2016-08-25 14:11:22 -04:00