Commit graph

135 commits

Author SHA1 Message Date
yflory
cfc5d634f4 Merge branch 'templates' into staging 2017-04-10 14:19:48 +02:00
yflory
bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 2017-04-10 14:19:15 +02:00
yflory
63a130c678 Add a button to delete the selection in canvas 2017-04-10 11:55:39 +02:00
yflory
33e19d5918 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-10 11:44:17 +02:00
yflory
be1db2a1ec Ability to remove an object when draw mode is off 2017-04-10 11:28:41 +02:00
ansuz
108ab7e9de comment out a style assignment that doesn't seem necessary 2017-04-09 11:55:27 +02:00
ansuz
8c629185e1 cleaner less file 2017-04-09 11:49:14 +02:00
ansuz
0db141e48d rename style files 'whiteboard' instead of main 2017-04-09 11:48:01 +02:00
ansuz
395d8625a8 draw the palette on pad creation 2017-04-08 10:44:12 +02:00
ansuz
3b99c42e22 no more inline styles 2017-04-07 22:05:31 +02:00
ansuz
ef821c3e7e integrate @lukevers improvements and clean up js a bit 2017-04-07 19:39:08 +02:00
yflory
a13261abaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-07 14:54:13 +02:00
yflory
dedf2b3c69 Display selected color and button to turn off draw mode in canvas 2017-04-07 14:54:02 +02:00
ansuz
6e1ffcc18d define better color palette 2017-04-06 18:45:40 +02:00
yflory
84029ac2d7 Fix the color picker in Chromium 53 and improve the cursor 2017-04-06 12:38:11 +02:00
yflory
8e29e30a35 Realtime palette + cursor corresponding to the brush 2017-04-05 18:59:58 +02:00
ansuz
4f7e25eeb9 show labels for brush width 2017-04-03 10:43:57 +02:00
ansuz
2a6de5163b jshint compliance 2017-03-31 18:54:50 +02:00
ansuz
1e51f89096 wipe the userdoc when the canvas is cleared 2017-03-31 12:01:52 +02:00
ansuz
e2981c0223 try to make the color picker show the current color 2017-03-31 12:01:30 +02:00
ansuz
96dac80bd5 better color picker in whiteboard 2017-03-31 11:02:59 +02:00
ansuz
b85324a29e jshint compliance 2017-03-31 09:18:57 +02:00
ansuz
73d4fd1700 handle reconnection attempts 2017-03-30 18:52:43 +02:00
ansuz
b07248ad42 prompt with setName if name is unset 2017-03-30 18:52:20 +02:00
ansuz
bca13ad5a5 add notifications to whiteboard 2017-03-29 18:57:46 +02:00
ansuz
76471f7b90 add forget button to whiteboard and handle disconnection better 2017-03-29 18:35:52 +02:00
yflory
72c60ec676 Add background to the whiteboard app 2017-03-27 18:30:48 +02:00
yflory
2732b7aa82 Fix module.onLocal not defined 2017-03-27 18:21:14 +02:00
yflory
4ddf9b4e04 Improve whiteboard UI 2017-03-27 18:12:11 +02:00
yflory
89877baa69 Fix read-only mode in canvas app 2017-03-27 17:15:54 +02:00
yflory
c2cb24c072 Add toolbar to the whiteboard app 2017-03-27 17:08:44 +02:00
ansuz
973aeba0da remove bundled fabric.js 2017-03-27 12:48:54 +02:00
ansuz
6eab52c33d use secure fabric.js 2017-03-27 12:45:39 +02:00
ansuz
ce5dbaeafd use alertify instead of browser prompt 2017-03-27 12:00:21 +02:00
ansuz
dbca94437e rename canvas app to 'whiteboard' 2017-03-23 16:16:00 +01:00