Commit Graph

4347 Commits

Author SHA1 Message Date
psychobunny
8ad24818df fixed FOUS in category sidebar 2014-03-02 23:40:31 -05:00
psychobunny
71675d0aa0 removed required "ajaxifying" class for #content - breaks browsers with noscript turned on. 2014-03-02 23:36:27 -05:00
psychobunny
88ca3733a7 more jshinting 2014-03-02 23:07:16 -05:00
psychobunny
d20501b29d meta.js merge conflict 2014-03-02 22:59:57 -05:00
psychobunny
cdf92c5cda fixed a really annoying bug - the original topics route pre-refactor never actually included a privileges object 2014-03-02 22:54:03 -05:00
psychobunny
c44934cc0d all JS files properly required on cold load 2014-03-02 22:51:40 -05:00
psychobunny
52a50a80ba templates.parseTemplateVariables, added optional callback 2014-03-02 22:48:18 -05:00
psychobunny
b9264dea76 ajaxify.loadScript 2014-03-02 22:47:14 -05:00
Julian Lam
fc53385ede removing socket.io library from minfile 2014-03-02 22:34:57 -05:00
psychobunny
fa2b5d1ee6 re-implementing meta and link tags - completified 2014-03-02 22:15:27 -05:00
psychobunny
3eb9f65c2e jshinting controllers/index.js; adding back meta tags to home page 2014-03-02 22:12:08 -05:00
psychobunny
8df33e65ac fixing bug in topics causing meta tags to revert on subsequent refresh 2014-03-02 22:10:57 -05:00
Julian Lam
044347ebca hotfix for vanilla missing socket.io lib 2014-03-02 22:02:55 -05:00
Julian Lam
aadde85e1b Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-02 20:41:49 -05:00
Julian Lam
28832a2540 fixing bug where sometimes a pidfile was left over, and nodebb would refuse to start a daemon again. 2014-03-02 20:37:57 -05:00
Baris Soner Usakli
f5ec24e925 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-02 20:01:01 -05:00
Baris Soner Usakli
016642bc16 show 1 ip per line 2014-03-02 20:00:54 -05:00
Julian Lam
34336a1069 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-02 19:56:27 -05:00
Julian Lam
1837a8443c shifting socket.io back to the end :\ 2014-03-02 19:55:50 -05:00
Baris Soner Usakli
98fa8c419d closes #1152 2014-03-02 19:55:26 -05:00
Baris Soner Usakli
55b5d0c209 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-02 16:58:56 -05:00
Baris Soner Usakli
e4b6d0e1ff closes #1096 2014-03-02 16:58:49 -05:00
Julian Lam
a8d2b46911 fixed incorrect path in plugin script inclusion 2014-03-02 16:44:41 -05:00
Julian Lam
e70bc9f163 added deprecation warning for plugins using filter:scripts.get 2014-03-02 16:33:45 -05:00
Julian Lam
5553e07bbd moving socket.IO client lib to top of file, just in case 2014-03-02 16:29:21 -05:00
Julian Lam
4c2a6953f1 concatenating the client scripts, instead of compressing, in development mode 2014-03-02 15:34:12 -05:00
psychobunny
dbbbe21883 re-implementing meta and link tags part 1 2014-03-02 15:14:38 -05:00
psychobunny
6820e9e662 random jshinting expedition 2014-03-02 14:45:57 -05:00
psychobunny
f0dfee5402 clean up 2014-03-02 14:21:24 -05:00
psychobunny
6c3c669e31 moved middleware out of webserver.js and into middleware.js 2014-03-02 14:16:16 -05:00
psychobunny
936e52a43f require db 2014-03-02 14:00:28 -05:00
Julian Lam
3860abdc24 plugins can now pass in scripts in plugin.json, and they will be bundled into nodebb.min.js 2014-03-02 13:58:25 -05:00
psychobunny
4d598dcd63 moved process events out of webserver.js and into app.js 2014-03-02 13:56:46 -05:00
psychobunny
ee5596fad5 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-02 13:51:34 -05:00
Julian Lam
14d7453a23 bundling socket.io client library into minfile, minfile always used from this point forward, even in development mode.
Development mode will not compress the scripts, but will just concatenate.
2014-03-02 13:28:09 -05:00
Julian Lam
033c5d5726 es, fr, nb, sv, zh_CN translations 2014-03-02 11:06:21 -05:00
Baris Soner Usakli
5732994097 reset_code click fix 2014-03-01 23:18:05 -05:00
Baris Soner Usakli
feeb220514 removed console.log 2014-03-01 22:52:30 -05:00
Baris Soner Usakli
1b7f8cc5cb active users fix 2014-03-01 22:51:39 -05:00
Baris Soner Usakli
fb691b23b4 moved topic locked check to topic.reply 2014-03-01 22:03:21 -05:00
Julian Lam
77f5d6ff7d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 22:00:28 -05:00
Julian Lam
1c324f45cf tried fixing absentee detection in active users 2014-03-01 21:59:51 -05:00
Baris Soner Usakli
c6ff8e1042 #1148 2014-03-01 21:55:29 -05:00
Julian Lam
079ed10631 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 21:32:43 -05:00
Julian Lam
2b178ff76d proper tracking of users' reply status when others enter the room 2014-03-01 21:31:50 -05:00
Baris Soner Usakli
2966cc4a49 minor fix 2014-03-01 19:18:15 -05:00
Baris Soner Usakli
b2f9184562 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-01 19:15:25 -05:00
Baris Soner Usakli
b6d97281d3 closes #1015 2014-03-01 19:15:18 -05:00
Julian Lam
a9b78d2600 minimizing the composer should unregister it 2014-03-01 17:49:39 -05:00
Julian Lam
68fb6ec09a Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 17:36:30 -05:00