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 2018-02-16 18:04:27 +01:00
commit c10e50b5bb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/pages.js
View File

@ -72,7 +72,7 @@ define([
]) ])
]) ])
]), ]),
h('div.cp-version-footer', "CryptPad v1.25.0 (Zombie)") h('div.cp-version-footer', "CryptPad v1.26.0 (undefined)")
]); ]);
}; };

4
customize.dist/translations/messages.js
View File

@ -478,7 +478,7 @@ define(function () {
out.register_mustAcceptTerms = "You must accept the terms of service."; out.register_mustAcceptTerms = "You must accept the terms of service.";
out.register_mustRememberPass = "We cannot reset your password if you forget it. It's very important that you remember it! Please check the checkbox to confirm."; out.register_mustRememberPass = "We cannot reset your password if you forget it. It's very important that you remember it! Please check the checkbox to confirm.";
out.register_whyRegister = "Why signing up?"; out.register_whyRegister = "Why sign up?";
out.register_header = "Welcome to CryptPad"; out.register_header = "Welcome to CryptPad";
out.register_explanation = [ out.register_explanation = [
"<h3>Lets go over a couple things first:</h3>", "<h3>Lets go over a couple things first:</h3>",
@ -890,7 +890,7 @@ define(function () {
out.creation_expiration = "Expiration time"; out.creation_expiration = "Expiration time";
out.creation_propertiesTitle = "Availability"; out.creation_propertiesTitle = "Availability";
out.creation_appMenuName = "Advanced mode (Ctrl + E)"; out.creation_appMenuName = "Advanced mode (Ctrl + E)";
out.creation_newPadModalDescription = "Click on a pad type to create it. You can check the box if you want to display the pad creation screen (for owned pad, expiring pad, etc.)."; out.creation_newPadModalDescription = "Click on a pad type to create it. You can check the box if you want to display the pad creation screen (for owned pads, expiring pads, etc.).";
out.creation_newPadModalAdvanced = "Display the pad creation screen"; out.creation_newPadModalAdvanced = "Display the pad creation screen";
// New share modal // New share modal

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.25.0", "version": "1.26.0",
"dependencies": { "dependencies": {
"chainpad-server": "^2.0.0", "chainpad-server": "^2.0.0",
"express": "~4.10.1", "express": "~4.10.1",