Commit Graph

23052 Commits (6ea3b51f128dd270281db576a1b59270d5e45db0)
 

Author SHA1 Message Date
Baris Usakli db6bbcc699 post every x seconds added it x to config
Julian Lam 6060f4fbb4 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 33f8ee57bf revamped social auth code so that accounts are merged if they share a common email
also updated auth code so that fbid gplusid and twid are saved in the hash instead of as simple key->value
Baris Usakli eeb70b17ba Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli da46a73efe looks better without disconnect alert
psychobunny 55c704c6f9 hide category blocks in recent tab
Baris Usakli 6465b1aff7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 2d90635dc8 added 500ms delay to disconnect message
psychobunny af7550ca30 console.log
psychobunny 06aa2337d1 admincategories.js
psychobunny a02a74604c moved CategoriesAdmin into its own file, hid popular/active, some jslinting + cleanup, renamed some fn calls to be more descriptive
psychobunny 55cb790d3c potential fix for duplicate chat results, started recent replies block
Julian Lam 786baa8fe0 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 289219d0ee adding email header and footer
psychobunny deaf8105cc renamed get category to get categories
psychobunny 43614a5197 fixed breaking issue on empty category
psychobunny 4b67f8573e recent posts done (needs polish/cleanup), and fixed bug where new topic button was not showing up in categories
Julian Lam 6acc07920e Updated README.md
psychobunny c785f06367 added 404 tpl, fix for 404 on topics, continuing refactor - categories
Baris Usakli 8f281e9792 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 0f2014193d top bar fix
Julian Lam d71a38c4f7 minor styling changes to notif window
Julian Lam e6218bb74a Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 2a829a0618 derpy globals to get notification pushing working for sockets on new notification event
Baris Usakli c02e235005 border radius 0px on home
Baris Usakli 141500266a Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 16bf813dcd home page derp
psychobunny 4a3ffec29f proof that comments can be misleading
Baris Usakli 99eb9f8399 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli a4e10076cc assorted
psychobunny 0f51843213 if there are no topics in a category and you make the first topic it doesnt show up until you reload the page
psychobunny 1f99666d9f moved favourites code out of posts
psychobunny d0646ba98f typo
Julian Lam bafac00232 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/websockets.js
Julian Lam 35dae6c0ec updating web sockets so that all connections are stored in a userSockets array
Baris Usakli b0be1fab16 notifications in chat messages
Julian Lam cf64952918 bugfixing notif window
Julian Lam e159d70353 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/websockets.js
psychobunny c64b227a9d odd - utils.js
Julian Lam 7321088ac5 added a call to check for new notifications on load
Julian Lam 79bf5fad5b tweaks to notif window to show relative time
Julian Lam 7e46f8c6ce uniqueId support in notifications
psychobunny 044206ad17 misc cleanup in categories
Julian Lam 681bf270a1 hotfix to path to utils
Julian Lam 1f7ab82f78 Merge remote-tracking branch 'origin' into notifications
Conflicts:
	src/webserver.js
psychobunny cd4ca110a1 moved utils over to client side for code sharing
Baris Usakli 65e24ed5cb added admin routes to config.json
Julian Lam 78713f0599 Merge remote-tracking branch 'origin' into notifications
Baris Usakli f4218264e2 successful >:)
Baris Usakli acd797fe20 changed github link on home