Commit Graph

831 Commits

Author SHA1 Message Date
Baris Usakli
a0751d6caa Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-06-24 14:34:00 -04:00
Baris Usakli
d3a190d74e username to userslug change 2013-06-24 14:33:53 -04:00
Julian Lam
4436dbafe9 Merge branch 'master' of github.com:psychobunny/node-forum 2013-06-24 13:03:39 -04:00
Julian Lam
89e852f692 adding 'load more topics' button to topic admin 2013-06-24 13:03:34 -04:00
Baris Usakli
ad11be657e added turkish characters to utils.slugify 2013-06-24 12:08:21 -04:00
Baris Usakli
dd4af40be0 removed login code from user.js 2013-06-24 11:14:45 -04:00
Baris Usakli
8f92710906 moved login code from user.js to login.js 2013-06-24 11:14:03 -04:00
Baris Soner Usakli
1620d1e4be fixes #17 2013-06-21 17:48:12 -04:00
Baris Soner Usakli
f49fc234c1 fixed recent replies order. closes #27 2013-06-21 16:46:31 -04:00
Julian Lam
e158fdc963 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-06-21 13:29:22 -04:00
Julian Lam
4d99870063 updating nodebb executable so that it sends a NODE_ENV environment
variable in, and modified app.js and redis lib to read it.
2013-06-21 13:28:55 -04:00
Baris Soner Usakli
e49d2707eb changed the follower/following keys 2013-06-21 12:53:50 -04:00
Baris Soner Usakli
f657c307dc Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-06-21 12:24:03 -04:00
Baris Soner Usakli
acdca15e6a possible fix for issue #12 2013-06-21 12:23:49 -04:00
Julian Lam
f91e0848ee updated readme to link to wiki page on running NodeBB 2013-06-21 12:09:22 -04:00
Baris Usakli
aaab212128 fixed more indentation 2013-06-20 16:52:42 -04:00
Baris Usakli
e7619e6fe3 fixed indents 2013-06-20 16:49:04 -04:00
Baris Usakli
9309722898 fixed indents 2013-06-20 16:48:17 -04:00
Julian Lam
602f0d26f9 Merge branch 'master' of github.com:psychobunny/node-forum 2013-06-20 16:39:45 -04:00
Julian Lam
d0e5938788 merging in Peter Cellik's changes to allow NodeBB to work with a passworded Redis store. Fixes #11 2013-06-20 16:39:11 -04:00
Baris Usakli
64a9e5844d son whitespace conflicts are so 1765 2013-06-20 16:30:33 -04:00
Baris Usakli
523b787e69 added csrf to ajax calls 2013-06-20 16:29:44 -04:00
Julian Lam
0d954b24dc removed debug statements, adding missing file re: issue #3 2013-06-20 16:29:20 -04:00
Julian Lam
e75e0011e2 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	public/css/admin.less
2013-06-20 16:21:39 -04:00
Julian Lam
32eba62ef6 developed during a merge... I am going to hell for this.
- also new topics tab in admin panel
2013-06-20 16:19:17 -04:00
Baris Usakli
9cf9e98b14 removed duplicate build_header 2013-06-20 16:04:58 -04:00
Baris Usakli
cef77c2fd8 changed res.send(JSON.stringify()); to res.json(). closes #25 2013-06-20 15:08:33 -04:00
Baris Usakli
3f3d81de44 admins can make others admins 2013-06-20 14:45:38 -04:00
Julian Lam
59d26d6fc9 implementing express.csrf for login and register pages (the only places where HTTP forms are used). Fixes #8 2013-06-20 12:41:22 -04:00
Baris Usakli
fc4d3d849d better this way 2013-06-20 11:22:10 -04:00
Baris Usakli
41aeee9839 send back empty object if no data for user 2013-06-20 11:20:37 -04:00
Baris Usakli
b1e369f1fc chat notification redirect wont be null 2013-06-20 10:41:47 -04:00
Baris Soner Usakli
32b9db5771 changes to Date.now() 2013-06-19 21:39:41 -04:00
Baris Soner Usakli
0a0f8a21f0 changed new Date().getTime() to Date.now() on server side 2013-06-19 21:29:50 -04:00
Baris Soner Usakli
f2dfba33ad cleaned image upload a bit, no longer using the filename sent by the user 2013-06-19 21:00:19 -04:00
Baris Soner Usakli
626423e01b path join on user routers 2013-06-19 10:32:48 -04:00
Baris Soner Usakli
b962972d21 changed the image upload to use the path module instead of / 2013-06-19 09:47:15 -04:00
Baris Usakli
ffbd777642 moved chat code to its own module 2013-06-18 11:26:57 -04:00
Baris Usakli
88a1fef941 bookmark for the post made 2013-06-18 10:47:43 -04:00
Baris Usakli
b7e2bfff3d send notification to all followers when a user makes a post 2013-06-18 10:01:42 -04:00
Julian Lam
e32111c8bc removing debug statements from feed.js 2013-06-17 16:17:56 -04:00
Baris Soner Usakli
39cf0476d3 follower and following count on account page 2013-06-17 15:46:13 -04:00
Baris Soner Usakli
44d07ea543 changed friends to following/followers, updated routes and the user.js functions 2013-06-17 15:25:09 -04:00
Julian Lam
05b91caf6c noscript for home and category view (although it's not quite working for
category view yet)
2013-06-14 13:01:24 -04:00
Julian Lam
2dea93d0fb Merge remote-tracking branch 'origin' 2013-06-13 11:40:21 -04:00
psychobunny
1fc596b74b fixed sidebar flashing in on empty category - got rid of javascript control and set the visibility properly from serverside 2013-06-11 16:36:41 -04:00
Julian Lam
c0b018cdf4 adding noscript parsing for a topic, if accessed by a browser without javascript 2013-06-11 15:40:50 -04:00
psychobunny
d5f3f3d9fb fixed serverside templates.js bug that prevented blocks from being defined 2013-06-11 14:52:21 -04:00
Julian Lam
740cf13e8d updated less-middleware to 1.1.12 (fixing odd regression with LESS package update). Fixed issue where editing of posts was wonky because the title was being grabbed incorrectly 2013-06-11 13:58:02 -04:00
Julian Lam
6df57c4a9b committing the broken template parsing for andrew to see (webserver.js, line 121. Uncomment the commented out object, or substitute in "posts") 2013-06-11 13:51:25 -04:00