Commit Graph

3056 Commits (39fd0d0f5f776ff2d889db7718d3001627d65719)

Author SHA1 Message Date
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
Thomas Gläßle 2985c6a051 Cleanup Dockerfile, thanks to @kpcyrd 2017-04-09 11:38:37 +02:00
Thomas Gläßle c182a407cf Fix typo in container-start.sh 2017-04-08 22:08:38 +02:00
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
2017-04-08 22:07:57 +02:00
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
2017-04-08 22:07:47 +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 89bca1606b remove debugging code 2017-04-07 10:34:03 +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 7acf52405d return new hash when pinning a channel 2017-04-07 10:30:40 +02:00
ansuz 3380cf0348 implement getTotalSize rpc 2017-04-07 10:09:59 +02:00
ansuz 2ecabbe6e3 add brown and pink to the palette 2017-04-06 19:05:06 +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
ansuz 3e47b8a38d remove dead code 2017-04-05 10:42:24 +02:00
ansuz fe7f7f4e6d Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging 2017-04-05 10:36:23 +02:00
ansuz 31b178a306 use pinpad api 2017-04-04 12:25:34 +02:00
ansuz 182dbfc874 implement pinning logic in pinpad.js 2017-04-04 12:13:31 +02:00
Gustavo H M Silva 90612bc5ba Update messages.pt-br.js 2017-04-03 18:43:30 -03:00
ansuz a5e5ddae08 rpc all the things 2017-04-03 19:24:57 +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