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

Merge branch 'staging' into todo

Browse Source
This commit is contained in:
ansuz 2017-07-31 11:43:56 +02:00
commit 777dea2014
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.example.js
View File

@ -248,7 +248,7 @@ module.exports = {
/* Setting this value to anything other than true will cause file upload /* Setting this value to anything other than true will cause file upload
* attempts to be rejected outright. * attempts to be rejected outright.
*/ */
enableUploads: false, enableUploads: true,
/* If you have enabled file upload, you have the option of restricting it /* If you have enabled file upload, you have the option of restricting it
* to a list of users identified by their public keys. If this value is set * to a list of users identified by their public keys. If this value is set

2
customize.dist/template.js
View File

@ -112,7 +112,7 @@ $(function () {
]) ])
]) ])
]), ]),
h('div.version-footer', "CryptPad v1.11.0 (Lutin)") h('div.version-footer', "CryptPad v1.12.0 (Minotaur)")
])); ]));
var pathname = location.pathname; var pathname = location.pathname;

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.11.0", "version": "1.12.0",
"dependencies": { "dependencies": {
"chainpad-server": "^1.0.1", "chainpad-server": "^1.0.1",
"express": "~4.10.1", "express": "~4.10.1",