Commit Graph

543 Commits (aaab212128144cac446790fc29aefddf27fd5bc5)

Author SHA1 Message Date
Baris Usakli e7619e6fe3 fixed indents
Baris Usakli 9309722898 fixed indents
psychobunny 912664756f categories admin continued
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
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 41aeee9839 send back empty object if no data for user
Baris Soner Usakli 45dec91e1b reverted updateHeader code in footer.js to fix top bar after an image upload
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
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
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
Julian Lam ca13d8dd33 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 51a941b6d5 tweaking templates code to accept a template-type attribute (for boolean purposes
Baris Soner Usakli a4fc5ff981 fixed user header image
Baris Soner Usakli b65f2bf97d birthday box type date
Julian Lam dd4bc61b5a allowed clicking on the taskbar button itself to minimize
Julian Lam 9d3a27ea17 splicing out taskbar related code into its own require module
Julian Lam 07d4466cb4 fixing user label when viewing with js disabled
Julian Lam 05b91caf6c noscript for home and category view (although it's not quite working for
category view yet)
Julian Lam df5518f218 Merge branch 'master' of github.com:designcreateplay/NodeBB
psychobunny 0b6a9d59c2 derp, footer has been pointing to the wrong site this whole time
Julian Lam 2dea93d0fb Merge remote-tracking branch 'origin'
Julian Lam 41187dfddb adding a confirm dialog behind the theme revert button in the acp
Julian Lam cbd03e75e2 fixing bug where the number of posts counted was incorrect (1 over), causing thread tools to not appear when a topic was locked.
also integrated bootbox into confirm dialogs for thread deletion
psychobunny 1fc596b74b fixed sidebar flashing in on empty category - got rid of javascript control and set the visibility properly from serverside
Julian Lam c0b018cdf4 adding noscript parsing for a topic, if accessed by a browser without javascript
Julian Lam fa03b13209 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 973eb713bf auto-hiding mod tools on a new_post event, and showing them again if the user can edit that post
psychobunny d5f3f3d9fb fixed serverside templates.js bug that prevented blocks from being defined