mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'api' of ../etherpad-lite.dev/

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-16 17:22:15 +01:00
commit 1151ec3278
28 changed files with 2172 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

2
node/utils/Abiword.js
View file

@ -3,7 +3,7 @@
*/
/*
* 2011 Peter 'Pita' Martischka
* 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
node/utils/AttributePoolFactory.js
View file

@ -7,7 +7,7 @@
*/
/*
* Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka
* Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
node/utils/Changeset.js
View file

@ -4,7 +4,7 @@
*/
/*
* Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka
* Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
node/utils/Minify.js
View file

@ -4,7 +4,7 @@
*/
/*
* 2011 Peter 'Pita' Martischka
* 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

8
node/utils/Settings.js
View file

@ -4,7 +4,7 @@
*/
/*
* 2011 Peter 'Pita' Martischka
* 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -77,7 +77,7 @@ for(var i in settings)
//test if the setting start with a low character
if(i.charAt(0).search("[a-z]") !== 0)
{
console.error("WARNING: Settings should start with a low character: '" + i + "'");
console.warn("Settings should start with a low character: '" + i + "'");
}
//we know this setting, so we overwrite it
@ -88,7 +88,7 @@ for(var i in settings)
//this setting is unkown, output a warning and throw it away
else
{
console.error("WARNING: Unkown Setting: '" + i + "'");
console.error("This setting doesn't exist or it was removed");
console.warn("Unkown Setting: '" + i + "'");
console.warn("This setting doesn't exist or it was removed");
}
}