Commit Graph

9524 Commits

Author SHA1 Message Date
Bart Visscher 0e548283fc Replace OC_FileCache usage in files_versions 2013-02-06 08:00:57 +01:00
Jenkins for ownCloud 335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
Thomas Müller 74157902d7 Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit
disable error handler while running phpunit
2013-02-05 14:35:11 -08:00
Thomas Mueller cbf6b28f45 uncomment failing calls to \OC\Files\Filesystem::file_put_contents 2013-02-05 20:21:29 +01:00
Thomas Mueller c0263173d2 add phpunit configuration for autotest withou the json listener because this pollutes the console 2013-02-05 20:20:55 +01:00
Thomas Mueller 10ea45c916 fix failing test cases due to wrong typing 2013-02-05 20:19:54 +01:00
Sam Tuke 3b9e2f1bab Merge branch 'master' into files_encryption-style-fixes
Conflicts:
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
2013-02-05 18:43:55 +00:00
Arthur Schiwon 5221ee0c5a offer change password only when the action is supported by the user backend 2013-02-05 19:26:00 +01:00
Sam Tuke a528f96b84 Merge branch 'master' into files_encryption-style-fixes 2013-02-05 18:23:03 +00:00
Lukas Reschke e6400b3059 Merge pull request #1474 from samtuke/master
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
Sam Tuke 20b1d12cbf Fixed comment typo, wrapped return value conditional on var assignment in session{} 2013-02-05 17:28:26 +00:00
Sam Tuke 4ba0ab7f65 Added missing translation wrapping 2013-02-05 17:22:59 +00:00
Sam Tuke b84e83261e Added notice to personal settings indicating what filetypes are not encrypted 2013-02-05 17:06:15 +00:00
Bart Visscher 3e7ca373ec Only calculate md5 of local file once 2013-02-05 17:56:51 +01:00
Bart Visscher 148e4facfa Change files_versions namespace to OCA\Files_Versions 2013-02-05 17:46:39 +01:00
Sam Tuke 680c5b3dad Removed debugging output 2013-02-05 16:11:50 +00:00
Sam Tuke 221b69dd0e Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption 2013-02-05 16:09:01 +00:00
Michael Gapczynski 69fd3f42e5 Merge pull request #1471 from owncloud/temp-storage-call-parent-ctor-master
Temp storage call parent ctor master
2013-02-05 08:03:18 -08:00
Sam Tuke a1f200c1e5 Cleaned up path formatting with new method stripUserFilesPath() 2013-02-05 15:59:28 +00:00
Thomas Mueller 77369d8164 disable error handler while running phpunit 2013-02-05 16:44:02 +01:00
Sam Tuke 50faddfa40 Minor improvement to comments 2013-02-05 15:37:40 +00:00
Sam Tuke 53248a9b60 Recryption of legacy encrypted files now working on login 2013-02-05 15:35:29 +00:00
Thomas Mueller 9446017821 spell check 2013-02-05 16:24:40 +01:00
Thomas Mueller 1fd807a7d6 pass the argument to the ctor
Conflicts:
	lib/files/storage/temporary.php
2013-02-05 16:24:11 +01:00
Bart Visscher 86f4126d2c Merge pull request #1469 from owncloud/no-setlocale-on-windows
No setlocale on windows
2013-02-05 07:16:14 -08:00
Michael Gapczynski 79e6e579e3 Merge pull request #1452 from owncloud/fix-breadcrumb
Remove undefined crumb variable from home breadcrumb
2013-02-05 06:56:15 -08:00
Thomas Mueller ac11c842e6 setlocale test is pointless on Windows 2013-02-05 15:46:55 +01:00
Thomas Mueller d8084c132e new function \OC_Util::runningOnWindows() 2013-02-05 15:43:12 +01:00
Jan-Christoph Borchardt 9961235c7b Merge pull request #1429 from owncloud/fix_addNavigation
Make app icon linkable when enabling app.
2013-02-05 05:47:14 -08:00
Jan-Christoph Borchardt e61d21f40d Merge pull request #1460 from owncloud/login-button
Login screen details
2013-02-05 05:46:38 -08:00
Sam Tuke fd90b82acd Merge github.com:owncloud/core 2013-02-05 13:44:45 +00:00
Thomas Müller 59ed0e6318 Merge pull request #1456 from owncloud/gitignore-apps
gitignore all apps except core ones
2013-02-05 05:18:58 -08:00
Thomas Tanghus cda0780d4b Remove superfluous append 2013-02-05 14:15:17 +01:00
Sam Tuke 927d4c98a1 Fixed todos: undefined vars and unreachable code 2013-02-05 13:12:34 +00:00
Jan-Christoph Borchardt 8ae1205b95 line up 'remember' text with checkbox 2013-02-05 12:49:33 +01:00
Jan-Christoph Borchardt 7eaa2d0de1 form detail on log in button, better shape 2013-02-05 12:48:30 +01:00
Jan-Christoph Borchardt c47fcf7d22 shift infield labels just a tiny bit to the right so the cursor doesn't overlap 2013-02-05 12:30:23 +01:00
Jan-Christoph Borchardt 2ec0c491d4 remove superfluous enabled-app class again 2013-02-05 11:30:18 +01:00
Jan-Christoph Borchardt 4059959c5f Merge branch 'master' into fix_addNavigation 2013-02-05 11:09:38 +01:00
Jan-Christoph Borchardt 661da10dc5 gitignore all apps except core ones 2013-02-05 11:04:39 +01:00
Michael Gapczynski 65bd7af8df Remove undefined crumb variable from home breadcrumb 2013-02-04 20:40:16 -05:00
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Brice Maron c5079a63a8 Add Redirect to getUrlContent fix #1065 2013-02-04 23:38:10 +01:00
Thomas Müller 6e5f211ad1 Merge pull request #1449 from owncloud/fixing-namespace-local-storage-master
fixing namespace in local storage
2013-02-04 12:52:56 -08:00
Thomas Tanghus 68fe6d0077 Merge pull request #1432 from owncloud/add_requesttoken
[user_webdavauth] add requesttoken
2013-02-04 12:02:16 -08:00
Thomas Tanghus 951afcf327 Merge pull request #1442 from owncloud/reuse-oc_helper-tmpfolder-master
reuse \OC_Helper::tmpFolder()
2013-02-04 11:57:57 -08:00
Thomas Müller 3b8c071df4 Merge pull request #1234 from owncloud/fix-issue-192
Fix sharing issue with collection and children mismatches
2013-02-04 11:52:20 -08:00
Thomas Mueller 02e6adfdb3 fixing namespace 2013-02-04 20:49:01 +01:00
Thomas Müller a7e62b0366 Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-master
in case file based session handling in enabled - we need to make sure th...
2013-02-04 11:11:15 -08:00
Thomas Müller f04a91bd60 Merge pull request #1445 from owncloud/CSP_font
Allow loading of external fonts
2013-02-04 10:36:43 -08:00