Commit Graph

21 Commits

Author SHA1 Message Date
ansuz 3539c71c07 howto maintain your cryptpad instance 2016-03-04 12:14:40 +01:00
ansuz 0327fbc874 Merge branch 'master' of github.com:xwiki-labs/cryptpad
Conflicts:
	.travis.yml
2016-03-04 11:28:27 +01:00
Caleb James DeLisle c87bb2ec2d Merge branch 'patch-1' of https://github.com/monperrus/cryptpad 2016-02-12 11:14:34 +01:00
ansuz 1166bd7e74 spelling and grammar corrections in the README 2016-01-29 11:53:11 +01:00
Martin Monperrus 584c6ce07d updates installation howto 2016-01-14 20:57:33 +01:00
Mohamed Boussaa e9d84981a0 Update readme.md 2015-07-02 13:18:52 +01:00
Caleb James DeLisle 84164123b6 not quite finished 2015-01-30 18:12:20 +01:00
Caleb James DeLisle 3014b85a62 #2 added license 2014-12-05 11:01:43 +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 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 619c01cb7f added new logo 2014-11-06 12:55:43 +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
kpcyrd 8d7c85f287 Move config from server.js into config.js.dist 2014-10-31 17:48:17 +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