Commit graph

1399 commits

Author SHA1 Message Date
Pierre Bondoerffer
7434dbcb0f
what i have 2017-04-13 15:27:37 +02:00
Pierre Bondoerffer
f11cf8e6ac
move poll styles to separate file 2017-04-13 14:14:12 +02:00
ansuz
5212539a16 move standalone functions from common into their own file 2017-04-12 17:54:44 +02:00
ansuz
7437d6b902 remove unused function 2017-04-12 17:09:42 +02:00
ansuz
4e590a9dd1 remove even more dead code 2017-04-12 16:16:58 +02:00
ansuz
85fcaa9bbc remove more dead code 2017-04-12 16:13:25 +02:00
ansuz
401936a91e move singly-used css file out of /common/ 2017-04-12 16:09:05 +02:00
ansuz
9a46b58c85 deprecate this 90 days after f-release 2017-04-12 16:03:41 +02:00
ansuz
7a59183bb1 pinpad.create should always be async 2017-04-12 16:02:42 +02:00
ansuz
8de3610532 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-12 16:02:09 +02:00
ansuz
9aa0548b1f remove dead cursor code 2017-04-12 15:59:30 +02:00
yflory
4e61b79f9a Clean fileObject 2017-04-11 15:11:33 +02:00
yflory
cde724399c Pin the pads 2017-04-11 14:53:44 +02:00
yflory
74ea2fce5a Fix lint error... 2017-04-10 19:18:46 +02:00
yflory
aa49c97d6e Fix lint error 2017-04-10 19:13:36 +02:00
ansuz
2c8d1b8183 jshint compliance 2017-04-10 19:12:22 +02:00
yflory
f0836f745e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-10 18:25:17 +02:00
yflory
528deb11da Add missing file for whiteboard 2017-04-10 18:25:02 +02:00
ansuz
cde9ea9887 update footer version 2017-04-10 18:09:22 +02:00
ansuz
05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-10 17:42:43 +02:00
ansuz
a14bb1480a progress for implicit pinning 2017-04-10 17:42:35 +02:00
ansuz
f82278a25c handle return of undefined hash 2017-04-10 17:38:25 +02:00
yflory
d5e69653c0 Select opacity in draw mode in the canvas app 2017-04-10 17:03:50 +02:00
ansuz
1d933be5a6 make reset return the hash, not an array with containing it 2017-04-10 15:57:38 +02:00
yflory
f34492be94 Remove duplicates uid in the user list 2017-04-10 15:27:01 +02:00
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
126498585e Add a context menu on the ROOT folder in the drive 2017-04-10 11:44:11 +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
84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
ansuz
bd2034c47b prepare rpc before 'ready' if pinning is enabled 2017-04-07 17:24:25 +02:00
ansuz
a70388284d disable unnecessary messages 2017-04-07 17:21:04 +02:00
ansuz
abd87e1322 jshint compliance 2017-04-07 16:33:14 +02:00
ansuz
e4b15bc616 implement 'getCanonicalChannelList' 2017-04-07 15:52:34 +02:00
ansuz
09f8e139fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-07 15:20:39 +02:00
ansuz
a2f692b9a3 clean up serverside and clientside pinning logic 2017-04-07 15:20:30 +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
fdede0d1fd remove some dead code 2017-04-07 12:18:03 +02:00
ansuz
e87992c7ec implement atomic pin reset rpc 2017-04-07 11:37:19 +02:00
ansuz
166e70f628 test new rpc apis 2017-04-07 10:32:26 +02:00
ansuz
2a566671f2 remove outdated rpc example 2017-04-07 10:31:38 +02:00