Commit graph

62 commits

Author SHA1 Message Date
Ali Asaria
43b0f03fd2 room announcement update to support socket 0.7 2011-09-24 13:09:03 -04:00
Ali Asaria
0e164fce74 Merge remote-tracking branch 'refs/remotes/wlangstroth/socketio08' into socketio08
Conflicts:
	README.markdown
2011-09-24 12:54:34 -04:00
Will Langstroth
309cf80626 use new-style .nodemonignore 2011-09-23 09:12:46 -04:00
ali asaria
a86aefafa0 Merge pull request #30 from codelahoma/doc-edit
Add connect module dependency
2011-09-16 05:23:41 -07:00
Rod Knowlton
93040b006e Add connect module dependency 2011-09-09 06:44:22 -05:00
Will Langstroth
6a8829aedc replace dependency list with npm install 2011-09-06 00:37:55 -04:00
Will Langstroth
0a3b02cf7d sessionId to id in lib/rooms.js 2011-09-06 00:06:01 -04:00
Will Langstroth
d03cc8ba38 sessionId to id 2011-09-05 22:17:30 -04:00
Will Langstroth
2e7b58ae85 update to new x.json.x syntax on server 2011-09-05 21:34:44 -04:00
Will Langstroth
453745dd4b use new configuration format 2011-09-05 21:31:45 -04:00
Will Langstroth
5c5ce328e6 update client script for new x.json.x syntax 2011-09-05 21:27:22 -04:00
Will Langstroth
80b7547cfa add node_modules to gitignore, add package.json 2011-09-05 21:24:26 -04:00
ali asaria
32aa004922 Edited README.markdown via GitHub 2011-08-11 01:22:53 -03:00
Ali Asaria
68faf0d501 fixes #23 2011-06-23 19:12:53 -04:00
Ali Asaria
35e4cf64af Hovering away no longer stops editing of editables
fixes #21
2011-06-23 09:29:40 -04:00
Ali Asaria
da38ac51ac Merge branch 'master' of github.com:aliasaria/scrumblr 2011-06-23 01:05:52 -04:00
Ali Asaria
9f6d8145df resize update -- adjust cards without delay 2011-06-23 01:04:09 -04:00
Raincole
1ff51b826d Fix the sticker bug(2) 2011-06-14 08:21:05 +08:00
Raincole
a7d803c7bc Fix the sticker bug 2011-06-14 08:19:05 +08:00
Raincole
f3bb4d73bf Restor lib/rooms.js 2011-06-14 07:48:43 +08:00
Raincole
30ff63f1c6 Adjust cards when board is resized 2011-06-14 07:42:04 +08:00
ali asaria
616e8ca5b3 Merge pull request #18 from raincole/master
Sets default port to 8124.
2011-06-11 22:21:26 -07:00
Raincole
1a4b9ec745 Set the default port(8124) 2011-06-11 03:25:45 +08:00
ali asaria
c60913854f Merge pull request #16 from nedk/issue_15
fixes #15
2011-06-07 07:18:00 -07:00
Ned Kahvo
b7eecd32a5 - using the div.board-outline height seems to be the most accurate .offset() on a floating element didn't return the right results, I assume a margin/padding/position issue is to blame but this works too. 2011-06-06 23:18:12 -04:00
Ali Asaria
0c32b9a607 delete old cards after re-initializing after a disconnect 2011-05-29 17:59:20 -04:00
Ali Asaria
2fda4f3785 change block look 2011-05-29 17:43:40 -04:00
Ali Asaria
99cdfec264 remove some socket io transports 2011-05-29 17:32:57 -04:00
Ali Asaria
8ed0fc98e5 Merge branch 'block_ui_on_disconnect' 2011-05-29 15:37:59 -04:00
Ali Asaria
6f36e63d01 block ui on disconnect 2011-05-29 15:36:30 -04:00
Ali Asaria
b6e175c193 allow card init animation to be controllable 2011-05-29 15:06:18 -04:00
Ali Asaria
481171bfec only allow stickers to drop onto cards. fixes #13 2011-05-29 14:42:26 -04:00
Ali Asaria
414d10ca25 Merge remote-tracking branch 'remotes/origin/resize_board' 2011-05-27 15:49:33 -04:00
Ali Asaria
431f0e76d6 allow board resizing 2011-05-27 01:08:25 -04:00
Ali Asaria
efb28ac4f1 first step in allowing resizing of board -- it's not persistant yet 2011-05-08 19:12:57 -04:00
ali asaria
0d5adbc340 important bugfix: was not getting room before updating columns 2011-03-14 10:27:49 -04:00
ali asaria
d159d02390 Merge branch 'data-abstract'
this is ddunlops work to abstract data layer and allow for mongodb

thanks ddunlop

Conflicts:
	.gitignore
	server.js
2011-03-14 00:43:35 -04:00
ali asaria
432e357e1e change name of db in redis to scrumblr 2011-03-14 00:11:23 -04:00
ali asaria
2f0e90a418 fix redis config type and make redis default 2011-03-14 00:07:01 -04:00
David Dunlop
bdd989ba7e moved redis to it's own file, added a config 2011-03-12 19:30:22 -05:00
David Dunlop
afe96eeec1 merged with upstream 2011-03-12 14:54:02 -05:00
David Dunlop
57bbc56c21 started abstracting the data store layer - started with mongodb 2011-03-12 14:40:28 -05:00
ali asaria
30860ab066 fix sanitizer exception on null string 2011-03-12 13:40:44 -05:00
ali asaria
3ad513358e add a forever script 2011-03-12 13:14:47 -05:00
ali asaria
7f98cac326 add a notice that the demo is only a demo
this is for visitors who don't read the docs and just arrive at the demo site -- i want them to know that the demo is not the whole product, just an example
2011-03-12 12:36:30 -05:00
ali asaria
6749ffb0fa this hack prevents http submit of forms when editing-in-place
i do this by replacing the <form> element with a <div> so the form no longer has default behaviours that need to be overridden by jquery.
2011-03-12 12:11:26 -05:00
ali asaria
ae247f09bf cleaned up some of the scrubbing of xss 2011-03-12 12:04:34 -05:00
ali asaria
2870f10968 remove forced sticker z-index so it appears below cards. fixes github issue #3 2011-03-12 11:18:06 -05:00
ali asaria
c6c26a40e0 start window off small but still allow dragging cards far outside the board 2011-03-12 11:15:59 -05:00
ali asaria
5adfd527cf license update 2011-03-11 13:07:20 -05:00