Commit Graph

783 Commits (aaab212128144cac446790fc29aefddf27fd5bc5)
 

Author SHA1 Message Date
Baris Usakli aaab212128 fixed more indentation
Baris Usakli e7619e6fe3 fixed indents
Baris Usakli 9309722898 fixed indents
psychobunny 912664756f categories admin continued
Julian Lam 602f0d26f9 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam d0e5938788 merging in Peter Cellik's changes to allow NodeBB to work with a passworded Redis store. Fixes
Baris Usakli 64a9e5844d son whitespace conflicts are so 1765
Baris Usakli 523b787e69 added csrf to ajax calls
Julian Lam 0d954b24dc removed debug statements, adding missing file re: issue
Julian Lam e75e0011e2 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	public/css/admin.less
Julian Lam 32eba62ef6 developed during a merge... I am going to hell for this.
- also new topics tab in admin panel
Baris Usakli a32103efbe fixed indentation of account.js
Baris Usakli 8c355c53cc fixed isFriend to isFollowing in account.tpl
Baris Usakli 6ec23f86e6 removed commented out line in templates.js
Baris Usakli 9cf9e98b14 removed duplicate build_header
psychobunny 99d8affa53 started categories admin + icon picker; updated fontawesome; removed FA docs/less/sass
Baris Usakli cef77c2fd8 changed res.send(JSON.stringify()); to res.json(). closes
Baris Usakli 3f3d81de44 admins can make others admins
Julian Lam ac5b7c02f8 hiding the minimize button for mobile/low resolution users - fixes issue
Julian Lam a1cf9710e9 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 59d26d6fc9 implementing express.csrf for login and register pages (the only places where HTTP forms are used). Fixes
Baris Usakli a7bce12887 this fixes
Baris Usakli 9e7e0f6579 changed updateHeader to check for the existance of the user label
Baris Usakli fc4d3d849d better this way
Baris Usakli 41aeee9839 send back empty object if no data for user
Baris Usakli b1e369f1fc chat notification redirect wont be null
Baris Soner Usakli 32b9db5771 changes to Date.now()
Baris Soner Usakli 0a0f8a21f0 changed new Date().getTime() to Date.now() on server side
Baris Soner Usakli f2dfba33ad cleaned image upload a bit, no longer using the filename sent by the user
Julian Lam a5a44b2069 added imagemagick to the installation instructions (re: issue )
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.
Baris Soner Usakli 626423e01b path join on user routers
Baris Soner Usakli b962972d21 changed the image upload to use the path module instead of /
Baris Soner Usakli 45dec91e1b reverted updateHeader code in footer.js to fix top bar after an image upload
psychobunny 65b7af365a last try :/
psychobunny 3c9c63b825 md line breaks failure
psychobunny fb84bbafcd some links to our pages + campaign. iz gud for seo?
Baris Usakli 2498c5c486 fixed taskbar for chat so it doesnt show multiple taskbar buttons for the same person
Baris Usakli 38e1b39c2d chat windows added to taskbar
Baris Usakli ffbd777642 moved chat code to its own module
Baris Usakli 88a1fef941 bookmark for the post made
Baris Usakli b7e2bfff3d send notification to all followers when a user makes a post
Julian Lam 3b04e277cd removed colour from the pulse effect. cheesy at best.
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
Julian Lam 4334e23c4d fixing improper use of tertiary if that hopefully resolves issue
Julian Lam e32111c8bc removing debug statements from feed.js
Baris Soner Usakli b0111274ad removed friends.js
Baris Soner Usakli 39cf0476d3 follower and following count on account page
Baris Soner Usakli 44d07ea543 changed friends to following/followers, updated routes and the user.js functions
Julian Lam 417034b60a adding int support in template types too, just for kicks