f0836f745e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-10 18:25:17 +02:00
528deb11da
Add missing file for whiteboard
2017-04-10 18:25:02 +02:00
6a3c1bfe06
Remove chainpad from bower.json dependencies
2017-04-10 18:24:05 +02:00
cde9ea9887
update footer version
2017-04-10 18:09:22 +02:00
2a7793acd8
set a more permissive CSP policy by default. add a note about it
2017-04-10 18:08:01 +02:00
8ac0741511
move docker section down
2017-04-10 18:07:32 +02:00
05a50b1f4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-10 17:42:43 +02:00
a14bb1480a
progress for implicit pinning
2017-04-10 17:42:35 +02:00
f82278a25c
handle return of undefined hash
2017-04-10 17:38:25 +02:00
d5e69653c0
Select opacity in draw mode in the canvas app
2017-04-10 17:03:50 +02:00
1d933be5a6
make reset return the hash, not an array with containing it
2017-04-10 15:57:38 +02:00
f34492be94
Remove duplicates uid in the user list
2017-04-10 15:27:01 +02:00
cfc5d634f4
Merge branch 'templates' into staging
2017-04-10 14:19:48 +02:00
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
2017-04-10 14:19:15 +02:00
63a130c678
Add a button to delete the selection in canvas
2017-04-10 11:55:39 +02:00
33e19d5918
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-10 11:44:17 +02:00
126498585e
Add a context menu on the ROOT folder in the drive
2017-04-10 11:44:11 +02:00
be1db2a1ec
Ability to remove an object when draw mode is off
2017-04-10 11:28:41 +02:00
108ab7e9de
comment out a style assignment that doesn't seem necessary
2017-04-09 11:55:27 +02:00
8c629185e1
cleaner less file
2017-04-09 11:49:14 +02:00
0db141e48d
rename style files 'whiteboard' instead of main
2017-04-09 11:48:01 +02:00
2985c6a051
Cleanup Dockerfile, thanks to @kpcyrd
2017-04-09 11:38:37 +02:00
c182a407cf
Fix typo in container-start.sh
2017-04-08 22:08:38 +02:00
074f27237f
Improve docker-related documentation
...
- install/usage should be at the top, it's the most relevant info for typical users
- docker call was missing `run` argument
- added `--restart=always` to run it as a service
- change default data directory. I think it's bad advice keeping data
cluttered all over your file-system in some git repositories that one
may want to delete later on
2017-04-08 22:07:57 +02:00
bb256b8027
Fix startup bug due to old node version
...
Solution as suggested by @kpcyrd.
Fixed behaviour:
$ docker logs <CONTAINER>
/cryptpad/server.js:44
for (let header in h) { res.setHeader(header, h[header]); }
^^^
SyntaxError: Block-scoped declarations (let, const, function, class) not yet supported outside strict mode
at exports.runInThisContext (vm.js:53:16)
at Module._compile (module.js:374:25)
at Object.Module._extensions..js (module.js:417:10)
at Module.load (module.js:344:32)
at Function.Module._load (module.js:301:12)
at Function.Module.runMain (module.js:442:10)
at startup (node.js:136:18)
at node.js:966:3
2017-04-08 22:07:47 +02:00
395d8625a8
draw the palette on pad creation
2017-04-08 10:44:12 +02:00
3b99c42e22
no more inline styles
2017-04-07 22:05:31 +02:00
ef821c3e7e
integrate @lukevers improvements and clean up js a bit
2017-04-07 19:39:08 +02:00
84d8615cf1
Save and use templates in pad, code and slides
2017-04-07 18:20:03 +02:00
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
2017-04-07 17:24:25 +02:00
a70388284d
disable unnecessary messages
2017-04-07 17:21:04 +02:00
abd87e1322
jshint compliance
2017-04-07 16:33:14 +02:00
e4b15bc616
implement 'getCanonicalChannelList'
2017-04-07 15:52:34 +02:00
09f8e139fe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-07 15:20:39 +02:00
a2f692b9a3
clean up serverside and clientside pinning logic
2017-04-07 15:20:30 +02:00
a13261abaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-07 14:54:13 +02:00
dedf2b3c69
Display selected color and button to turn off draw mode in canvas
2017-04-07 14:54:02 +02:00
fdede0d1fd
remove some dead code
2017-04-07 12:18:03 +02:00
e87992c7ec
implement atomic pin reset rpc
2017-04-07 11:37:19 +02:00
89bca1606b
remove debugging code
2017-04-07 10:34:03 +02:00
166e70f628
test new rpc apis
2017-04-07 10:32:26 +02:00
2a566671f2
remove outdated rpc example
2017-04-07 10:31:38 +02:00
7acf52405d
return new hash when pinning a channel
2017-04-07 10:30:40 +02:00
3380cf0348
implement getTotalSize rpc
2017-04-07 10:09:59 +02:00
2ecabbe6e3
add brown and pink to the palette
2017-04-06 19:05:06 +02:00
6e1ffcc18d
define better color palette
2017-04-06 18:45:40 +02:00
84029ac2d7
Fix the color picker in Chromium 53 and improve the cursor
2017-04-06 12:38:11 +02:00
5c292fb1fa
jshint compliance
2017-04-06 08:32:31 +02:00
b14d89360d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 19:00:13 +02:00
8e29e30a35
Realtime palette + cursor corresponding to the brush
2017-04-05 18:59:58 +02:00
yflory