Merge pull request #4497 from owncloud/newlines_at_eof_kondou

Add newlines at the end of files
remotes/origin/stable6
Kondou 11 years ago
commit c7af26ec84
  1. 2
      AUTHORS
  2. 2
      COPYING-README
  3. 2
      apps/files/ajax/rename.php
  4. 2
      apps/files/appinfo/routes.php
  5. 2
      apps/files/js/keyboardshortcuts.js
  6. 2
      apps/files/lib/app.php
  7. 2
      apps/files/lib/capabilities.php
  8. 2
      apps/files/tests/ajax_rename.php
  9. 2
      apps/files_encryption/ajax/changeRecoveryPassword.php
  10. 2
      apps/files_encryption/ajax/updatePrivateKeyPassword.php
  11. 2
      apps/files_encryption/ajax/userrecovery.php
  12. 2
      apps/files_encryption/appinfo/routes.php
  13. 2
      apps/files_encryption/css/settings-personal.css
  14. 2
      apps/files_encryption/js/settings-admin.js
  15. 2
      apps/files_encryption/js/settings-personal.js
  16. 2
      apps/files_encryption/lib/capabilities.php
  17. 2
      apps/files_encryption/lib/keymanager.php
  18. 2
      apps/files_encryption/tests/stream.php
  19. 2
      apps/files_encryption/tests/trashbin.php
  20. 2
      apps/files_encryption/tests/webdav.php
  21. 2
      apps/files_external/ajax/addMountPoint.php
  22. 2
      apps/files_external/ajax/google.php
  23. 2
      apps/files_external/js/google.js
  24. 2
      apps/files_external/lib/google.php
  25. 2
      apps/files_external/tests/google.php
  26. 2
      apps/files_sharing/appinfo/app.php
  27. 2
      apps/files_sharing/js/share.js
  28. 2
      apps/files_sharing/lib/cache.php
  29. 2
      apps/files_sharing/lib/permissions.php
  30. 2
      apps/files_sharing/lib/watcher.php
  31. 2
      apps/files_sharing/templates/part.404.php
  32. 2
      apps/files_trashbin/appinfo/app.php
  33. 2
      apps/files_trashbin/appinfo/update.php
  34. 2
      apps/files_trashbin/js/disableDefaultActions.js
  35. 2
      apps/files_versions/appinfo/routes.php
  36. 2
      apps/files_versions/lib/capabilities.php
  37. 2
      apps/user_ldap/ajax/clearMappings.php
  38. 2
      apps/user_ldap/ajax/getConfiguration.php
  39. 2
      apps/user_ldap/ajax/getNewServerConfigPrefix.php
  40. 2
      apps/user_ldap/ajax/setConfiguration.php
  41. 2
      apps/user_ldap/css/settings.css
  42. 2
      apps/user_ldap/group_proxy.php
  43. 2
      apps/user_ldap/js/settings.js
  44. 2
      apps/user_ldap/lib/proxy.php
  45. 2
      apps/user_ldap/user_proxy.php
  46. 2
      core/css/auth.css
  47. 2
      core/js/jquery.infieldlabel.js
  48. 2
      core/js/jquery.inview.js
  49. 2
      core/js/oc-requesttoken.js
  50. 2
      core/js/visitortimezone.js
  51. 2
      core/lostpassword/templates/email.php
  52. 2
      core/routes.php
  53. 2
      cron.php
  54. 2
      lib/files/storage/commontest.php
  55. 2
      lib/geo.php
  56. 2
      lib/ocs/result.php
  57. 2
      lib/public/groupinterface.php
  58. 2
      lib/public/userinterface.php
  59. 2
      lib/user/http.php
  60. 2
      lib/user/interface.php
  61. 2
      lib/vobject/compoundproperty.php
  62. 2
      lib/vobject/stringproperty.php
  63. 2
      ocs/routes.php
  64. 2
      public.php
  65. 2
      remote.php
  66. 2
      search/css/results.css
  67. 2
      settings/ajax/setsecurity.php
  68. 2
      settings/ajax/updateapp.php
  69. 2
      settings/js/apps-custom.php
  70. 2
      settings/js/isadmin.php
  71. 2
      status.php
  72. 2
      tests/lib/app.php
  73. 2
      tests/lib/archive/zip.php
  74. 2
      tests/lib/geo.php
  75. 2
      tests/lib/vobject.php

