Commit Graph

  • 4378df25b8 Merge branch 'css' into soon yflory 2016-10-13 14:26:43 +0200
  • 39bbf8a6c1 Fix the new userlist button and make the toolbar responsive yflory 2016-10-13 14:24:44 +0200
  • 24fbe22c9d Improve the toolbar style and the way the userlist is displayed yflory 2016-10-12 18:40:26 +0200
  • 0fe62f8c75 make wss CSP headers configurable again ansuz 2016-10-12 13:03:36 +0200
  • 40bac1df55 Merge branch 'sandbox-frame' of https://github.com/cjdelisle/cryptpad into csp ansuz 2016-10-12 11:55:51 +0200
  • 1f2e45d6c8 improved fs storage adaptor and config docs ansuz 2016-10-12 10:52:27 +0200
  • 22464af6a5 fix reference to incorrect config flag ansuz 2016-10-12 10:39:46 +0200
  • d2389a5729 Change the userlist in the toolbar yflory 2016-10-11 18:39:43 +0200
  • e739c49e7f Remove the 'about' button in ckeditor yflory 2016-10-11 11:57:07 +0200
  • b23fe783e3 Fix the color picker in Chrome and hide the buttons when not supported yflory 2016-10-10 18:21:18 +0200
  • 91b4446c0b Merge branch 'fix-chrome-style-bug' into soon yflory 2016-10-10 17:07:50 +0200
  • 53fe002d3b Merge branch 'slide' into soon yflory 2016-10-10 17:06:39 +0200
  • 6c04b7967d Remove unused library yflory 2016-10-10 17:03:25 +0200
  • d63c912af0 Use the HTML5 color picker to change the colors in slides yflory 2016-10-10 17:01:04 +0200
  • bb2317d8e6 fix chrome style bug by forcing reload of style sheet ansuz 2016-10-07 17:41:52 +0200
  • 765498e88e Remove the support for old.cryptpad.fr yflory 2016-10-07 10:39:48 +0200
  • d7e170c797 Test colorpicker yflory 2016-10-07 10:31:36 +0200
  • 72fc2e7068 Chuck a few more super-duper-security headers in there Caleb James DeLisle 2016-10-06 23:02:30 +0200
  • f8ac3a6ad3 Fix merge error Caleb James DeLisle 2016-10-06 22:48:30 +0200
  • 83c3f6310a Don't make the codestyle any worse than it is Caleb James DeLisle 2016-10-06 22:44:58 +0200
  • 12cdd1e76b Add a Content Security Policy which works for CryptPad Caleb James DeLisle 2016-10-06 22:37:25 +0200
  • 81fce1237f Colorpicker to choose the background color in present mode Yann Flory 2016-10-06 18:04:35 +0200
  • 5300bc363c Fix a race condition in the slide application yflory 2016-10-05 18:26:32 +0200
  • c322aa440e Fix the username icon hcih was not working anymore yflory 2016-10-05 18:19:52 +0200
  • 8575f3f79f Fix the "rename" feature which was not working anymore in some cases yflory 2016-10-05 17:22:42 +0200
  • a989b51d74 Fix race conditions with Alertify yflory 2016-10-05 16:04:21 +0200
  • 74df38f94f Fix race conditions that could prevent applications from being loaded yflory 2016-10-05 11:19:18 +0200
  • 7d5a33512a enable slide application listing on home page by default ansuz 2016-10-04 17:15:09 +0200
  • a28daf2715 use websocket url configuration api ansuz 2016-10-04 17:13:15 +0200
  • dbc8f01b8b fix merge errors and reach full jshint compliance ansuz 2016-10-04 16:58:10 +0200
  • a30e17121d Merge branch 'readonlyButton' into soon yflory 2016-10-04 15:48:52 +0200
  • e84a54556c Move the toolbar buttons' events handlers in cryptpad-common yflory 2016-10-04 15:44:12 +0200
  • 2ac1b02572 Merge branch 'config-sockets' into soon ansuz 2016-10-04 14:38:50 +0200
  • 61dfca33a3 resolve conflict and merge 'newserver' ansuz 2016-10-04 12:43:14 +0200
  • ee88e96baf merge noscript ansuz 2016-10-04 11:42:06 +0200
  • 11f63c861c Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title ansuz 2016-10-04 11:23:04 +0200
  • e1512a4063 Merge branch 'safe-sockets' into soon ansuz 2016-10-04 10:59:09 +0200
  • 5e76194262 use new config api ansuz 2016-10-03 19:28:36 +0200
  • 0ece2cf6a1 add to default configuration and comment ansuz 2016-10-03 19:28:14 +0200
  • 3dfa19b786 more flexible websocket configuration (WIP) ansuz 2016-10-03 19:19:38 +0200
  • 76fdadee7f Store only the strongest hash in the localstorage yflory 2016-10-03 18:23:59 +0200
  • 1c808b3da8 Add comment for the 'important' css rule yflory 2016-10-03 16:09:59 +0200
  • 17b4f91810 Do not share the title in the doc if it is the default title yflory 2016-10-03 16:05:39 +0200
  • 9fa7da60b9 confirm that a socket is ready to send before sending ansuz 2016-10-03 15:38:42 +0200
  • 0f672f19f5 Merge branch 'slide' into soon yflory 2016-10-03 14:31:58 +0200
  • 391728ee6d Use CodeMirror in /slide #2 yflory 2016-10-03 14:21:39 +0200
  • 8c33218ceb Move the codemirror themes in /common yflory 2016-10-03 14:19:37 +0200
  • 2609af2105 Use the CodeMirror editor in the slide application Yann Flory 2016-09-30 17:39:16 +0200
  • 4b238de84c quieter stdout and stderr logs ansuz 2016-09-30 15:51:23 +0200
  • b5b0eacebc Remove the old (non-bower) codemirror yflory 2016-09-29 16:24:26 +0200
  • 261d2fecbc Get codemirror from bower and use that version in the code app yflory 2016-09-29 16:23:27 +0200
  • bc73fa2074 Merge branch 'fontawesome' into soon yflory 2016-09-29 14:52:48 +0200
  • 921ee128bc deobfuscate email ansuz 2016-09-29 14:46:32 +0200
  • ebae2c3bec Fix the noscript tag yflory 2016-09-29 11:09:06 +0200
  • f03018f3bc Improve the top bar and use the font awesome icons in /code yflory 2016-09-28 15:28:25 +0200
  • 0be8c333e0 Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome ansuz 2016-09-28 09:01:33 +0200
  • 3d54413343 Improve the UI with FontAwesome icons yflory 2016-09-27 18:33:03 +0200
  • f8b65be009 Merge pull request #39 from ochronus/fix-content-type ansuz 2016-09-27 12:19:08 +0200
  • c82abd8780 reverting the style changes Csaba Okrona 2016-09-27 12:17:38 +0200
  • 08064ae035 Using express.static instead of custom handler Csaba Okrona 2016-09-27 11:53:52 +0200
  • a266f0bee1 query parameter for messages ansuz 2016-09-27 11:01:32 +0200
  • 07434eb4c4 Merge branch 'less' yflory 2016-09-26 17:35:51 +0200
  • 1ac94105bb Update the src of customized elements yflory 2016-09-26 17:35:27 +0200
  • 4f5a5251d6 add note about nvm in readme ansuz 2016-09-26 16:14:45 +0200
  • c16e8d603b Enable reconnecting websocket in code pad yflory 2016-09-26 16:06:23 +0200
  • 6315915b5d Merge branch 'newhashNoConflict' into merge-hash ansuz 2016-09-26 13:55:10 +0200
  • 038a986e83 Fix path for file storage on windows Caleb James DeLisle 2016-09-26 12:17:32 +0200
  • d6525087c7 jshint compliancy ansuz 2016-09-23 17:53:24 +0200
  • ed9acf1c00 Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName ansuz 2016-09-23 16:40:07 +0200
  • a4843cb5d7 Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict ansuz 2016-09-23 16:07:46 +0200
  • a82b7aaf8b allow empty names ansuz 2016-09-23 16:06:46 +0200
  • 37c3f12790 Use the new end_of_history message yflory 2016-09-23 15:37:12 +0200
  • 2267ec8c43 Slides in read-only were not updated with the latest content yflory 2016-09-23 15:12:07 +0200
  • eac0cdd6dd Enable read-only mode in slides Yann Flory 2016-09-23 12:26:06 +0200
  • d46bd1af5c Improve the toolbar UI with the username displayed yflory 2016-09-22 17:56:47 +0200
  • 79884e2400 Use the same username for all pads yflory 2016-09-22 17:12:46 +0200
  • 73d5ea967b Fix an error created by the merge yflory 2016-09-22 16:34:06 +0200
  • dde519795d Merge branch 'newhash' into newhashNoConflict yflory 2016-09-22 16:14:48 +0200
  • 99004428d5 Enable the read-only mode in Cryptpoll yflory 2016-09-22 16:09:20 +0200
  • ad32ea2a82 Store the validate key in the history keeper database yflory 2016-09-21 17:24:00 +0200
  • 47e8be1681 Remove the IMPORT button and editor toolbars in read-only mode yflory 2016-09-21 15:03:36 +0200
  • 7cc5218422 Messages are now verified by the users instead of the server yflory 2016-09-21 15:02:50 +0200
  • f6372ee803 add noreferrer attr to blank links as well ansuz 2016-09-21 15:02:08 +0200
  • c50a0ac579 where target=blank, rel=noopener ansuz 2016-09-21 14:49:47 +0200
  • f29e3d7b0d don't let notifications interfere with document titles ansuz 2016-09-21 14:34:56 +0200
  • a9e2ca8d72 make tests green again ansuz 2016-09-20 23:31:29 +0200
  • 83705ae058 Improve the UI in read-only mode yflory 2016-09-20 18:22:40 +0200
  • e6785b4dad push /pad/ state once ready to avoid OT collision ansuz 2016-09-20 16:35:55 +0200
  • 723df4880e Merge branch 'slides' into merge-slides ansuz 2016-09-20 16:28:36 +0200
  • b96f050555 Merge branch 'board' into merge-boards ansuz 2016-09-20 16:26:31 +0200
  • fa8199bc75 don't try to use experimental user code ansuz 2016-09-20 16:22:00 +0200
  • 259896a373 fix translation fragment in English messages file ansuz 2016-09-20 16:21:40 +0200
  • 2d42cadb23 push /code/ state once ready to avoid OT collision ansuz 2016-09-20 15:14:53 +0200
  • bf5dac58dd Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc ansuz 2016-09-20 14:13:35 +0200
  • 202925302e Display a indicator for read-only pads in the main page Yann Flory 2016-09-20 11:59:13 +0200
  • bf8c9a2c4b Add a button to get the read only URL Yann Flory 2016-09-20 11:35:57 +0200
  • 99b50465c7 Add the read-only mode for /pad and /code Yann Flory 2016-09-19 17:52:37 +0200
  • 42f14873cd Merge branch 'translations' into newhashmerge Yann Flory 2016-09-19 14:53:40 +0200
  • 391b7690e6 Set the pad to readonly mode when using a 'view' url Yann Flory 2016-09-19 14:52:36 +0200
  • 138d7e0a25 Merge branch 'translations' ansuz 2016-09-16 21:55:01 +0200