web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory
2017-05-18 14:57:12 +02:00
parent 0bd4caeb7e d187945e94
commit 51bd41d4e8
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/about.html
View File

@@ -114,7 +114,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="version-footer">CryptPad v1.6.0 (Hodag)</div> <div class="version-footer">CryptPad v1.7.0 (Hodag)</div>
</footer> </footer>
</body> </body>

2
customize.dist/contact.html
View File

@@ -111,7 +111,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="version-footer">CryptPad v1.6.0 (Hodag)</div> <div class="version-footer">CryptPad v1.7.0 (Hodag)</div>
</footer> </footer>
</body> </body>

2
customize.dist/index.html
View File

@@ -233,7 +233,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="version-footer">CryptPad v1.6.0 (Hodag)</div> <div class="version-footer">CryptPad v1.7.0 (Hodag)</div>
</footer> </footer>
</body> </body>

2
customize.dist/privacy.html
View File

@@ -132,7 +132,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="version-footer">CryptPad v1.6.0 (Hodag)</div> <div class="version-footer">CryptPad v1.7.0 (Hodag)</div>
</footer> </footer>
</body> </body>

2
customize.dist/src/fragments/footer.html
View File

@@ -39,5 +39,5 @@
</div> </div>
</div> </div>
</div> </div>
<div class="version-footer">CryptPad v1.6.0 (Hodag)</div> <div class="version-footer">CryptPad v1.7.0 (Hodag)</div>
</footer> </footer>

2
customize.dist/terms.html
View File

@@ -115,7 +115,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="version-footer">CryptPad v1.6.0 (Hodag)</div> <div class="version-footer">CryptPad v1.7.0 (Hodag)</div>
</footer> </footer>
</body> </body>

2
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "cryptpad", "name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server", "description": "realtime collaborative visual editor with zero knowlege server",
"version": "1.8.0", "version": "1.7.0",
"dependencies": { "dependencies": {
"chainpad-server": "^1.0.1", "chainpad-server": "^1.0.1",
"express": "~4.10.1", "express": "~4.10.1",

6
www/common/common-hash.js
View File

@@ -103,10 +103,10 @@ Version 1
if (!href) { return ret; } if (!href) { return ret; }
if (href.slice(-1) !== '/') { href += '/'; } if (href.slice(-1) !== '/') { href += '/'; }
var idx;
if (!/^https*:\/\//.test(href)) { if (!/^https*:\/\//.test(href)) {
var idx = href.indexOf('/#'); idx = href.indexOf('/#');
ret.type = href.slice(1, idx); ret.type = href.slice(1, idx);
ret.hash = href.slice(idx + 2); ret.hash = href.slice(idx + 2);
ret.hashData = parseTypeHash(ret.type, ret.hash); ret.hashData = parseTypeHash(ret.type, ret.hash);
@@ -118,7 +118,7 @@ Version 1
ret.type = type; ret.type = type;
return ''; return '';
}); });
var idx = href.indexOf('/#'); idx = href.indexOf('/#');
ret.hash = href.slice(idx + 2); ret.hash = href.slice(idx + 2);
ret.hashData = parseTypeHash(ret.type, ret.hash); ret.hashData = parseTypeHash(ret.type, ret.hash);
return ret; return ret;

4
www/common/diffMarked.js
View File

@@ -3,7 +3,7 @@ define([
'/bower_components/marked/marked.min.js', '/bower_components/marked/marked.min.js',
'/bower_components/diff-dom/diffDOM.js' '/bower_components/diff-dom/diffDOM.js'
],function ($, Marked) { ],function ($, Marked) {
var DiffMd = {} var DiffMd = {};
var DiffDOM = window.diffDOM; var DiffDOM = window.diffDOM;
var renderer = new Marked.Renderer(); var renderer = new Marked.Renderer();
@@ -108,7 +108,7 @@ define([
return patch; return patch;
}; };
var apply = DiffMd.apply = function (newHtml, $content) { DiffMd.apply = function (newHtml, $content) {
var id = $content.attr('id'); var id = $content.attr('id');
if (!id) { throw new Error("The element must have a valid id"); } if (!id) { throw new Error("The element must have a valid id"); }
var $div = $('<div>', {id: id}).append(newHtml); var $div = $('<div>', {id: id}).append(newHtml);

2
www/common/pinpad.js
View File

@@ -172,7 +172,7 @@ define([
}; };
exp.uploadCancel = function (cb) { exp.uploadCancel = function (cb) {
rpc.send('UPLOAD_CANCEL', void 0, function (e, res) { rpc.send('UPLOAD_CANCEL', void 0, function (e) {
if (e) { return void cb(e); } if (e) { return void cb(e); }
cb(); cb();
}); });

2
www/settings/index.html
View File

@@ -105,7 +105,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="version-footer">CryptPad v1.6.0 (Hodag)</div> <div class="version-footer">CryptPad v1.7.0 (Hodag)</div>
</footer> </footer>
</body> </body>