infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

Browse Source
pull/1/head
ansuz 8 years ago
parent 94417d9a8b 2103f0afa8
commit 1151c02662
10 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File

10
customize.dist/about.html
Unescape Escape View File

@ -85,7 +85,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>CryptPad</li> <li class="title">CryptPad</li>
<li><a href="/about.html" data-localization="about"></a></li> <li><a href="/about.html" data-localization="about"></a></li>
<li><a href="/terms.html" data-localization="terms"></a></li> <li><a href="/terms.html" data-localization="terms"></a></li>
<li><a href="/privacy.html" data-localization="privacy"></a></li> <li><a href="/privacy.html" data-localization="privacy"></a></li>
@ -93,7 +93,7 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_applications"><li> <li class="title" data-localization="footer_applications"><li>
<li><a href="/pad/" data-localization="main_richText"></a></li> <li><a href="/pad/" data-localization="main_richText"></a></li>
<li><a href="/code/" data-localization="main_code"></a></li> <li><a href="/code/" data-localization="main_code"></a></li>
<li><a href="/slide/" data-localization="main_slide"></a></li> <li><a href="/slide/" data-localization="main_slide"></a></li>
@ -103,15 +103,15 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_aboutUs"><li> <li class="title" data-localization="footer_aboutUs"><li>
<li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li> <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
<li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li> <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
<li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li> <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
</ul> </ul>
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_contact"><li> <li class="title" data-localization="footer_contact"><li>
<li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li> <li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li>
<li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li> <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
<li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li> <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>

10
customize.dist/contact.html
Unescape Escape View File

@ -82,7 +82,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>CryptPad</li> <li class="title">CryptPad</li>
<li><a href="/about.html" data-localization="about"></a></li> <li><a href="/about.html" data-localization="about"></a></li>
<li><a href="/terms.html" data-localization="terms"></a></li> <li><a href="/terms.html" data-localization="terms"></a></li>
<li><a href="/privacy.html" data-localization="privacy"></a></li> <li><a href="/privacy.html" data-localization="privacy"></a></li>
@ -90,7 +90,7 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_applications"><li> <li class="title" data-localization="footer_applications"><li>
<li><a href="/pad/" data-localization="main_richText"></a></li> <li><a href="/pad/" data-localization="main_richText"></a></li>
<li><a href="/code/" data-localization="main_code"></a></li> <li><a href="/code/" data-localization="main_code"></a></li>
<li><a href="/slide/" data-localization="main_slide"></a></li> <li><a href="/slide/" data-localization="main_slide"></a></li>
@ -100,15 +100,15 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_aboutUs"><li> <li class="title" data-localization="footer_aboutUs"><li>
<li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li> <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
<li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li> <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
<li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li> <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
</ul> </ul>
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_contact"><li> <li class="title" data-localization="footer_contact"><li>
<li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li> <li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li>
<li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li> <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
<li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li> <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>

10
customize.dist/index.html
Unescape Escape View File

@ -204,7 +204,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>CryptPad</li> <li class="title">CryptPad</li>
<li><a href="/about.html" data-localization="about"></a></li> <li><a href="/about.html" data-localization="about"></a></li>
<li><a href="/terms.html" data-localization="terms"></a></li> <li><a href="/terms.html" data-localization="terms"></a></li>
<li><a href="/privacy.html" data-localization="privacy"></a></li> <li><a href="/privacy.html" data-localization="privacy"></a></li>
@ -212,7 +212,7 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_applications"><li> <li class="title" data-localization="footer_applications"><li>
<li><a href="/pad/" data-localization="main_richText"></a></li> <li><a href="/pad/" data-localization="main_richText"></a></li>
<li><a href="/code/" data-localization="main_code"></a></li> <li><a href="/code/" data-localization="main_code"></a></li>
<li><a href="/slide/" data-localization="main_slide"></a></li> <li><a href="/slide/" data-localization="main_slide"></a></li>
@ -222,15 +222,15 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_aboutUs"><li> <li class="title" data-localization="footer_aboutUs"><li>
<li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li> <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
<li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li> <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
<li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li> <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
</ul> </ul>
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_contact"><li> <li class="title" data-localization="footer_contact"><li>
<li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li> <li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li>
<li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li> <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
<li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li> <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>

2
customize.dist/main.css
Unescape Escape View File

@ -483,7 +483,7 @@
.cp footer a:hover { .cp footer a:hover {
color: #279ebf; color: #279ebf;
} }
.cp footer li:first-child { .cp footer li.title {
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
} }

10
customize.dist/privacy.html
Unescape Escape View File

