 Caleb James DeLisle
|
e78cc4ce7e
|
manual merge
|
2018-02-06 11:41:57 +01:00 |
|
|
Caleb James DeLisle
|
cac5e75a99
|
Add a repl to improve debugging on the prod server
|
2018-02-06 11:35:24 +01:00 |
|
|
Caleb James DeLisle
|
a3a739e504
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 18:54:57 +01:00 |
|
|
Caleb James DeLisle
|
b63d1527a0
|
Small bit of better logging
|
2018-01-23 18:54:52 +01:00 |
|
|
Caleb James DeLisle
|
4de6bd6195
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 16:32:05 +01:00 |
|
|
Caleb James DeLisle
|
014aacc76a
|
Added a new RPC to get file offsets of messages by hash or of last 2 checkpoints, also improved checking of valid channel names and fixed a pull-stream bug and exposed async-store to the window
|
2018-01-23 16:31:59 +01:00 |
|
|
Caleb James DeLisle
|
1f34e47cbf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 14:15:44 +01:00 |
|
|
Caleb James DeLisle
|
b3a873bbc9
|
Fix flow
|
2018-01-23 14:15:38 +01:00 |
|
|
Caleb James DeLisle
|
88f3e730b9
|
Update package.json and sync file.js
|
2018-01-23 12:18:08 +01:00 |
|
|
Caleb James DeLisle
|
79fa732128
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-16 11:53:41 +01:00 |
|
|
Caleb James DeLisle
|
137c6428e8
|
Introducing heapdump to allow collecting more data from the server
|
2018-01-16 11:53:23 +01:00 |
|
|
Caleb James DeLisle
|
f3167964f4
|
In case there is an error parsing one of the messages in a file, catch rather than blowing up
|
2018-01-16 11:51:09 +01:00 |
|
|
Caleb James DeLisle
|
edeb1e25d3
|
Bad solution to a bad problem
|
2018-01-15 13:55:52 +01:00 |
|
|
Caleb James DeLisle
|
cd26a4c093
|
Added a test of /login/
|
2018-01-11 18:11:06 +01:00 |
|
|
Caleb James DeLisle
|
69aee6c21b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 17:09:06 +01:00 |
|
|
Caleb James DeLisle
|
378322a521
|
Don't finish the test until ChainPad settles, trying to eliminate a flicker
|
2018-01-11 17:08:47 +01:00 |
|
|
Caleb James DeLisle
|
2c9e21b2de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 16:07:10 +01:00 |
|
|
Caleb James DeLisle
|
a8e0cf2ed0
|
We should remove datastore between tests
|
2018-01-11 16:06:58 +01:00 |
|
|
Caleb James DeLisle
|
dc376fdb1c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 15:58:16 +01:00 |
|
|
Caleb James DeLisle
|
4808c8b374
|
Fixed poll which was not working with automated testing
|
2018-01-11 15:57:09 +01:00 |
|
|
Caleb James DeLisle
|
151d33db18
|
Added testing of /poll/ :D
|
2018-01-11 15:45:12 +01:00 |
|
|
Caleb James DeLisle
|
864e24b2ce
|
Fixed typo in test
|
2018-01-10 11:42:48 +01:00 |
|
|
Caleb James DeLisle
|
590e77aafa
|
lint, missing semicolon
|
2017-12-21 11:15:21 +01:00 |
|
|
Caleb James DeLisle
|
f81cfb178b
|
Turn off display after testing
|
2017-12-21 11:06:53 +01:00 |
|
|
Caleb James DeLisle
|
81de5d861c
|
Caffeinate mac machines before starting the tests
|
2017-12-21 10:58:36 +01:00 |
|
|
Caleb James DeLisle
|
4117eb71cc
|
Report the number of tests
|
2017-12-21 10:40:48 +01:00 |
|
|
Caleb James DeLisle
|
c928be028a
|
Upgrade the testing framework to allow multiple tests
|
2017-12-20 18:36:53 +01:00 |
|
|
Caleb James DeLisle
|
d54a010bf4
|
Also kill stray running servers
|
2017-12-20 17:58:10 +01:00 |
|
|
Caleb James DeLisle
|
571f0307dc
|
Also kill firefox before running tests
|
2017-12-20 17:50:41 +01:00 |
|
|
Caleb James DeLisle
|
fa3a536f34
|
Also kill off extraneous safari instances
|
2017-12-19 19:36:17 +01:00 |
|
|
Caleb James DeLisle
|
7fce5fe2d7
|
typo
|
2017-12-19 19:33:49 +01:00 |
|
|
Caleb James DeLisle
|
00a791f182
|
Attempt to shutdown chrome before starting a build
|
2017-12-19 19:30:58 +01:00 |
|
|
Caleb James DeLisle
|
37dcf7285a
|
Need to be exactly true, not just truthy
|
2017-12-19 19:16:53 +01:00 |
|
|
Caleb James DeLisle
|
5ae4f1bb41
|
Fake change in order to trigger a build...
|
2017-12-19 19:13:14 +01:00 |
|
|
Caleb James DeLisle
|
dc7dbb3e96
|
Accidentally made a test which hangs...
|
2017-12-19 19:09:48 +01:00 |
|
|
Caleb James DeLisle
|
cbd7351d53
|
Improved logging if there's a non-empty-newdoc
|
2017-12-19 19:08:01 +01:00 |
|
|
Caleb James DeLisle
|
d9323cc458
|
stubbed a failing test
|
2017-12-19 19:01:02 +01:00 |
|
|
Caleb James DeLisle
|
bd6cb98c1e
|
e is an error and not a string, stops stack traces in the server log
|
2017-12-19 18:32:53 +01:00 |
|
|
Caleb James DeLisle
|
beaf391122
|
fix jshint for runtests.js
|
2017-12-19 18:23:26 +01:00 |
|
|
Caleb James DeLisle
|
fe0030a0d6
|
Fixed race condtion causing server to occasionally fail to start up
|
2017-12-19 18:21:29 +01:00 |
|
|
Caleb James DeLisle
|
ff0e4bfe86
|
Added a test runner for automated testing
|
2017-12-19 16:23:06 +01:00 |
|
|
Caleb James DeLisle
|
3c0806659b
|
Better logging if we trigger the doc emptystring issue
|
2017-12-18 18:28:48 +01:00 |
|
|
Caleb James DeLisle
|
7842c730a4
|
support for testing on safari
|
2017-12-18 15:15:41 +01:00 |
|
|
Caleb James DeLisle
|
e587e9cd57
|
allow specifying the browser in selenium
|
2017-12-18 11:39:59 +01:00 |
|
|
Caleb James DeLisle
|
6a2d79249d
|
Added some nice testing
|
2017-12-15 16:09:30 +01:00 |
|
|
Caleb James DeLisle
|
bb548b3428
|
Merge branch 'staging' into better-testing
|
2017-12-15 10:29:28 +01:00 |
|
|
Caleb James DeLisle
|
6ac4fa4689
|
wip
|
2017-12-14 11:34:44 +01:00 |
|
|
Caleb James DeLisle
|
9b6f3b3162
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-12 14:54:28 +01:00 |
|
|
Caleb James DeLisle
|
d486a2308c
|
see if this works....
|
2017-12-12 14:54:12 +01:00 |
|
|
Caleb James DeLisle
|
e8a0b4784d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-12 14:50:23 +01:00 |
|
|
Caleb James DeLisle
|
e82e32d273
|
Remove saucelabs because it's broken
|
2017-12-12 14:50:09 +01:00 |
|
|
Caleb James DeLisle
|
15ccf7e54d
|
try to fix saucelabs
|
2017-12-12 14:39:03 +01:00 |
|
|
Caleb James DeLisle
|
8582f92892
|
Attempt to handle the possible scenario where we are overwriting an existing pad with the initial content.
|
2017-12-12 14:30:10 +01:00 |
|
|
Caleb James DeLisle
|
0aae61f72e
|
Anonymous RPC GET_FILE_SIZE does not work correctly unless at least one authenticated RPC has been called first. Also RPC failures (throw error) are silent in the logs
|
2017-12-12 14:18:48 +01:00 |
|
|
Caleb James DeLisle
|
024aa741a7
|
Added all of the filters to the lesshint rc (all explicitly enabled or disabled) and made empty line at end of file compliant
|
2017-12-08 19:12:34 +01:00 |
|
|
Caleb James DeLisle
|
1d2119b292
|
Removed LESS duplicate attributes
|
2017-12-08 18:13:35 +01:00 |
|
|
Caleb James DeLisle
|
bfba239770
|
Fixed missing semicolons in less
|
2017-12-08 17:35:28 +01:00 |
|
|
Caleb James DeLisle
|
9af941741d
|
Fix trailing whitespace and empty selectors in less
|
2017-12-08 17:30:45 +01:00 |
|
|
Caleb James DeLisle
|
62c5bbd9b6
|
Fix flow, which tries reading random .json files, including test files which are invalid json :D
|
2017-12-08 16:37:33 +01:00 |
|
|
Caleb James DeLisle
|
eb24fcae0d
|
Added lesshint and exempted everything which is currently being violated
|
2017-12-08 16:25:57 +01:00 |
|
|
Caleb James DeLisle
|
dd44b4da99
|
Removed old /less/ directory which is nolonger used :)
|
2017-12-08 14:56:13 +01:00 |
|
|
Caleb James DeLisle
|
7a09bf43eb
|
Fix a truly silly mistake in rpc.js and make the pad-not-pinned message get removed if a registered user joins
|
2017-12-08 14:46:32 +01:00 |
|
|
Caleb James DeLisle
|
008b2cc67e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-08 14:01:02 +01:00 |
|
|
Caleb James DeLisle
|
12b0f3e201
|
Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window
|
2017-12-08 14:00:53 +01:00 |
|
|
Caleb James DeLisle
|
617c4b6044
|
CSS refactorings and pad-is-not-pinned work
|
2017-12-07 19:00:13 +01:00 |
|
|
Caleb James DeLisle
|
67f8031beb
|
Wrong usage of colortheme.less, fixed
|
2017-12-07 14:57:24 +01:00 |
|
|
Caleb James DeLisle
|
ba74f9d37a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-05 18:32:29 +01:00 |
|
|
Caleb James DeLisle
|
1dabea84d9
|
Overrides to colortheme.less will nolonger block the adding of new keys to the original file
|
2017-12-05 18:32:23 +01:00 |
|
|
Caleb James DeLisle
|
c702a23c77
|
Initial work on the 'pad will expire' logic
|
2017-12-05 17:48:30 +01:00 |
|
|
Caleb James DeLisle
|
7544bb1ced
|
Fix a few issues with RPC which I managed to verschlumbesserung
|
2017-11-30 18:48:19 +01:00 |
|
|
Caleb James DeLisle
|
7c8572c99d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-30 18:32:27 +01:00 |
|
|
Caleb James DeLisle
|
5187b3f26c
|
Flow compliance and fix a few bugs in rpc.js
|
2017-11-30 18:32:20 +01:00 |
|
|
Caleb James DeLisle
|
50da6b3b2e
|
Needs to be handled in chainpad-listmap
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"
This reverts commit eaa7b6e8e5.
|
2017-11-11 01:34:20 +01:00 |
|
|
Caleb James DeLisle
|
eaa7b6e8e5
|
Do content checks on the drive so if it gets corrupted, the patch will be rejected
|
2017-11-11 01:26:54 +01:00 |
|
|
Caleb James DeLisle
|
ac66511f0a
|
Merge branch 'staging' into new-diff
|
2017-11-09 17:44:45 +01:00 |
|
|
Caleb James DeLisle
|
7b62a8042e
|
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
|
2017-11-09 17:07:04 +01:00 |
|
|
Caleb James DeLisle
|
840cd91bcb
|
manual merge
|
2017-11-09 15:38:32 +01:00 |
|
|
Caleb James DeLisle
|
75130150d5
|
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
|
2017-11-09 15:36:49 +01:00 |
|
|
Caleb James DeLisle
|
027b9fa383
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 18:03:31 +03:00 |
|
|
Caleb James DeLisle
|
aa37997aa3
|
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
|
2017-10-24 18:02:03 +03:00 |
|
|
Caleb James DeLisle
|
9b02b36724
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 14:22:54 +03:00 |
|
|
Caleb James DeLisle
|
d7e9498143
|
Fix and then disable the new OT
|
2017-10-23 14:22:33 +03:00 |
|
|
Caleb James DeLisle
|
cc6b2192e4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-20 10:26:27 +03:00 |
|
|
Caleb James DeLisle
|
81d0b3272d
|
Fix multiple infinite-spinner errors piling up on top of eachother
|
2017-10-18 14:49:50 +03:00 |
|
|
Caleb James DeLisle
|
9e4c48f537
|
lint errors
|
2017-10-18 12:25:13 +03:00 |
|
|
Caleb James DeLisle
|
a149152f11
|
Merge branch 'staging' into framework
|
2017-10-18 11:42:31 +03:00 |
|
|
Caleb James DeLisle
|
15337603bb
|
Merge branch 'staging' into framework
|
2017-10-13 13:41:24 +03:00 |
|
|
Caleb James DeLisle
|
a6b34491fc
|
freeze the editor when reconnecting
|
2017-10-13 13:40:51 +03:00 |
|
|
Caleb James DeLisle
|
854c1e94a4
|
make infinite spinner error message go away if ChainPad settles after it has been popped
|
2017-10-13 13:39:49 +03:00 |
|
|
Caleb James DeLisle
|
753e2d797e
|
Merge branch 'staging' into framework
|
2017-10-12 17:07:10 +03:00 |
|
|
Caleb James DeLisle
|
c773b5d076
|
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
|
2017-10-12 15:42:09 +03:00 |
|
|
Caleb James DeLisle
|
c8928a0811
|
Switch the transform function and also stop calling textPatcher without the metadata
|
2017-10-09 17:07:26 +03:00 |
|
|
Caleb James DeLisle
|
36aee2d174
|
lets try normalizing the dom before applying a patch
|
2017-10-09 14:13:11 +03:00 |
|
|
Caleb James DeLisle
|
828a685ba8
|
Fix broken browser fight logging
|
2017-10-09 14:12:55 +03:00 |
|
|
Caleb James DeLisle
|
f0eb58ee95
|
Merge branch 'staging' into framework
|
2017-10-06 14:50:35 +03:00 |
|
|
Caleb James DeLisle
|
9509d538e0
|
Cursor not being updated at the right times before applying a patch.
|
2017-10-06 14:49:52 +03:00 |
|
|
Caleb James DeLisle
|
0aecfad854
|
Occasionally the language selector only says "Mode" rather than the language
|
2017-10-05 16:12:49 +03:00 |
|
|
Caleb James DeLisle
|
ae87320408
|
Preview pane cannot be resized after it has been hidden and then shown again
|
2017-10-05 16:12:24 +03:00 |
|
|
Caleb James DeLisle
|
d9e97b86e6
|
Merge branch 'staging' into framework
|
2017-10-05 12:14:37 +03:00 |
|
|
Caleb James DeLisle
|
383c2f54cb
|
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
|
2017-10-05 12:14:03 +03:00 |
|