12676 Commits (ff779f6767de83e42ed6659fcabf7e4b5ab57588)
 

Author SHA1 Message Date
ansuz 3217b92bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz b8bf179e3b Merge branch 'docker' of https://github.com/coldfix/cryptpad into staging 8 years ago
yflory f0836f745e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 528deb11da Add missing file for whiteboard 8 years ago
yflory 6a3c1bfe06 Remove chainpad from bower.json dependencies 8 years ago
ansuz cde9ea9887 update footer version 8 years ago
ansuz 2a7793acd8 set a more permissive CSP policy by default. add a note about it 8 years ago
ansuz 8ac0741511 move docker section down 8 years ago
ansuz 05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a14bb1480a progress for implicit pinning 8 years ago
ansuz f82278a25c handle return of undefined hash 8 years ago
yflory d5e69653c0 Select opacity in draw mode in the canvas app 8 years ago
ansuz 1d933be5a6 make reset return the hash, not an array with containing it 8 years ago
yflory f34492be94 Remove duplicates uid in the user list 8 years ago
yflory cfc5d634f4 Merge branch 'templates' into staging 8 years ago
yflory bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 8 years ago
yflory 63a130c678 Add a button to delete the selection in canvas 8 years ago
yflory 33e19d5918 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 126498585e Add a context menu on the ROOT folder in the drive 8 years ago
yflory be1db2a1ec Ability to remove an object when draw mode is off 8 years ago
ansuz 108ab7e9de comment out a style assignment that doesn't seem necessary 8 years ago
ansuz 8c629185e1 cleaner less file 8 years ago
ansuz 0db141e48d rename style files 'whiteboard' instead of main 8 years ago
Thomas Gläßle 2985c6a051 Cleanup Dockerfile, thanks to @kpcyrd 8 years ago
Thomas Gläßle c182a407cf Fix typo in container-start.sh 8 years ago
Thomas Gläßle 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
8 years ago
Thomas Gläßle 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
8 years ago
ansuz 395d8625a8 draw the palette on pad creation 8 years ago
ansuz 3b99c42e22 no more inline styles 8 years ago
ansuz ef821c3e7e integrate @lukevers improvements and clean up js a bit 8 years ago
yflory 84d8615cf1 Save and use templates in pad, code and slides 8 years ago
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled 8 years ago
ansuz a70388284d disable unnecessary messages 8 years ago
ansuz abd87e1322 jshint compliance 8 years ago
ansuz e4b15bc616 implement 'getCanonicalChannelList' 8 years ago
ansuz 09f8e139fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a2f692b9a3 clean up serverside and clientside pinning logic 8 years ago
yflory a13261abaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory dedf2b3c69 Display selected color and button to turn off draw mode in canvas 8 years ago
ansuz fdede0d1fd remove some dead code 8 years ago
ansuz e87992c7ec implement atomic pin reset rpc 8 years ago
ansuz 89bca1606b remove debugging code 8 years ago
ansuz 166e70f628 test new rpc apis 8 years ago
ansuz 2a566671f2 remove outdated rpc example 8 years ago
ansuz 7acf52405d return new hash when pinning a channel 8 years ago
ansuz 3380cf0348 implement getTotalSize rpc 8 years ago
ansuz 2ecabbe6e3 add brown and pink to the palette 8 years ago
ansuz 6e1ffcc18d define better color palette 8 years ago
yflory 84029ac2d7 Fix the color picker in Chromium 53 and improve the cursor 8 years ago
ansuz 5c292fb1fa jshint compliance 8 years ago