@ -28,4 +28,4 @@ With help from many libraries and frameworks including:
"Lock” symbol from thenounproject.com collection
"Clock” symbol by Brandon Hopkins, from thenounproject.com collection
"Clock” symbol by Brandon Hopkins, from thenounproject.com collection

@ -12,4 +12,4 @@ Licensing of components:
All unmodified files from these and other sources retain their original copyright
and license notices: see the relevant individual files.
Attribution information for ownCloud is contained in the AUTHORS file.
Attribution information for ownCloud is contained in the AUTHORS file.

@ -38,4 +38,4 @@ if($result['success'] === true){
OCP\JSON::success(array('data' => $result['data']));
} else {
OCP\JSON::error(array('data' => $result['data']));
}
}

@ -11,4 +11,4 @@ $this->create('download', 'download{file}')
->actionInclude('files/download.php');
// Register with the capabilities API
OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH);
OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH);

@ -165,4 +165,4 @@ var Files = Files || {};
removeA(keys, event.keyCode);
});
};
})(Files);
})(Files);

@ -76,4 +76,4 @@ class App {
return $result;
}
}
}

@ -21,4 +21,4 @@ class Capabilities {
));
}
}
}

@ -114,4 +114,4 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$this->assertEquals($expected, $result);
}
}
}

@ -49,4 +49,4 @@ if ($return) {
\OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.'))));
} else {
\OCP\JSON::error(array('data' => array('message' => $l->t('Could not change the password. Maybe the old password was not correct.'))));
}
}

@ -51,4 +51,4 @@ if ($return) {
\OCP\JSON::success(array('data' => array('message' => $l->t('Private key password successfully updated.'))));
} else {
\OCP\JSON::error(array('data' => array('message' => $l->t('Could not update the private key password. Maybe the old password was not correct.'))));
}
}

@ -38,4 +38,4 @@ if (
}
// Return success or failure
($return) ? \OCP\JSON::success() : \OCP\JSON::error();
($return) ? \OCP\JSON::success() : \OCP\JSON::error();

@ -6,4 +6,4 @@
*/
// Register with the capabilities API
OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH);
OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH);

@ -7,4 +7,4 @@
, #recoveryEnabledError
, #recoveryEnabledSuccess {
display: none;
}
}

@ -99,4 +99,4 @@ $(document).ready(function(){
);
});
});
});

@ -95,4 +95,4 @@ $(document).ready(function(){
updatePrivateKeyPasswd();
});
});
});

@ -20,4 +20,4 @@ class Capabilities {
));
}
}
}

@ -593,4 +593,4 @@ class Keymanager {
return $targetPath;
}
}
}

@ -180,4 +180,4 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
// tear down
$view->unlink($filename);
}
}
}

@ -300,4 +300,4 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
}
}
}

@ -259,4 +259,4 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
// return captured content
return $content;
}
}
}

@ -16,4 +16,4 @@ $status = OC_Mount_Config::addMountPoint($_POST['mountPoint'],
$_POST['mountType'],
$_POST['applicable'],
$isPersonal);
OCP\JSON::success(array('data' => array('message' => $status)));
OCP\JSON::success(array('data' => array('message' => $status)));

@ -39,4 +39,4 @@ if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST
}
}
}
}
}

@ -126,4 +126,4 @@ $(document).ready(function() {
}
});
});
});

@ -587,4 +587,4 @@ class Google extends \OC\Files\Storage\Common {
return false;
}
}
}

