Caleb James DeLisle
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 15:58:33 +02:00
Caleb James DeLisle
e62c5e1d07
Add some debugging lines to help synthesize error cases
2017-09-26 15:58:25 +02:00
Caleb James DeLisle
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
2017-09-25 18:03:31 +02:00
Caleb James DeLisle
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:46:04 +02:00
Caleb James DeLisle
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:45:56 +02:00
Caleb James DeLisle
b15527565c
Allow passing arguments when firing events
2017-09-25 15:45:49 +02:00
Caleb James DeLisle
b643ccc232
typo
2017-09-14 10:54:16 +02:00
Caleb James DeLisle
652c916690
change the command in the documentation so that it will not change itself
2017-09-14 10:52:55 +02:00
Caleb James DeLisle
5f0383ae99
update version of sframe-boot because it was changed
2017-09-14 10:52:25 +02:00
Caleb James DeLisle
845f75f8a7
remove a 100ms dead spot from page load
2017-09-14 10:48:59 +02:00
Caleb James DeLisle
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
2017-09-14 10:48:35 +02:00
Caleb James DeLisle
8a32b72ffc
1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
...
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
2017-09-14 10:23:05 +02:00
Caleb James DeLisle
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
2017-09-13 16:04:01 +02:00
Caleb James DeLisle
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:47:55 +02:00
Caleb James DeLisle
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
2017-09-13 14:47:50 +02:00
Caleb James DeLisle
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
2017-09-13 14:46:41 +02:00
Caleb James DeLisle
63cb5dfc1e
Make less loader rewrite urls to use version parameter
2017-09-13 12:04:24 +02:00
Caleb James DeLisle
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 11:00:09 +02:00
Caleb James DeLisle
e3c0ec29f7
Hopefully chase out a race in sframe-channel
2017-09-13 11:00:00 +02:00
Caleb James DeLisle
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 14:12:41 +02:00
Caleb James DeLisle
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
2017-09-12 14:12:35 +02:00
Caleb James DeLisle
a74915ab58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 17:52:40 +02:00
Caleb James DeLisle
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
2017-09-11 17:52:34 +02:00
Caleb James DeLisle
8d3ebdbaf7
I'm stupid
2017-09-11 15:53:27 +02:00
Caleb James DeLisle
041071e61c
manual merge
2017-09-11 15:52:14 +02:00
Caleb James DeLisle
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
2017-09-11 15:46:21 +02:00
Caleb James DeLisle
684a12ce2e
Update pinneddata to work on blobs too
2017-09-08 11:35:45 +02:00
Caleb James DeLisle
fe2454ba31
add the ability to filter for old pads using pinneddata.js
2017-09-08 10:39:45 +02:00
Caleb James DeLisle
a164115e8c
Add media-tag-nacl to cryptpad so it will be hosted on the server
2017-09-01 10:10:34 +02:00
Caleb James DeLisle
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
2017-08-31 16:28:48 +02:00
Caleb James DeLisle
a60709ff73
Infinite spinner popup leads to frame attempting to reload and failing
2017-08-30 19:23:01 +02:00
Caleb James DeLisle
1044531806
Fix Safari iframe size issue
2017-08-30 11:04:52 +02:00
Caleb James DeLisle
fe03e6ae83
bad code, lint
2017-08-28 17:53:23 +02:00
Caleb James DeLisle
190dff1c9b
Use the bounce app for opening a link with the right click
2017-08-28 17:50:55 +02:00
Caleb James DeLisle
e4a356d873
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 12:25:12 +02:00
Caleb James DeLisle
056285a7b6
Move pad2 to pad and create bounce app
2017-08-28 12:25:05 +02:00
Caleb James DeLisle
e62faf7c7b
Edge fix, always use async iframe onLoad rather than invoking it manually
2017-08-28 11:22:57 +02:00
Caleb James DeLisle
abec07b1f9
If config.js is missing, fallback to config.example.js which is in the git repo
2017-08-28 11:21:01 +02:00
Caleb James DeLisle
818742dd56
Add frame-src for IE/Edge compatibility
2017-08-28 11:20:24 +02:00
Caleb James DeLisle
0a6f81850f
Handle infinite-spinner errors and properly inform the user
2017-08-25 14:24:43 +02:00
Caleb James DeLisle
cbf63b4c52
jshintignore pad2/wysiwygarea-plugin.js
2017-08-24 14:01:18 +02:00
Caleb James DeLisle
35e7341f4d
Merge branch 'ui-integration' into staging2
2017-08-24 13:54:55 +02:00
Caleb James DeLisle
7bbea28831
minor anti-xss changes...
2017-08-24 13:53:42 +02:00
Caleb James DeLisle
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
2017-08-23 16:18:47 +02:00
Caleb James DeLisle
dc283c2d74
Load 1, load 2... not load 1, load 3.
2017-08-23 15:49:51 +02:00
Caleb James DeLisle
5d9599c9b7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-23 12:15:01 +02:00
Caleb James DeLisle
cbac5e417c
Make loading screen come much earlier on pad2
2017-08-23 12:14:51 +02:00
Caleb James DeLisle
acfaaa7d56
jshint compliance
2017-08-23 11:04:44 +02:00
Caleb James DeLisle
2ad9fcee17
Manual merge of notify.js
2017-08-23 10:45:55 +02:00
Caleb James DeLisle
8a9755611a
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-23 10:21:53 +02:00
Caleb James DeLisle
2dacd57e76
fix caching on favicon
2017-08-23 10:21:41 +02:00
Caleb James DeLisle
d9f5e3638e
Big caching improvements :D
2017-08-22 15:50:10 +02:00
Caleb James DeLisle
4f3b4a30ee
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:38:16 +02:00
Caleb James DeLisle
4b70fc9f49
Use resources from the original origin in pad2
2017-08-21 18:38:07 +02:00
Caleb James DeLisle
bffa4d01a8
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:08:46 +02:00
Caleb James DeLisle
b081603455
Update requirejs
2017-08-21 18:08:37 +02:00
Caleb James DeLisle
6dd1643738
Manual merge work done on loading page to pad2
2017-08-21 10:53:40 +02:00
Caleb James DeLisle
8b702e0150
wip
2017-08-21 10:34:49 +02:00
Caleb James DeLisle
498c8229e9
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
2017-08-18 14:12:30 +02:00
Caleb James DeLisle
cf6d8c83b2
Fix title setter logic and separate it from UI
2017-08-17 19:58:48 +02:00
Caleb James DeLisle
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 19:01:40 +02:00
Caleb James DeLisle
415399ef64
Changes to support title change in metadata
2017-08-17 19:01:33 +02:00
Caleb James DeLisle
909bda4302
This should fix laxy metadata
2017-08-17 18:26:58 +02:00
Caleb James DeLisle
2490ee253f
Added setDisplayName RPC
2017-08-17 18:09:17 +02:00
Caleb James DeLisle
0b34ceb0eb
Added RPC setPadTitleInDrive()
2017-08-17 17:34:08 +02:00
Caleb James DeLisle
3b5af3ea74
sframe common changes
2017-08-17 16:56:18 +02:00
Caleb James DeLisle
3c0197cbf4
Firefox fails to boot the iframe if there is no number on setInterval
2017-08-17 16:17:57 +02:00
Caleb James DeLisle
a4850a7fcc
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 15:42:28 +02:00
Caleb James DeLisle
ad9f2ff223
Made pad2 server more generic and easy to implement
2017-08-17 15:41:04 +02:00
Caleb James DeLisle
e04c0b89a1
manual merge of staging
2017-08-17 12:14:19 +02:00
Caleb James DeLisle
4881f8d030
Remove X-Frame-Options because it cannot work with a cross-domain iframe.
2017-08-17 12:12:40 +02:00
Caleb James DeLisle
2a666e0ba3
Merge branch 'staging'
2017-08-16 14:34:23 +02:00
Caleb James DeLisle
3315449114
Lets try this...
2017-08-16 14:30:17 +02:00
Caleb James DeLisle
4c949a61e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 12:40:34 +02:00
Caleb James DeLisle
6b174934c8
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
2017-08-16 12:40:15 +02:00
Caleb James DeLisle
e6cdf955d3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 12:11:46 +02:00
Caleb James DeLisle
725e19925c
Yeah, that was silly...
2017-08-16 12:11:25 +02:00
Caleb James DeLisle
f7b2aa85b8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:36:25 +02:00
Caleb James DeLisle
3df20760c4
Yann does not have a twitter account.
2017-08-16 11:36:14 +02:00
Caleb James DeLisle
4213d6de70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:29:59 +02:00
Caleb James DeLisle
d6125d864c
Added Yann's bio
2017-08-16 11:29:50 +02:00
Caleb James DeLisle
40287f973c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 10:19:50 +02:00
Caleb James DeLisle
b0b1ed037c
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
2017-08-16 10:19:24 +02:00
Caleb James DeLisle
638a94785f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-14 16:24:17 +02:00
Caleb James DeLisle
723151254c
remove a debug line before release which killed CSP
2017-08-14 16:23:56 +02:00
Caleb James DeLisle
7ca60e55a7
Lock the pad's inner-iframe down with CSP
2017-08-14 16:23:38 +02:00
Caleb James DeLisle
7c8df61f91
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
2017-08-11 17:54:15 +02:00
Caleb James DeLisle
196ce3b3f7
Fix alertify style which made the registration popup look bad
2017-08-11 17:49:19 +02:00
Caleb James DeLisle
878a565f89
tiny little performance improvement in something that really doesn't need it
2017-08-11 17:34:51 +02:00
Caleb James DeLisle
007db0b080
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-11 17:28:42 +02:00
Caleb James DeLisle
7a698d092e
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
2017-08-11 17:28:23 +02:00
Caleb James DeLisle
9833bd7e59
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-11 14:31:40 +02:00
Caleb James DeLisle
89a8e8050c
Fix typo and also change message to explain itself better
2017-08-11 14:31:31 +02:00
Caleb James DeLisle
4acd9957a9
Set the url if there is none
2017-08-11 10:40:57 +02:00
Caleb James DeLisle
33e73dd5e5
fixed one last fight
2017-08-10 21:40:34 +02:00
Caleb James DeLisle
9c0b0cc6a8
Merge branch 'staging' into pad2
2017-08-10 18:39:16 +02:00
Caleb James DeLisle
aa1563a731
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-10 18:32:27 +02:00
Caleb James DeLisle
1e56fa31c0
yay, they talk and they don't fight
2017-08-10 18:31:44 +02:00
Caleb James DeLisle
e786a66ff3
manual merge
2017-08-10 15:38:09 +02:00
Caleb James DeLisle
b3d349bf80
Merge branch 'staging' into pad2
2017-08-10 14:53:12 +02:00
Caleb James DeLisle