dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,134 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

11134 Commits

Author SHA1 Message Date
Caleb James DeLisle 0e44b10aeb Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet 2015-01-30 16:52:23 +01:00
Caleb James DeLisle e039e90a24 upgrade to most recent chainpad 2015-01-30 16:41:01 +01:00
Caleb James DeLisle 8c614f6b25 trap another error which was causing sporadic failures 2015-01-30 16:40:45 +01:00
Caleb James DeLisle c13bfe978a Switched cryptpad to use common/toolbar.js which is shared with cryptsheet 2015-01-30 11:10:51 +01:00
Caleb James DeLisle 50c10f818e Added cryptsheet to cryptpad suite! 2015-01-29 17:55:18 +01:00
Caleb James DeLisle 4a63ba7df3 Give cryptpad a proper main page 2015-01-28 17:58:55 +01:00
Caleb James DeLisle 1cd7c4c063 Fix issue which causes ChainPadServ to abort 2015-01-28 17:58:43 +01:00
Caleb James DeLisle 3014b85a62 #2 added license 2014-12-05 11:01:43 +01:00
Caleb James DeLisle 6687a1d5dc added ability to use https 2014-12-04 10:53:47 +01:00
Caleb James DeLisle f696cfc954 Added the CMA 2014-12-03 01:51:43 +01:00
Caleb James DeLisle 7a89067ecd oh crap, that doesn't work 
Revert "improve the readme a bit"

This reverts commit 1ade911550.
 2014-11-06 13:12:35 +01:00
Caleb James DeLisle 1ade911550 improve the readme a bit 2014-11-06 13:12:07 +01:00
Caleb James DeLisle b56ffe1fc8 tweak the logo *again* 2014-11-06 13:10:16 +01:00
Caleb James DeLisle 8861dda9fb lets try this :) 2014-11-06 13:06:35 +01:00
Caleb James DeLisle 5d021ae808 now fix the logo again 2014-11-06 13:04:39 +01:00
Caleb James DeLisle 652a1da7a4 oops changed some work in the js file 
Revert "change logo"

This reverts commit 9325100a02.
 2014-11-06 13:03:20 +01:00
Caleb James DeLisle 470eee56b9 tweaking logo 2014-11-06 13:02:57 +01:00
Caleb James DeLisle 795b31c314 tweaking logo 2014-11-06 12:58:38 +01:00
Caleb James DeLisle 9325100a02 change logo 2014-11-06 12:56:57 +01:00
Caleb James DeLisle 619c01cb7f added new logo 2014-11-06 12:55:43 +01:00
Caleb James DeLisle 3330fae47e typo 2014-11-04 10:53:49 +01:00
Caleb James DeLisle 8fc732d879 remove the 'magic line' because it causes problems with the realtime 2014-11-04 10:52:15 +01:00
Caleb James DeLisle 0d3ded68a0 use a websocket which automatically reconnects if the connection is lost 2014-11-04 10:51:53 +01:00
Caleb James DeLisle e3a54c11ee remove some code which may be over-engineering 2014-11-03 21:47:54 +01:00
Caleb James DeLisle 2a1f3f9027 show a little spinner which spins when loading and when people type 2014-11-03 21:44:35 +01:00
Caleb James DeLisle 87aa1aaf91 don't start measuring lag until after syncing and update readme 2014-11-03 20:43:43 +01:00
Caleb James DeLisle 6d68bb0bde error when opening error message window D: 2014-11-03 16:16:26 +01:00
Caleb James DeLisle 6cbdcdec65 Show users editing and lag, properly send message to indicate that all users have left channel and show basic error box if disconnected. 2014-11-03 16:07:39 +01:00
Caleb James DeLisle 5ae599fa07 support different ports for websocket and http 2014-11-03 11:13:41 +01:00
kpcyrd 8d7c85f287 Move config from server.js into config.js.dist 2014-10-31 17:48:17 +01:00
Caleb James DeLisle a6b88e276c use the slower version of applyHTMLOp 2014-10-31 17:28:35 +01:00
Caleb James DeLisle b6523adb1f rand fixed 2014-10-31 17:05:09 +01:00
Caleb James DeLisle 1d9ebe8c93 improve readme 2014-10-31 16:44:26 +01:00
Caleb James DeLisle 1508c7ba71 and so it begins 2014-10-31 16:42:58 +01:00