Commit Graph

20066 Commits

Author SHA1 Message Date
Baris Usakli
f2c1a92513 closes #215 2013-09-25 13:08:11 -04:00
Baris Usakli
fe6595cd2a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-25 12:30:17 -04:00
Baris Usakli
c2aac916aa fixed topics not appearing after a post in category view 2013-09-25 12:30:07 -04:00
psychobunny
e161b5387b fixed untranslated language on dynamic new posts and infinite loading 2013-09-25 12:16:06 -04:00
Baris Usakli
585e5cd88f closes #341 2013-09-25 12:11:32 -04:00
psychobunny
1637ffc5dc re-adding teaser 2013-09-25 11:40:05 -04:00
psychobunny
a28797ee03 fix for recent view teasers 2013-09-25 11:26:28 -04:00
Julian Lam
49e28f9d1e fixing bug where outgoing links didn't actually let you leave... oops! 2013-09-25 11:25:48 -04:00
Baris Usakli
4a7cd664fd fixed a bug in template parsing 2013-09-24 16:46:45 -04:00
Baris Usakli
253e11d55b cleaned up websockets.js 2013-09-24 16:02:14 -04:00
Baris Usakli
eb1c1c78d4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-24 15:59:51 -04:00
Baris Usakli
0b0d64b52e logout/login changes, updateHeader changes 2013-09-24 15:59:08 -04:00
Julian Lam
1ae51ef5ea redis export function (commented out for now) 2013-09-24 15:36:17 -04:00
psychobunny
de1e3230f5 fixed topics and admin views, broken after merge 2013-09-24 15:23:16 -04:00
psychobunny
1fbc038e64 fixed conflicts, added new language key for users/online 2013-09-24 15:15:39 -04:00
psychobunny
cd63dd429b finalizing todo's before merging 2013-09-24 14:59:13 -04:00
Baris Usakli
fbfdf561fc Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-24 14:57:01 -04:00
Baris Usakli
83d5a84edd login redirects back 2013-09-24 14:56:51 -04:00
psychobunny
5abf02c6d1 default language, en 2013-09-24 14:55:46 -04:00
psychobunny
b8037845d6 registration.tpl; translator variable system 2013-09-24 14:50:38 -04:00
Julian Lam
c80e2552b2 express-namespaceing routes 2013-09-24 14:18:41 -04:00
psychobunny
1a1fea535b header language 2013-09-24 14:17:36 -04:00
psychobunny
5c7da4b686 fixed serverside templating; footer, logout internationalization; updated more global lang keys 2013-09-24 14:14:26 -04:00
Julian Lam
b6ee89a6d8 fixed typo in plugins page 2013-09-24 14:12:26 -04:00
psychobunny
2d8e6bd980 category language 2013-09-24 13:31:44 -04:00
Julian Lam
a173d61464 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-24 13:31:10 -04:00
Baris Usakli
8f04a136c8 fixed whitespace 2013-09-24 13:31:02 -04:00
Julian Lam
b7675e1ec7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-24 13:30:59 -04:00
Julian Lam
964fbfe2bb fixes to get nodebb to at least load on IE 2013-09-24 13:30:54 -04:00
Baris Usakli
8fb8956c0d closes #331 2013-09-24 13:30:09 -04:00
psychobunny
c11920ac08 internationalization: 404 and 403 2013-09-24 13:22:10 -04:00
Baris Usakli
9a4eb26246 closes #332 2013-09-24 13:06:14 -04:00
Julian Lam
0d9958afe7 HOTFIX for scripts 2013-09-24 13:01:18 -04:00
Julian Lam
d6dd74b50a removed extra debug log 2013-09-24 12:34:54 -04:00
Julian Lam
d5437ca8fa Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-24 12:34:17 -04:00
Julian Lam
14720057c2 serving unminified libraries in development mode, minified otherwise 2013-09-24 12:33:51 -04:00
Baris Usakli
170ed8cc01 fixed conflict 2013-09-24 12:31:28 -04:00
Baris Usakli
25576eb35a closes #329 2013-09-24 12:29:51 -04:00
Julian Lam
66cb1fb6ad removed console.log from socket connection success handler 2013-09-24 11:02:06 -04:00
Julian Lam
bcc65fd879 closed #328 2013-09-24 08:38:19 -04:00
Julian Lam
99440585e6 Merge branch 'master' into optimize-22-09-2013
Conflicts:
	package.json
2013-09-23 20:04:09 -04:00
Baris Usakli
290d69d14a remember where the topic was left off 2013-09-23 17:41:54 -04:00
Baris Usakli
4fce06677f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-23 16:49:11 -04:00
Baris Usakli
f53cd8b5b6 category view fix 2013-09-23 16:49:01 -04:00
Julian Lam
da59f47624 adding missing files 2013-09-23 15:46:40 -04:00
Julian Lam
521586f08f Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-23 15:45:23 -04:00
Julian Lam
f39a7ada7c skipping minification if the minFile is already up-to-date - issue #322 2013-09-23 15:45:03 -04:00
Baris Usakli
bae9f46d8b small fixes to search 2013-09-23 15:31:52 -04:00
Julian Lam
d7ea24e218 issue #322 - minifying css file and added jquery to minified compilation 2013-09-23 15:27:46 -04:00
Julian Lam
e621d7e601 closed #322 - autominifying client-side assets on load 2013-09-23 15:21:34 -04:00