Commit Graph

5675 Commits

Author SHA1 Message Date
Baris Soner Usakli
0682b5c5ea fix admin users link 2014-02-27 15:44:34 -05:00
Baris Soner Usakli
389fc787a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-27 15:35:58 -05:00
Baris Soner Usakli
c49c3e3550 fixed jquery ui package 2014-02-27 15:35:50 -05:00
psychobunny
4435a20d90 fixed merge conflict 2014-02-27 15:11:50 -05:00
psychobunny
96d6b96ce4 controllers.home 2014-02-27 15:06:39 -05:00
psychobunny
c084529597 removed old api/home and api/popular 2014-02-27 14:56:54 -05:00
psychobunny
ad222dce2a controller indexx 2014-02-27 14:56:14 -05:00
psychobunny
233e49fd34 topics controller 2014-02-27 14:56:05 -05:00
psychobunny
62a4b419e3 categories controller 2014-02-27 14:55:53 -05:00
psychobunny
27b99d5c56 webserver.js refactor init 2014-02-27 14:55:41 -05:00
psychobunny
1db0651bff removing old api/popular code 2014-02-27 14:44:47 -05:00
psychobunny
4a33b41464 deprecating loadServer in favour of using res.render 2014-02-27 14:44:19 -05:00
Julian Lam
e2fb3dacca pushing new language fallbacks 2014-02-27 14:10:13 -05:00
Julian Lam
dfd13fac0d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-27 14:05:55 -05:00
Julian Lam
44ac7ec262 added new hooks for rendering help messages in composer, removed markdown text from translation 2014-02-27 14:05:31 -05:00
Baris Soner Usakli
30eb85f96e fixed conflicts 2014-02-27 12:46:37 -05:00
Baris Soner Usakli
44d40fba35 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-27 12:15:34 -05:00
Baris Soner Usakli
0ca6c58ded closes #1137 2014-02-27 12:15:26 -05:00
Julian Lam
1a85d45567 portuguese and slovak translations 2014-02-27 10:41:59 -05:00
Julian Lam
a7c53519b6 updated executable help 2014-02-27 10:30:09 -05:00
Julian Lam
c7274e11d0 removing the bit of code that disables plugins if the minver does not satisfy (too annoying imo)... now that we have ./nodebb reset, this is moot 2014-02-27 10:28:49 -05:00
Julian Lam
4567e5fbd0 updated help blurb in executable 2014-02-27 10:13:36 -05:00
Julian Lam
5b301772bb added daemon capability to ./nodebb start, npm start/stop scripts 2014-02-27 10:06:31 -05:00
Baris Soner Usakli
38e4a6c8b0 better check 2014-02-27 01:51:33 -05:00
Baris Soner Usakli
b8c089cfaa added check for invalid tags 2014-02-27 01:43:24 -05:00
Baris Soner Usakli
fb1313ec90 load config change 2014-02-27 01:32:20 -05:00
Baris Soner Usakli
dcd3975933 closes #1135 2014-02-27 00:45:29 -05:00
akhoury
2209a55afc - changes per PR conversation 2014-02-26 23:34:03 -05:00
akhoury
0070e1158e removing a boolean left out from the addEventListener definition 2014-02-26 22:32:09 -05:00
Baris Soner Usakli
72aa22d824 removed unused timestamp 2014-02-26 22:19:01 -05:00
akhoury
3f1d5c6656 merge fork with upstream master 2014-02-26 22:01:29 -05:00
Baris Soner Usakli
87ccfdf5eb Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 21:58:12 -05:00
Baris Soner Usakli
d87034b131 use alert for bookmark 2014-02-26 21:58:04 -05:00
akhoury
1b207d8276 IE8 support, general cleanups, from native to $ objects ... 2014-02-26 21:55:29 -05:00
akhoury
b59c10a1e9 took out some overrides out utils to a new overrides.js 2014-02-26 21:49:22 -05:00
Julian Lam
ef2dbe8df6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-26 21:10:15 -05:00
Julian Lam
04b2887d88 fixed it language code 2014-02-26 21:10:05 -05:00
Baris Soner Usakli
81f4767687 user.js hint 2014-02-26 21:04:20 -05:00
Baris Soner Usakli
6a962655e4 jshint for topics.js 2014-02-26 20:38:49 -05:00
Baris Soner Usakli
f1f7b59d58 missed this one 2014-02-26 20:31:30 -05:00
Baris Soner Usakli
d398d4c613 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 19:55:34 -05:00
Baris Soner Usakli
99bf882a1c removed cid from getTopicsByTids 2014-02-26 19:55:28 -05:00
Barış Soner Uşaklı
1ca1ace053 Update README.md 2014-02-26 19:45:07 -05:00
Baris Soner Usakli
ad37715972 empty array if not topics in catgory 2014-02-26 17:34:02 -05:00
Baris Soner Usakli
d5268f5497 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 17:17:02 -05:00
Baris Soner Usakli
56bbeb9950 use disableSocialButtons from config 2014-02-26 17:16:55 -05:00
psychobunny
2247a8b21f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 17:00:07 -05:00
psychobunny
aee2b2ecd0 allow express to serve parsed tpls via res.render 2014-02-26 17:00:03 -05:00
Baris Soner Usakli
7f2d70d7f6 minor cleanups 2014-02-26 16:58:02 -05:00
Baris Soner Usakli
a83d4a9dd5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 16:43:28 -05:00