@ -104,7 +104,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>CryptPad</li> <li class="title">CryptPad</li>
<li><a href="/about.html" data-localization="about"></a></li> <li><a href="/about.html" data-localization="about"></a></li>
<li><a href="/terms.html" data-localization="terms"></a></li> <li><a href="/terms.html" data-localization="terms"></a></li>
<li><a href="/privacy.html" data-localization="privacy"></a></li> <li><a href="/privacy.html" data-localization="privacy"></a></li>
@ -112,7 +112,7 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_applications"><li> <li class="title" data-localization="footer_applications"><li>
<li><a href="/pad/" data-localization="main_richText"></a></li> <li><a href="/pad/" data-localization="main_richText"></a></li>
<li><a href="/code/" data-localization="main_code"></a></li> <li><a href="/code/" data-localization="main_code"></a></li>
<li><a href="/slide/" data-localization="main_slide"></a></li> <li><a href="/slide/" data-localization="main_slide"></a></li>
@ -122,15 +122,15 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_aboutUs"><li> <li class="title" data-localization="footer_aboutUs"><li>
<li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li> <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
<li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li> <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
<li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li> <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
</ul> </ul>
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_contact"><li> <li class="title" data-localization="footer_contact"><li>
<li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li> <li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li>
<li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li> <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
<li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li> <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>

10
customize.dist/src/fragments/footer.html
Unescape Escape View File

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>CryptPad</li> <li class="title">CryptPad</li>
<li><a href="/about.html" data-localization="about"></a></li> <li><a href="/about.html" data-localization="about"></a></li>
<li><a href="/terms.html" data-localization="terms"></a></li> <li><a href="/terms.html" data-localization="terms"></a></li>
<li><a href="/privacy.html" data-localization="privacy"></a></li> <li><a href="/privacy.html" data-localization="privacy"></a></li>
@ -11,7 +11,7 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_applications"><li> <li class="title" data-localization="footer_applications"><li>
<li><a href="/pad/" data-localization="main_richText"></a></li> <li><a href="/pad/" data-localization="main_richText"></a></li>
<li><a href="/code/" data-localization="main_code"></a></li> <li><a href="/code/" data-localization="main_code"></a></li>
<li><a href="/slide/" data-localization="main_slide"></a></li> <li><a href="/slide/" data-localization="main_slide"></a></li>
@ -21,15 +21,15 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_aboutUs"><li> <li class="title" data-localization="footer_aboutUs"><li>
<li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li> <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
<li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li> <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
<li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li> <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
</ul> </ul>
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_contact"><li> <li class="title" data-localization="footer_contact"><li>
<li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li> <li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li>
<li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li> <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
<li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li> <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>

2
customize.dist/src/less/footer.less
Unescape Escape View File

@ -14,7 +14,7 @@
color: @cp-link-hover; color: @cp-link-hover;
} }
} }
li:first-child { li.title {
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
} }

10
customize.dist/terms.html
Unescape Escape View File

@ -86,7 +86,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>CryptPad</li> <li class="title">CryptPad</li>
<li><a href="/about.html" data-localization="about"></a></li> <li><a href="/about.html" data-localization="about"></a></li>
<li><a href="/terms.html" data-localization="terms"></a></li> <li><a href="/terms.html" data-localization="terms"></a></li>
<li><a href="/privacy.html" data-localization="privacy"></a></li> <li><a href="/privacy.html" data-localization="privacy"></a></li>
@ -94,7 +94,7 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_applications"><li> <li class="title" data-localization="footer_applications"><li>
<li><a href="/pad/" data-localization="main_richText"></a></li> <li><a href="/pad/" data-localization="main_richText"></a></li>
<li><a href="/code/" data-localization="main_code"></a></li> <li><a href="/code/" data-localization="main_code"></a></li>
<li><a href="/slide/" data-localization="main_slide"></a></li> <li><a href="/slide/" data-localization="main_slide"></a></li>
@ -104,15 +104,15 @@
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_aboutUs"><li> <li class="title" data-localization="footer_aboutUs"><li>
<li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li> <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
<li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li> <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
<li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li> <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
</ul> </ul>
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li data-localization="footer_contact"><li> <li class="title" data-localization="footer_contact"><li>
<li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li> <li><a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" target="_blank" rel="noopener noreferrer">IRC</a></li>
<li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li> <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
<li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li> <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>

4
www/common/cryptpad-common.js
Unescape Escape View File

@ -351,7 +351,7 @@ define([
title: pad[2] || hash && hash.slice(0,8), title: pad[2] || hash && hash.slice(0,8),
ctime: pad[1], ctime: pad[1],
}; };
} else if (typeof(pad) === 'object') { } else if (pad && typeof(pad) === 'object') {
if (!pad.ctime) { pad.ctime = pad.atime; } if (!pad.ctime) { pad.ctime = pad.atime; }
if (!pad.title) { if (!pad.title) {
pad.href.replace(/#(.*)$/, function (x, hash) { pad.href.replace(/#(.*)$/, function (x, hash) {
@ -367,7 +367,7 @@ define([
} else { } else {
console.error("[Cryptpad.migrateRecentPads] pad had unexpected value"); console.error("[Cryptpad.migrateRecentPads] pad had unexpected value");
console.log(pad); console.log(pad);
return {}; return;
} }
}).filter(function (x) { return x; }); }).filter(function (x) { return x; });
}; };

2
www/common/toolbar.js
Unescape Escape View File

@ -365,7 +365,7 @@ define([
tag: 'a', tag: 'a',
attributes: { attributes: {
'target': '_blank', 'target': '_blank',
'href': '/' + p, 'href': '/' + p + '/',
}, },
content: Messages.type[p] content: Messages.type[p]
}); });

Write Preview
Loading…
Cancel
Save