web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 4e61b79f9a Clean fileObject yflory 2017-04-11 15:11:33 +02:00
  • cde724399c Pin the pads yflory 2017-04-11 14:53:44 +02:00
  • b3867429ee bump cryptpad version ansuz 2017-04-10 19:18:49 +02:00
  • 74ea2fce5a Fix lint error... yflory 2017-04-10 19:18:46 +02:00
  • aa49c97d6e Fix lint error yflory 2017-04-10 19:13:36 +02:00
  • 2c8d1b8183 jshint compliance ansuz 2017-04-10 19:12:22 +02:00
  • 3217b92bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-10 18:45:43 +02:00
  • b8bf179e3b Merge branch 'docker' of https://github.com/coldfix/cryptpad into staging ansuz 2017-04-10 18:45:30 +02:00
  • f0836f745e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-04-10 18:25:17 +02:00
  • 528deb11da Add missing file for whiteboard yflory 2017-04-10 18:25:02 +02:00
  • 6a3c1bfe06 Remove chainpad from bower.json dependencies yflory 2017-04-10 18:24:05 +02:00
  • cde9ea9887 update footer version ansuz 2017-04-10 18:09:22 +02:00
  • 2a7793acd8 set a more permissive CSP policy by default. add a note about it ansuz 2017-04-10 18:08:01 +02:00
  • 8ac0741511 move docker section down ansuz 2017-04-10 18:07:32 +02:00
  • 05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-10 17:42:43 +02:00
  • a14bb1480a progress for implicit pinning ansuz 2017-04-10 17:42:35 +02:00
  • f82278a25c handle return of undefined hash ansuz 2017-04-10 17:38:25 +02:00
  • d5e69653c0 Select opacity in draw mode in the canvas app yflory 2017-04-10 17:03:50 +02:00
  • 1d933be5a6 make reset return the hash, not an array with containing it ansuz 2017-04-10 15:57:38 +02:00
  • f34492be94 Remove duplicates uid in the user list yflory 2017-04-10 15:27:01 +02:00
  • cfc5d634f4 Merge branch 'templates' into staging yflory 2017-04-10 14:19:48 +02:00
  • bd16e0f0e7 Templates in polls and canvas, and ability to disable templates yflory 2017-04-10 14:19:15 +02:00
  • 63a130c678 Add a button to delete the selection in canvas yflory 2017-04-10 11:55:39 +02:00
  • 33e19d5918 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-04-10 11:44:17 +02:00
  • 126498585e Add a context menu on the ROOT folder in the drive yflory 2017-04-10 11:44:11 +02:00
  • be1db2a1ec Ability to remove an object when draw mode is off yflory 2017-04-10 11:28:41 +02:00
  • 108ab7e9de comment out a style assignment that doesn't seem necessary ansuz 2017-04-09 11:55:27 +02:00
  • 8c629185e1 cleaner less file ansuz 2017-04-09 11:49:14 +02:00
  • 0db141e48d rename style files 'whiteboard' instead of main ansuz 2017-04-09 11:48:01 +02:00
  • 2985c6a051 Cleanup Dockerfile, thanks to @kpcyrd Thomas Gläßle 2017-04-09 11:36:33 +02:00
  • c182a407cf Fix typo in container-start.sh Thomas Gläßle 2017-04-08 22:08:38 +02:00
  • 074f27237f Improve docker-related documentation Thomas Gläßle 2017-04-08 12:40:54 +02:00
  • bb256b8027 Fix startup bug due to old node version Thomas Gläßle 2017-04-08 12:28:19 +02:00
  • 395d8625a8 draw the palette on pad creation ansuz 2017-04-08 10:44:12 +02:00
  • 3b99c42e22 no more inline styles ansuz 2017-04-07 22:05:31 +02:00
  • ef821c3e7e integrate @lukevers improvements and clean up js a bit ansuz 2017-04-07 19:39:08 +02:00
  • 84d8615cf1 Save and use templates in pad, code and slides yflory 2017-04-07 18:20:03 +02:00
  • bd2034c47b prepare rpc before 'ready' if pinning is enabled ansuz 2017-04-07 17:24:25 +02:00
  • a70388284d disable unnecessary messages ansuz 2017-04-07 17:21:04 +02:00
  • abd87e1322 jshint compliance ansuz 2017-04-07 16:33:14 +02:00
  • e4b15bc616 implement 'getCanonicalChannelList' ansuz 2017-04-07 15:52:34 +02:00
  • 09f8e139fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-07 15:20:39 +02:00
  • a2f692b9a3 clean up serverside and clientside pinning logic ansuz 2017-04-07 15:20:30 +02:00
  • a13261abaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-04-07 14:54:13 +02:00
  • dedf2b3c69 Display selected color and button to turn off draw mode in canvas yflory 2017-04-07 14:54:02 +02:00
  • fdede0d1fd remove some dead code ansuz 2017-04-07 12:17:40 +02:00
  • e87992c7ec implement atomic pin reset rpc ansuz 2017-04-07 11:37:19 +02:00
  • 89bca1606b remove debugging code ansuz 2017-04-07 10:34:03 +02:00
  • 166e70f628 test new rpc apis ansuz 2017-04-07 10:32:26 +02:00
  • 2a566671f2 remove outdated rpc example ansuz 2017-04-07 10:31:38 +02:00
  • 7acf52405d return new hash when pinning a channel ansuz 2017-04-07 10:30:40 +02:00
  • 3380cf0348 implement getTotalSize rpc ansuz 2017-04-07 10:09:59 +02:00
  • 2ecabbe6e3 add brown and pink to the palette ansuz 2017-04-06 19:05:06 +02:00
  • 6e1ffcc18d define better color palette ansuz 2017-04-06 18:45:40 +02:00
  • 84029ac2d7 Fix the color picker in Chromium 53 and improve the cursor yflory 2017-04-06 12:38:11 +02:00
  • 5c292fb1fa jshint compliance ansuz 2017-04-06 08:32:31 +02:00
  • b14d89360d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-04-05 19:00:13 +02:00
  • 8e29e30a35 Realtime palette + cursor corresponding to the brush yflory 2017-04-05 18:59:58 +02:00
  • 8bbbf8e252 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-05 17:28:11 +02:00
  • 64089c5f6b implement pad pinning ansuz 2017-04-05 17:28:04 +02:00
  • d07acc5364 Don't redraw the drive if filesData changes while in unsorted yflory 2017-04-05 16:08:39 +02:00
  • 13514dff63 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-04-05 15:00:10 +02:00
  • 46a5eee597 Display the spinner in the toolbar for local changes yflory 2017-04-05 14:57:07 +02:00
  • 6c7cdc90a9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-05 12:24:17 +02:00
  • 212baeb3a6 better cookie schema. expire old sessions ansuz 2017-04-05 12:24:01 +02:00
  • 54d271c4e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-04-05 12:04:18 +02:00
  • a9777ce560 Fix input losing focus in polls with Chrome 57 yflory 2017-04-05 12:04:01 +02:00
  • 3484515283 enable more tests ansuz 2017-04-05 10:44:14 +02:00
  • 3e47b8a38d remove dead code ansuz 2017-04-05 10:42:24 +02:00
  • fe7f7f4e6d Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging ansuz 2017-04-05 10:36:23 +02:00
  • 31b178a306 use pinpad api ansuz 2017-04-04 12:25:34 +02:00
  • 182dbfc874 implement pinning logic in pinpad.js ansuz 2017-04-04 12:13:31 +02:00
  • 90612bc5ba Update messages.pt-br.js Gustavo H M Silva 2017-04-03 18:43:30 -03:00
  • a5e5ddae08 rpc all the things ansuz 2017-04-03 19:24:57 +02:00
  • 4f7e25eeb9 show labels for brush width ansuz 2017-04-03 10:43:57 +02:00
  • 2a6de5163b jshint compliance ansuz 2017-03-31 18:54:50 +02:00
  • 04069cc7f4 fix font size ansuz 2017-03-31 13:28:30 +02:00
  • 1e51f89096 wipe the userdoc when the canvas is cleared ansuz 2017-03-31 12:01:52 +02:00
  • e2981c0223 try to make the color picker show the current color ansuz 2017-03-31 12:01:30 +02:00
  • 96dac80bd5 better color picker in whiteboard ansuz 2017-03-31 11:02:59 +02:00
  • bd07b3a80f less cramped styling on text inputs on /settings/ ansuz 2017-03-31 09:36:22 +02:00
  • 6e9968f989 add 'lol' code theme ansuz 2017-03-31 09:19:45 +02:00
  • b85324a29e jshint compliance ansuz 2017-03-31 09:18:57 +02:00
  • 73d4fd1700 handle reconnection attempts ansuz 2017-03-30 18:52:43 +02:00
  • b07248ad42 prompt with setName if name is unset ansuz 2017-03-30 18:52:05 +02:00
  • 5a85e4464c fix poor visibility on green pencils ansuz 2017-03-30 18:05:08 +02:00
  • 9b4b642d4a protect against subtly corrupted user objects ansuz 2017-03-30 17:19:49 +02:00
  • 7908f3b4f0 make sure green UI elements use the same green ansuz 2017-03-30 15:50:06 +02:00
  • 18469edf18 extend list item rendering to support gfm task lists ansuz 2017-03-30 12:02:31 +02:00
  • 055bc03092 strip carriage return ansuz 2017-03-30 12:00:46 +02:00
  • 74c322bad5 add example nginx conf ansuz 2017-03-30 11:43:20 +02:00
  • 36b02d71f5 add ckeditor indentblock plugin. ansuz 2017-03-30 10:55:22 +02:00
  • bca13ad5a5 add notifications to whiteboard ansuz 2017-03-29 18:57:46 +02:00
  • 233bb7a14f reorganize some html tags for smaller diffs ansuz 2017-03-29 18:38:06 +02:00
  • 76471f7b90 add forget button to whiteboard and handle disconnection better ansuz 2017-03-29 18:35:52 +02:00
  • d4ce3dc6b9 don't rewrite css rules. FOUC is too long ansuz 2017-03-29 16:02:04 +02:00
  • 3cfd0a4326 commit some garbage ansuz 2017-03-29 15:40:34 +02:00
  • 364dae2882 update templated html ansuz 2017-03-29 12:56:08 +02:00
  • ed89a13fe6 progress on adding version string to some css ansuz 2017-03-29 12:55:36 +02:00
  • 4d5baa717d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-03-29 11:56:13 +02:00