Commit Graph

296 Commits

Author SHA1 Message Date
Jenkins for ownCloud 19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Jenkins for ownCloud 63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Jenkins for ownCloud 63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Jenkins for ownCloud f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
Tom Needham dfbf57207d Merge pull request #1584 from owncloud/ocs_multiple_methods
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
Tom Needham e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Jenkins for ownCloud 97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Tom Needham 370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
Bernhard Posselt 10b108ed8a Merge pull request #2030 from j-ed/master
suppress log messages like `include path for class ... starts with "apps/"`
2013-03-04 12:59:39 -08:00
j-ed 5352f1e65b Update app.php
suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`.
2013-03-02 12:18:28 +01:00
Lukas Reschke 7f8eddffe4 [files_encryption] Use p() instead of echo() 2013-02-27 21:20:37 +01:00
Lukas Reschke c94974cb97 Add missing echo 2013-02-26 16:10:52 +01:00
Jenkins for ownCloud dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Jenkins for ownCloud 76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Jenkins for ownCloud c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Jenkins for ownCloud b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Bart Visscher cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Jenkins for ownCloud bfe6334cd9 [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
Tom Needham f141f8b523 Add further capabilities to /cloud/capabilitites api call 2013-02-10 14:42:23 +01:00
Jenkins for ownCloud 68fa0b7dcc [tx-robot] updated from transifex 2013-02-13 00:05:40 +01:00
Jenkins for ownCloud 8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
Jenkins for ownCloud fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Jenkins for ownCloud 39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
Robin Appelman ad360296b9 Update tests and apps to the new \OC\Files\Filesystem::init signature 2013-02-11 11:06:09 +01:00
Jenkins for ownCloud 04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Thomas Müller 7f58e27495 cleanup - more to come after 2013-02-09 18:01:38 +01:00
Sam Tuke b95bc663af Merge branch 'master' into files_encryption-style-fixes
Conflicts:
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/util.php
2013-02-09 11:52:11 +00:00
Jenkins for ownCloud e5c05e9674 [tx-robot] updated from transifex 2013-02-09 00:14:08 +01:00
Jenkins for ownCloud 59249ebc0c [tx-robot] updated from transifex 2013-02-08 00:13:16 +01:00
Jenkins for ownCloud 35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Sam Tuke 954a627483 Added comment 2013-02-06 18:24:35 +00:00
Sam Tuke 2b07afc8ab Removed debugging code 2013-02-06 17:59:47 +00:00
Sam Tuke a3289d3991 Merge branch 'master' into files_encryption 2013-02-06 15:08:53 +00:00
Sam Tuke 6870add18f Development snapshot 2013-02-06 15:08:36 +00:00
Sam Tuke 16a5ace434 Fixed bug causing encrypted files to be doubly encrypted at login
Added comments and docblocks
2013-02-06 14:30:40 +00:00
Jenkins for ownCloud 335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +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
Sam Tuke a528f96b84 Merge branch 'master' into files_encryption-style-fixes 2013-02-05 18:23:03 +00: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
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
Sam Tuke a1f200c1e5 Cleaned up path formatting with new method stripUserFilesPath() 2013-02-05 15:59:28 +00:00
Sam Tuke 53248a9b60 Recryption of legacy encrypted files now working on login 2013-02-05 15:35:29 +00:00
Sam Tuke fd90b82acd Merge github.com:owncloud/core 2013-02-05 13:44:45 +00:00
Sam Tuke 927d4c98a1 Fixed todos: undefined vars and unreachable code 2013-02-05 13:12:34 +00:00