Commit Graph

244 Commits

Author SHA1 Message Date
Julian Lam
a09cfd9304 started work on noscript tags in pages (but blocked by template bug with block processing), allowed reverting of theme in ACP
introducing mixins css file
2013-06-06 15:34:46 -04:00
Julian Lam
49ea40f6ee tweaks to composer pushing, fixed random extra letter in footer js 2013-06-06 13:30:28 -04:00
Julian Lam
6f16088cd6 cleaning up readme file and fixing bugs in editing of posts ("asdf" anyone?) 2013-06-05 13:34:44 -04:00
Julian Lam
82736d8780 editing of posts using new post window 2013-06-05 10:18:29 -04:00
Julian Lam
061c7a9e66 half broken editing 2013-06-04 16:47:07 -04:00
Julian Lam
676ddcd3e3 integrating the new post window into the forum 2013-06-04 16:20:27 -04:00
Julian Lam
0a00eac970 added requirejs, new 'composer' module for all posting related functions (client-side)
composer module only has "push" at the moment... doesn't render a window quite yet.
2013-06-03 16:06:11 -04:00
Julian Lam
dec9a3bef9 adding missing admin css file, some other tweaks and cleanup 2013-05-28 11:05:27 -04:00
Julian Lam
111b9dcf0a moved admin css to its own file for LESS compilation, and adding in
options to update social keys for login
2013-05-27 18:06:03 -04:00
Julian Lam
88bf9425db install script + patching up integration with install wizard 2013-05-27 14:02:57 -04:00
Julian Lam
5d7ec10aae Merge branch 'master' into install_script 2013-05-27 11:45:58 -04:00
Julian Lam
65b6010d74 installation wizard under /install 2013-05-25 20:32:22 -04:00
Baris Usakli
8a2499a423 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-24 14:29:40 -04:00
Baris Usakli
a4fd54a0c3 topic titles can be edited now 2013-05-24 14:29:35 -04:00
psychobunny
448673b141 recent replies part 2 2013-05-24 12:46:19 -04:00
psychobunny
55cb790d3c potential fix for duplicate chat results, started recent replies block 2013-05-24 09:00:11 -04:00
Julian Lam
e6218bb74a Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-23 15:54:17 -04:00
Julian Lam
2a829a0618 derpy globals to get notification pushing working for sockets on new notification event 2013-05-23 15:53:55 -04:00
Baris Usakli
99eb9f8399 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-23 15:17:29 -04:00
Baris Usakli
a4e10076cc assorted 2013-05-23 15:17:18 -04:00
psychobunny
1f99666d9f moved favourites code out of posts 2013-05-23 15:11:55 -04:00
Julian Lam
bafac00232 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/websockets.js
2013-05-23 14:56:23 -04:00
Julian Lam
35dae6c0ec updating web sockets so that all connections are stored in a userSockets array 2013-05-23 14:55:05 -04:00
Baris Usakli
b0be1fab16 notifications in chat messages 2013-05-23 14:53:50 -04:00
Julian Lam
681bf270a1 hotfix to path to utils 2013-05-23 13:29:21 -04:00
Julian Lam
ffbafc99c4 Merge remote-tracking branch 'origin' into notifications
Conflicts:
	public/css/style.less
	public/src/app.js
	src/websockets.js
2013-05-23 12:56:55 -04:00
Julian Lam
c8d48127ad more changes to notification dropdown in header bar 2013-05-23 12:54:57 -04:00
psychobunny
9503aa9a57 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-23 12:52:23 -04:00
psychobunny
a9672ab9d8 begin refactor of posts/topics + pagination + cleanup + async 2013-05-23 12:52:16 -04:00
Julian Lam
194793d14d Merge branch 'master' into notifications
Conflicts:
	src/websockets.js
2013-05-23 08:21:36 -04:00
Julian Lam
6bae30336a foundation for user notifications 2013-05-22 21:43:01 -04:00
Baris Usakli
8d0ac4cb07 chat feature 2013-05-22 17:14:06 -04:00
Baris Usakli
9f8c9e8822 derp 2013-05-22 15:35:54 -04:00
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.
2013-05-21 21:07:26 -04:00
psychobunny
ab492f147f check for online/offline users, added custom redis sismembers method, fix for category view not showing up if it has no topics 2013-05-21 17:02:04 -04:00
psychobunny
e694751b72 fixed templates bug in websockets 2013-05-17 13:40:15 -04:00
Julian Lam
a4dfc604e7 changed favouriting behaviour so that it no longer allows anons to favourite, and favouriting your own posts don't raise your rep count 2013-05-15 13:28:28 -04:00
Baris Usakli
b429a31f6b more clean up 2013-05-14 12:26:26 -04:00
Baris Usakli
4c324664fa removed global modules 2013-05-14 12:13:29 -04:00
Julian Lam
4fd1244e2d some work on deleting posts, and allowing a mod to edit a post 2013-05-11 23:35:27 -04:00
Julian Lam
b244da724e edit labels, and fixing responsive layout in topic view 2013-05-09 20:46:52 -04:00
Julian Lam
e9a552eab4 editing of posts 2013-05-09 10:20:25 -04:00
psychobunny
09c9d0ee1f fixed topics bug that was prevent /latest /popular /active and subsequently the admin versions of those routes from working. removed debug statements. added admin socket room. added dynamic updating of active users on acp index 2013-05-09 04:11:16 +00:00
psychobunny
30323fa29f Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-09 03:33:58 +00:00
psychobunny
f3f08a9c94 more fixes to ajaxify, updated /users blocks to sit flush to the left, started work on the ACP including basic templates, added a method to get active users in all rooms (socket connections), added more routes mostly pointing to admin, added a routing folder to start organizing routes better, starting with admin. 2013-05-09 03:33:53 +00:00
Julian Lam
ff025f0e48 interim commit to thread moving 2013-05-08 14:09:50 -04:00
Baris Usakli
0eacec8166 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 16:21:30 -04:00
Baris Usakli
8fe4905b68 exists function fix 2013-05-07 16:21:25 -04:00
Julian Lam
bf7c602cd8 thread pinning 2013-05-07 15:14:47 -04:00
Julian Lam
7bbc630dfb Merge remote-tracking branch 'origin' into thread_options
Conflicts:
	public/src/templates.js
2013-05-07 12:56:21 -04:00