Commit graph

98 commits

Author SHA1 Message Date
ali asaria
2b0312e8ae update dependancies with more current stuff 2014-08-16 17:11:01 -04:00
ali asaria
33eb4bf7a0 remove dependancy on redis-cli module
fixes #57
2014-08-16 16:35:28 -04:00
ali asaria
2289e1972c Update README.markdown
fixes #53
2013-12-22 17:57:20 -05:00
ali asaria
e9e752c5e4 remove all console.log logging 2013-12-08 13:18:10 -05:00
ali asaria
5bf629439c Merge branch 'master' of github.com:aliasaria/scrumblr 2013-12-08 10:36:18 -05:00
ali asaria
3a80c7cf4e Merge pull request #50 from tboronczyk/ui-touch-punch
adding jQuery UI Touch Punch - now drag and drop works on mobile!
2013-12-08 07:31:09 -08:00
ali asaria
cb0afcfe61 Merge branch 'ui-touch-punch' of https://github.com/tboronczyk/scrumblr 2013-12-08 10:21:18 -05:00
ali asaria
1d3f898c64 Merge pull request #44 from darksurfer/master
Ignore my previous one Sorry :/
2013-12-08 07:17:10 -08:00
ali asaria
92e5469ea4 Merge pull request #52 from tboronczyk/drag-cancel
ESC key cancels card drag
2013-12-08 07:16:24 -08:00
ali asaria
8c171883b6 remove most logging in server.js 2013-12-08 09:19:17 -05:00
ali asaria
599d33cc4e not sure what this is for 2013-12-08 09:18:41 -05:00
ali asaria
009dbf800c not sure what this style is for 2013-12-08 09:18:08 -05:00
ali asaria
d42a024ccf Merge branch 'master' of github.com:aliasaria/scrumblr 2013-12-07 13:18:04 -05:00
Timothy Boronczyk
203e5404fb ESC key cancels card drag if one accidentally starts to drag a card (sensitive touchpad, cruddy mouse, etc.) 2013-07-03 13:35:51 -07:00
Timothy Boronczyk
da35fa52d6 adding jQuery UI Touch Punch - now drag and drop works on mobile! 2013-07-03 09:22:49 -07:00
ali asaria
0bfd9fbcca Merge pull request #46 from nedk/master
README file updated
2012-08-30 13:28:59 -07:00
Ned Kahvo
8494cda284 updating the README with link to dependencies, fixes missing line break before license 2012-08-30 15:55:42 -04:00
Ned Kahvo
5798c90614 Merge remote-tracking branch 'upstream/master' 2012-08-30 14:14:39 -04:00
darksurfer
de4815df15 update lib/data/mongodb.js
Sorry a pull request again to remove the line to correct setBoardSize function with mondoDB
2012-06-12 18:16:25 +03:00
ali asaria
a1973a480e Merge pull request #39 from morizono/patch-1
Added the step "cd into scrumblr distribution directory."
2012-02-07 16:38:51 -08:00
morizono
ef7a31cf36 Added the step "cd into scrumblr distribution directory."
Added a workaround line for express in package.json
Added line about firewall b/c the person I set up scrumblr for knew enough to compile software, but not about modifying firewalls.
2012-02-07 12:09:50 -05:00
ali asaria
033050e340 Merge pull request #35 from giacomomacri/master
Added missing method for mongodb
2012-01-03 11:55:36 -08:00
giacomomacri
5efc8b489c add setter and getter for boardsize also for mongodb 2012-01-03 20:04:45 +01:00
Ali Asaria
fc924d7277 disable image dragging 2011-10-15 11:59:33 -04:00
Ali Asaria
ac5c342317 marker is movable. no one knows why. 2011-10-11 21:55:31 -04:00
Ali Asaria
d31a9b7a29 Merge branch 'master' of github.com:aliasaria/scrumblr
Conflicts:
	client/css/style.css
2011-10-11 21:13:00 -04:00
Ali Asaria
a1e202ada3 tone down the scribbles, man 2011-10-11 21:11:55 -04:00
Ali Asaria
20505d6b86 tone down the scribbles, man 2011-10-11 09:51:31 -04:00
Ali Asaria
f76e142f80 generate url for homepage 2011-10-10 21:38:47 -04:00
Ali Asaria
2dd1272958 move marker in front of green lines 2011-10-10 18:39:10 -04:00
Ali Asaria
868d242887 add marker and eraser to whiteboard 2011-10-10 18:35:32 -04:00
Ali Asaria
ca4c77c6b4 board background is now tiling and scalable 2011-10-10 17:00:15 -04:00
Ali Asaria
20a735d921 add concrete background. 2011-10-10 14:21:57 -04:00
Ali Asaria
a3b0bebc59 disable text selection anywhere in the page
to improve draggability of things without
strange select boxes appearing
2011-09-24 15:55:38 -04:00
Ali Asaria
3f0a706ee1 improve readme formatting 2011-09-24 13:14:17 -04:00
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