 Caleb James DeLisle
|
72fc2e7068
|
Chuck a few more super-duper-security headers in there
|
2016-10-06 23:02:30 +02:00 |
|
|
Caleb James DeLisle
|
f8ac3a6ad3
|
Fix merge error
|
2016-10-06 22:48:30 +02:00 |
|
|
Caleb James DeLisle
|
83c3f6310a
|
Don't make the codestyle any worse than it is
|
2016-10-06 22:44:58 +02:00 |
|
|
Caleb James DeLisle
|
12cdd1e76b
|
Add a Content Security Policy which works for CryptPad
|
2016-10-06 22:37:25 +02:00 |
|
|
Caleb James DeLisle
|
038a986e83
|
Fix path for file storage on windows
|
2016-09-26 12:17:32 +02:00 |
|
|
Caleb James DeLisle
|
de9f642ccc
|
typo
|
2016-09-13 17:15:19 +02:00 |
|
|
Caleb James DeLisle
|
5fe3ffabd1
|
stop using waitFor.abort() which is apparently not implemented
|
2016-09-13 17:10:50 +02:00 |
|
|
Caleb James DeLisle
|
2021bf6702
|
Improvements to the file storage format
|
2016-09-13 17:03:46 +02:00 |
|
|
Caleb James DeLisle
|
ba4dba24dd
|
If there are no checkpoints, the document fails to sync
|
2016-05-30 12:29:58 +02:00 |
|
|
Caleb James DeLisle
|
da2bfe2de9
|
Added checkpoints with the new code from ChainPad
|
2016-05-26 17:09:02 +02:00 |
|
|
Caleb James DeLisle
|
3b6fe44378
|
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
|
2016-04-26 14:31:57 +02:00 |
|
|
Caleb James DeLisle
|
5f16ad4a58
|
Update to most recent chainpad
|
2016-04-22 18:17:00 +02:00 |
|
|
Caleb James DeLisle
|
2cab588d06
|
Remove the request to SauceLab's broken rest API which seems to explode when you hit it while a job is ongoing
|
2016-04-20 20:37:48 +02:00 |
|
|
Caleb James DeLisle
|
e8eb677b0b
|
debugging on the CI
|
2016-04-20 20:25:30 +02:00 |
|
|
Caleb James DeLisle
|
eadca92e98
|
don't repeat travis calling npm install but do use https for https urls
|
2016-04-20 20:20:29 +02:00 |
|
|
Caleb James DeLisle
|
2d7309b04f
|
minor refactoring and hopefully we will be able to get the actual links to the tests on SauceLabs
|
2016-04-20 20:16:51 +02:00 |
|
|
Caleb James DeLisle
|
8709311a7e
|
Lets try running with multiple types of browsers
|
2016-04-20 19:18:31 +02:00 |
|
|
Caleb James DeLisle
|
2a0b3a007d
|
Added testing and auto-testing with selenium
|
2016-04-20 18:58:02 +02:00 |
|
|
Caleb James DeLisle
|
b16e53505f
|
It's good to say where the target of your copy command is
|
2016-04-20 18:13:55 +02:00 |
|
|
Caleb James DeLisle
|
cf4601281b
|
make .travis.yml look valid
|
2016-04-20 18:10:20 +02:00 |
|
|
Caleb James DeLisle
|
a9fba2cbab
|
Ok lets try some automated testing!
|
2016-04-20 18:08:01 +02:00 |
|
|
Caleb James DeLisle
|
e68dd31a53
|
Fix #19 by adding a lock to level db connector
|
2016-04-20 14:38:41 +02:00 |
|
|
Caleb James DeLisleandYann Flory
|
319f5b95f7
|
Use canonical serializer for json serialization
|
2016-04-13 16:54:34 +02:00 |
|
|
Caleb James DeLisle
|
698338b49a
|
Use canonical serializer for json serialization
|
2016-04-13 16:43:59 +02:00 |
|
|
Caleb James DeLisle
|
8a36963582
|
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
|
2016-04-13 13:51:01 +02:00 |
|
|
Caleb James DeLisle
|
b372b0b77c
|
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
|
2016-03-25 17:35:07 +01:00 |
|
|
Caleb James DeLisle
|
f3fb674504
|
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
|
2016-03-25 16:50:17 +01:00 |
|
|
Caleb James DeLisle
|
98c85cef8b
|
xxx
|
2016-03-25 16:49:27 +01:00 |
|
|
Caleb James DeLisle
|
62eabbc7ae
|
If a message does not match parent hash, don't delete it from storage
|
2016-03-25 15:23:19 +01:00 |
|
|
Caleb James DeLisle
|
dbf31798d5
|
json-ot triggering PARANOIA errors in ChainPad
|
2016-03-25 15:01:17 +01:00 |
|
|
Caleb James DeLisle
|
03932d0169
|
small changes to chainpad for testing
|
2016-03-25 14:52:44 +01:00 |
|
|
Caleb James DeLisle
|
669bcc1935
|
If there is a difference in the hjson then send a message back
|
2016-03-25 14:26:31 +01:00 |
|
|
Caleb James DeLisle
|
f62ec85a4c
|
Shuffled around some assertions and logs
|
2016-03-25 14:14:19 +01:00 |
|
|
Caleb James DeLisle
|
420a7098a6
|
more testing and crap
|
2016-03-25 12:45:51 +01:00 |
|
|
Caleb James DeLisle
|
142d4fad60
|
Merge branch 'master' into netflux
|
2016-03-08 11:43:54 +01:00 |
|
|
Caleb James DeLisle
|
9f682a985b
|
lvl should not fail on non-existant channels
|
2016-03-08 11:43:25 +01:00 |
|
|
Caleb James DeLisle
|
c87bb2ec2d
|
Merge branch 'patch-1' of https://github.com/monperrus/cryptpad
|
2016-02-12 11:14:34 +01:00 |
|
|
Caleb James DeLisle
|
babef5d6ac
|
mv travis.yml ./.travis.yml
|
2016-02-12 10:46:52 +01:00 |
|
|
Caleb James DeLisle
|
591323a62e
|
travis.yml
|
2016-02-12 10:46:10 +01:00 |
|
|
Caleb James DeLisle
|
ff6e1e6fc0
|
Added travisci branch diffdom
|
2016-02-12 10:43:33 +01:00 |
|
|
Caleb James DeLisle
|
778ef85fee
|
Added travis.yml
|
2016-02-12 10:41:42 +01:00 |
|
|
Caleb James DeLisle
|
ad1c7edc31
|
Added travis.yml
|
2016-02-12 10:38:47 +01:00 |
|
|
Caleb James DeLisle
|
d5125f875d
|
Added jshint
|
2016-02-12 10:33:09 +01:00 |
|
|
Caleb James DeLisle
|
7553ccff68
|
Remove a log line which was leftover after debugging
|
2016-02-12 08:24:46 +01:00 |
|
|
Caleb James DeLisle
|
13360c335b
|
I'm an idiot - killer off-by-one ate the storage
|
2016-02-11 16:55:26 +01:00 |
|
|
Caleb James DeLisle
|
943a291903
|
Do not blow up if the error is that a chain cannot be found
|
2016-02-11 16:42:21 +01:00 |
|
|
Caleb James DeLisle
|
a7da21ccba
|
Remove the cursor treatment
|
2016-02-11 16:22:59 +01:00 |
|
|
Caleb James DeLisle
|
86c4a69a97
|
Switch to patching with DiffDOM for testing :D
|
2016-02-11 16:10:44 +01:00 |
|
|
Caleb James DeLisle
|
2031191261
|
testing=false
|
2016-02-11 13:13:58 +01:00 |
|
|
Caleb James DeLisle
|
37db31b09e
|
Attempt an operational transformation and if the result is not valid JSON then fail
|
2016-02-11 12:34:06 +01:00 |
|
|
Caleb James DeLisle
|
e16299b5c4
|
Revert "restub OT until it's verified"
This reverts commit 350c9e6c76.
|
2016-02-11 12:33:12 +01:00 |
|
|
Caleb James DeLisle
|
dff8143fad
|
Fix the lvl storage
|
2016-02-11 12:28:05 +01:00 |
|
|
Caleb James DeLisle
|
05ce2695b2
|
Added piwik code for cryptpad.fr
|
2015-07-17 16:25:57 +02:00 |
|
|
Caleb James DeLisle
|
7967631277
|
Make a slightly nicer version of the XWiki Labs Project badge
|
2015-07-16 15:53:36 +02:00 |
|
|
Caleb James DeLisle
|
21503838ca
|
Revert "Add the <An XWiki labs project> badge to cryptpad.fr"
This reverts commit be10da95bb.
|
2015-07-16 15:52:02 +02:00 |
|
|
Caleb James DeLisle
|
b6aaca95b9
|
Revert "Add the <An XWiki labs project> badge to cryptpad.fr"
This reverts commit 2241261ae2.
|
2015-07-16 15:51:44 +02:00 |
|
|
Caleb James DeLisle
|
71b912e5d9
|
Merge pull request #10 from mouhb/master
Add the <An XWiki labs project> badge to cryptpad.fr
|
2015-07-16 15:36:32 +02:00 |
|
|
Caleb James DeLisle
|
afd5ffa252
|
Merge pull request #9 from mouhb/master
Add the <An XWiki labs project> badge to cryptpad.fr
|
2015-07-16 14:03:27 +02:00 |
|
|
Caleb James DeLisle
|
1f84e0fe6b
|
typo
|
2015-02-02 18:02:11 +01:00 |
|
|
Caleb James DeLisle
|
bbcfde476e
|
Harden ChainPadServ
|
2015-02-02 17:53:22 +01:00 |
|
|
Caleb James DeLisle
|
88fb6772e8
|
Cleaned up the front page and added a little piece of code to show recent pads
|
2015-02-02 17:53:10 +01:00 |
|
|
Caleb James DeLisle
|
51544db9a2
|
Completed adding of customization system and bottom infobar
|
2015-02-02 16:01:33 +01:00 |
|
|
Caleb James DeLisle
|
84164123b6
|
not quite finished
|
2015-01-30 18:12:20 +01:00 |
|
|
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 |
|
|
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 |
|