Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 03:01:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,675 Commits 72 Branches 483 Tags
652e1ef5745b69cb15e756eeb7df923af6e47388
Commit Graph

5675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a32103efbe fixed indentation of account.js 2013-06-20 16:13:23 -04:00
Baris Usakli
8c355c53cc fixed isFriend to isFollowing in account.tpl 2013-06-20 16:11:19 -04:00
Baris Usakli
6ec23f86e6 removed commented out line in templates.js 2013-06-20 16:05:53 -04:00
Baris Usakli
9cf9e98b14 removed duplicate build_header 2013-06-20 16:04:58 -04:00
psychobunny
99d8affa53 started categories admin + icon picker; updated fontawesome; removed FA docs/less/sass 2013-06-20 15:51:14 -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
ac5b7c02f8 hiding the minimize button for mobile/low resolution users - fixes issue #21 2013-06-20 13:01:50 -04:00
Julian Lam
a1cf9710e9 Merge branch 'master' of github.com:psychobunny/node-forum 2013-06-20 12:42:19 -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
a7bce12887 this fixes #13 2013-06-20 12:13:46 -04:00
Baris Usakli
9e7e0f6579 changed updateHeader to check for the existance of the user label 2013-06-20 11:55:56 -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
Julian Lam
a5a44b2069 added imagemagick to the installation instructions (re: issue #4) 2013-06-19 20:56:59 -04:00
Julian Lam
3a6c6fd15e updating readme to handle the fact that ubuntu (even 13.04) only installs 
Node.js v.0.6.19, and not 0.8, as required by bcrypt.
 2013-06-19 16: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 Soner Usakli
45dec91e1b reverted updateHeader code in footer.js to fix top bar after an image upload 2013-06-19 09:35:44 -04:00
psychobunny
65b7af365a last try :/ 2013-06-18 14:16:44 -04:00
psychobunny
3c9c63b825 md line breaks failure 2013-06-18 14:12:19 -04:00
psychobunny
fb84bbafcd some links to our pages + campaign. iz gud for seo? 2013-06-18 14:11:01 -04:00
Baris Usakli
2498c5c486 fixed taskbar for chat so it doesnt show multiple taskbar buttons for the same person 2013-06-18 12:22:01 -04:00
Baris Usakli
38e1b39c2d chat windows added to taskbar 2013-06-18 12:11:48 -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
3b04e277cd removed colour from the pulse effect. cheesy at best. 2013-06-17 23:28:17 -04:00
Julian Lam
9fb8701f4f added a new option "state" to taskbar push... set to 'active' to have it 
load in an active (darkened) state, while 'pulse' will have it pulse
between darkened and light states
 2013-06-17 23:25:12 -04:00
Julian Lam
4334e23c4d fixing improper use of tertiary if that hopefully resolves issue #1 2013-06-17 17:40:25 -04:00
Julian Lam
e32111c8bc removing debug statements from feed.js 2013-06-17 16:17:56 -04:00
Baris Soner Usakli
b0111274ad removed friends.js 2013-06-17 15:48:12 -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
417034b60a adding int support in template types too, just for kicks 2013-06-17 14:00:39 -04:00
Julian Lam
ca13d8dd33 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-06-17 13:59:23 -04:00
Julian Lam
51a941b6d5 tweaking templates code to accept a template-type attribute (for boolean purposes 2013-06-17 13:59:16 -04:00
Baris Soner Usakli
7679076cba Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-06-17 13:35:41 -04:00
Baris Soner Usakli
a4fc5ff981 fixed user header image 2013-06-17 13:35:37 -04:00
Julian Lam
d96bfee227 Resolving issue #2 -- added GPLv3 license file and updated package.json 2013-06-17 11:56:47 -04:00
Julian Lam
2c7f9c7103 updated package.json to include git link, and updated README.md to include 
proper installation instructions
 2013-06-17 08:30:45 -04:00
Baris Soner Usakli
b65f2bf97d birthday box type date 2013-06-14 16:04:07 -04:00
Julian Lam
dd4bc61b5a allowed clicking on the taskbar button itself to minimize 2013-06-14 15:32:49 -04:00