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 |
|
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 |
|
Jenkins for ownCloud
|
98f37f4bed
|
[tx-robot] updated from transifex
|
2013-02-05 00:20:29 +01:00 |
|
Jenkins for ownCloud
|
2936140838
|
[tx-robot] updated from transifex
|
2013-02-03 00:06:15 +01:00 |
|
Jenkins for ownCloud
|
b29b55a332
|
[tx-robot] updated from transifex
|
2013-02-02 00:08:15 +01:00 |
|
Sam Tuke
|
0677d56ee2
|
Added debugging output relating to recrypting legacy files
|
2013-02-01 19:31:15 +00:00 |
|
Sam Tuke
|
06847f609b
|
Improved support for detecting and recrypting legacy files. Bugs remain.
|
2013-01-31 19:40:51 +00:00 |
|
Sam Tuke
|
c6b3bdd5a0
|
Fixed compatibility with filecache rewrite merge
|
2013-01-31 17:51:46 +00:00 |
|
Sam Tuke
|
2183f77527
|
Fixed incompatibilities with filecache rewrite merge
|
2013-01-31 16:49:07 +00:00 |
|
Sam Tuke
|
31e723a907
|
Merge github.com:owncloud/core
Conflicts:
lib/public/share.php
|
2013-01-31 16:30:37 +00:00 |
|
Jenkins for ownCloud
|
209d599ec5
|
[tx-robot] updated from transifex
|
2013-01-31 17:05:21 +01:00 |
|
Jenkins for ownCloud
|
00a30e6651
|
[tx-robot] updated from transifex
|
2013-01-31 00:31:28 +01:00 |
|
Sam Tuke
|
c7b1bdf00e
|
Fixed handling of keyfile subdir creation
Improved keyfile subdir deletion (1 bug remains here)
|
2013-01-30 18:52:02 +00:00 |
|