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 |
|
ansuz
|
3380cf0348
|
implement getTotalSize rpc
|
2017-04-07 10:09:59 +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 |
|
ansuz
|
5c292fb1fa
|
jshint compliance
|
2017-04-06 08:32:31 +02:00 |
|
yflory
|
b14d89360d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 19:00:13 +02:00 |
|
yflory
|
8e29e30a35
|
Realtime palette + cursor corresponding to the brush
|
2017-04-05 18:59:58 +02:00 |
|
ansuz
|
8bbbf8e252
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 17:28:11 +02:00 |
|
ansuz
|
64089c5f6b
|
implement pad pinning
|
2017-04-05 17:28:04 +02:00 |
|
yflory
|
d07acc5364
|
Don't redraw the drive if filesData changes while in unsorted
|
2017-04-05 16:08:39 +02:00 |
|
yflory
|
13514dff63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 15:00:10 +02:00 |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
2017-04-05 14:57:07 +02:00 |
|
ansuz
|
6c7cdc90a9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:24:17 +02:00 |
|
ansuz
|
212baeb3a6
|
better cookie schema. expire old sessions
|
2017-04-05 12:24:01 +02:00 |
|
yflory
|
54d271c4e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:04:18 +02:00 |
|
yflory
|
a9777ce560
|
Fix input losing focus in polls with Chrome 57
|
2017-04-05 12:04:01 +02:00 |
|
ansuz
|
3484515283
|
enable more tests
|
2017-04-05 10:44:14 +02:00 |
|