Commit Graph

2469 Commits (140f90f7f33f85e1e0a67518d0a39c28d8751357)
 

Author SHA1 Message Date
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
Julian Lam ffbafc99c4 Merge remote-tracking branch 'origin' into notifications
Conflicts:
	public/css/style.less
	public/src/app.js
	src/websockets.js
Julian Lam c8d48127ad more changes to notification dropdown in header bar
psychobunny 9503aa9a57 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
psychobunny a9672ab9d8 begin refactor of posts/topics + pagination + cleanup + async
Baris Usakli 37985cc383 cant send empty chat messages anymore
Baris Usakli 9e54602d16 removed debug code
Baris Usakli 3c0b86689a if same id is used it replaces the current alerts contents
Baris Usakli 58d12c9c7c possible fix to post window opening on page load
Baris Usakli fe37dfecf7 connection/disconnection handling
Julian Lam 64f320743a renaming the notification window to 'alert_window'
Julian Lam 194793d14d Merge branch 'master' into notifications
Conflicts:
	src/websockets.js
Julian Lam 6f4c480cd8 interim commit on notifications dropdown
Julian Lam 6bae30336a foundation for user notifications
Baris Usakli ad1f688e85 chat text area is readonly now
Baris Usakli 45e92b0b8d when u drag a chat window it comes to front
Baris Usakli c7dcbb8ab2 added jquery.ui.min
Baris Usakli 6e8a18f475 fixed IE bug when chat message was sent post window was opening
Baris Usakli 8d0ac4cb07 chat feature
Baris Usakli 40b2aa2a80 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 9f8c9e8822 derp
psychobunny 17cde19020 potential fix for templates bug
Julian Lam 6cd65e6598 fixing motd so that it shows default motd if config is empty
Julian Lam 93f3a0e524 adding some default text to meta title and desc
Julian Lam 499f840e1e added toggle in config to switch on and off the motd
Julian Lam 16dac16d91 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam ec463ce3d3 added motd support
Baris Soner Usakli 760037ba0a added signature to new replies
Baris Soner Usakli ef304a712f strip tags from signature when they are saving, separated info in user profile and added signature box
Julian Lam 26781157b3 refactoring posts, topics, and categories so that each "get" is moved up
one level. Topics.get will get all of the posts in a tid, etc.
Julian Lam 907f5d4ea6 hiding the thread rep count from the template because... we don't actually
actively have a plan for thread rep...
Julian Lam 624ccc592c resolving issue where the post window stays open during navigation
- app.close_post_window now neatly closes the post window
Julian Lam 74c13ba299 Merge remote-tracking branch 'origin'
Julian Lam fd38b60bd6 fixing issue with teasers showing deleted post info