@ -42,4 +42,4 @@ class Google extends Storage {
$this->instance->rmdir('/');
}
}
}
}

@ -15,4 +15,4 @@ OCP\Util::addScript('files_sharing', 'share');
\OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
\OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook');
\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');
\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');

@ -38,4 +38,4 @@ $(document).ready(function() {
}
});
}
});
});

@ -288,4 +288,4 @@ class Shared_Cache extends Cache {
return false;
}
}
}

@ -106,4 +106,4 @@ class Shared_Permissions extends Permissions {
// Not a valid action for Shared Permissions
}
}
}

@ -48,4 +48,4 @@ class Shared_Watcher extends Watcher {
}
}
}
}

@ -9,4 +9,4 @@
</ul>
<p><?php p($l->t('For more info, please ask the person who sent this link.')); ?></p>
</li>
</ul>
</ul>

@ -4,4 +4,4 @@ OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
// register hooks
\OCA\Files_Trashbin\Trashbin::registerHooks();
\OCA\Files_Trashbin\Trashbin::registerHooks();

@ -7,4 +7,4 @@ if (version_compare($installedVersion, '0.4', '<')) {
//enforce a recalculation during next usage.
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize`');
$result = $query->execute();
}
}

@ -1,4 +1,4 @@
/* disable download and sharing actions */
var disableDownloadActions = true;
var disableSharing = true;
var trashBinApp = true;
var trashBinApp = true;

@ -6,4 +6,4 @@
*/
// Register with the capabilities API
OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH);
OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH);

@ -20,4 +20,4 @@ class Capabilities {
));
}
}
}

@ -32,4 +32,4 @@ if(\OCA\user_ldap\lib\Helper::clearMapping($subject)) {
} else {
$l=OC_L10N::get('user_ldap');
OCP\JSON::error(array('message' => $l->t('Failed to clear the mappings.')));
}
}

@ -28,4 +28,4 @@ OCP\JSON::callCheck();
$prefix = $_POST['ldap_serverconfig_chooser'];
$connection = new \OCA\user_ldap\lib\Connection($prefix);
OCP\JSON::success(array('configuration' => $connection->getConfiguration()));
OCP\JSON::success(array('configuration' => $connection->getConfiguration()));

@ -31,4 +31,4 @@ sort($serverConnections);
$lk = array_pop($serverConnections);
$ln = intval(str_replace('s', '', $lk));
$nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT);
OCP\JSON::success(array('configPrefix' => $nk));
OCP\JSON::success(array('configPrefix' => $nk));

@ -30,4 +30,4 @@ $prefix = $_POST['ldap_serverconfig_chooser'];
$connection = new \OCA\user_ldap\lib\Connection($prefix);
$connection->setConfiguration($_POST);
$connection->saveConfiguration();
OCP\JSON::success();
OCP\JSON::success();

@ -24,4 +24,4 @@
.ldapwarning {
margin-left: 1.4em;
color: #FF3B3B;
}
}

@ -198,4 +198,4 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
//it's the same across all our user backends obviously
return $this->refBackend->implementsActions($actions);
}
}
}

@ -211,4 +211,4 @@ $(document).ready(function() {
LdapConfiguration.refreshConfig();
}
});
});
});

@ -101,4 +101,4 @@ abstract class Proxy {
public function clearCache() {
$this->cache->clear($this->getCacheKey(null));
}
}
}

@ -198,4 +198,4 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
return $this->refBackend->hasUserListings();
}
}
}

@ -36,4 +36,4 @@ h2 img {
font-size:1.2em;
margin:.7em;
padding:0;
}
}

@ -174,4 +174,4 @@
});
};
}(jQuery));
}(jQuery));

@ -131,4 +131,4 @@
// By the way, iOS (iPad, iPhone, ...) seems to not execute, or at least delays
// intervals while the user scrolls. Therefore the inview event might fire a bit late there
setInterval(checkInView, 250);
})(jQuery);
})(jQuery);

@ -1,3 +1,3 @@
$(document).bind('ajaxSend', function(elm, xhr, s) {
xhr.setRequestHeader('requesttoken', oc_requesttoken);
});
});

@ -1,4 +1,4 @@
$(document).ready(function () {
var visitortimezone = (-new Date().getTimezoneOffset() / 60);
$('#timezone-offset').val(visitortimezone);
});
});

@ -1,2 +1,2 @@
<?php
echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}'));
echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}'));

@ -73,4 +73,4 @@ $this->create('app_script', '/apps/{app}/{file}')
// used for heartbeat
$this->create('heartbeat', '/heartbeat')->action(function(){
// do nothing
});
});

@ -121,4 +121,4 @@ try {
} catch (Exception $ex) {
\OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
}
}

@ -77,4 +77,4 @@ class CommonTest extends \OC\Files\Storage\Common{
public function touch($path, $mtime=null) {
return $this->storage->touch($path, $mtime);
}
}
}

@ -28,4 +28,4 @@ class OC_Geo{
reset($variances);
return current($variances);
}
}
}

@ -94,4 +94,4 @@ class OC_OCS_Result{
}
}
}

@ -28,4 +28,4 @@
namespace OCP;
interface GroupInterface extends \OC_Group_Interface {}
interface GroupInterface extends \OC_Group_Interface {}

@ -28,4 +28,4 @@
namespace OCP;
interface UserInterface extends \OC_User_Interface {}
interface UserInterface extends \OC_User_Interface {}

@ -103,4 +103,4 @@ class OC_User_HTTP extends OC_User_Backend {
return false;
}
}
}
}

@ -77,4 +77,4 @@ interface OC_User_Interface {
* @return boolean if users can be listed or not
*/
public function hasUserListings();
}
}

@ -67,4 +67,4 @@ class CompoundProperty extends \Sabre\VObject\Property\Compound {
}
}
}

@ -77,4 +77,4 @@ class StringProperty extends \Sabre\VObject\Property {
}
}
}

@ -74,4 +74,4 @@ OC_API::register(
array('OC_OCS_Cloud', 'getCapabilities'),
'core',
OC_API::USER_AUTH
);
);

@ -28,4 +28,4 @@ try {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
OC_Template::printExceptionErrorPage($ex);
}
}

@ -46,4 +46,4 @@ try {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
OC_Template::printExceptionErrorPage($ex);
}
}

@ -66,4 +66,4 @@
#searchresults tr.current {
background-color:#ddd;
}
}

@ -10,4 +10,4 @@ OCP\JSON::callCheck();
OC_Config::setValue( 'forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
echo 'true';
echo 'true';

@ -12,4 +12,4 @@ if($result !== false) {
} else {
$l = OC_L10N::get('settings');
OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't update app.") )));
}
}

@ -23,4 +23,4 @@ foreach($combinedApps as $app) {
echo("\n");
}
echo ("var appid =".json_encode($_GET['appid']).";");
echo ("var appid =".json_encode($_GET['appid']).";");

@ -17,4 +17,4 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
echo("var isadmin = true;");
} else {
echo("var isadmin = false;");
}
}

@ -39,4 +39,4 @@ try {
} catch (Exception $ex) {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
}
}

@ -79,4 +79,4 @@ class Test_App extends PHPUnit_Framework_TestCase {
$this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
}
}
}

@ -19,4 +19,4 @@ class Test_Archive_ZIP extends Test_Archive {
return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip'));
}
}
}
}

@ -20,4 +20,4 @@ class Test_Geo extends PHPUnit_Framework_TestCase {
$expected = 'Pacific/Enderbury';
$this->assertEquals($expected, $result);
}
}
}

@ -35,4 +35,4 @@ class Test_VObject extends PHPUnit_Framework_TestCase {
$parts = $property->getParts();
$this->assertEquals('Marketing;Sales', $parts[2]);
}
}
}

Loading…
Cancel
Save