14ac4fab05
better handling for http post
2013-06-04 00:41:47 +02:00
ef97481a0d
changed redirect handling
2013-06-03 23:41:57 +02:00
b46e7323ec
fixed typo
2013-06-03 19:10:55 +02:00
dc8bcf0688
reformat code
2013-06-03 18:42:13 +02:00
1e601cd6f1
use generated private key fro m setUp()
2013-06-03 17:43:06 +02:00
35c91ff901
added test for decryptPrivateKey()
2013-06-03 17:34:43 +02:00
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
b5820af3cc
let user update private key password in case it was changed from outside, e.g. external auth back-ends
2013-06-03 15:27:31 +02:00
b02f4dc62c
$session->setPrivateKey expects only one parameter
2013-06-03 15:26:58 +02:00
42f66af5a3
control files are no longer needed, remove them from the tests
2013-06-03 14:21:30 +02:00
471d2b732c
introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places
2013-06-03 14:19:31 +02:00
2a81813e44
Merge pull request #3051 from owncloud/backgroundjob
...
Reworked background job system.
2013-06-02 14:29:59 -07:00
9392d2d58e
Merge pull request #3567 from owncloud/fixing-3466
...
In cases where smb4php returns false of an empty array stat/( has to ret...
2013-06-02 14:04:55 -07:00
e1b5598f00
Files: use public api to register backgroundjob
2013-06-02 21:21:39 +02:00
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
cf71a54f5d
[tx-robot] updated from transifex
2013-06-02 02:07:21 +02:00
3013c02767
[tx-robot] updated from transifex
2013-06-01 02:03:53 +02:00
1d7d5d2894
In cases where smb4php returns false of an empty array stat/( has to return false.
...
Fixes #3466 because the test method of external filesystems uses stat() to detect if the given parameters are okay.
Changes to 3rdparty are necessary as well:
https://github.com/owncloud/3rdparty/pull/33
2013-06-01 00:06:23 +02:00
46e5e9bd73
cleanup unused method legacyKeyRecryptKeyfile
2013-05-31 22:49:32 +02:00
1656cc2e7c
Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js
...
Fix ldap sqlite n js
2013-05-31 12:17:46 -07:00
d85a10ebc5
fix broken tests
2013-05-31 20:55:05 +02:00
8761242f52
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/appinfo/app.php
2013-05-31 20:34:43 +02:00
eafb241068
Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling
...
Fix ldap offline host handling
2013-05-31 11:10:33 -07:00
2ff9677cd1
LDAP: sqlite compatibility for emptyiing tables
2013-05-31 20:07:13 +02:00
c49ee4d3e3
LDAP: fix setting value of checkbox after loading configuration
2013-05-31 20:06:40 +02:00
a134ffcf2c
code optimized and cleaned up unused vars
2013-05-31 16:52:33 +02:00
e9d1ea712c
allow the user to login but do not allow upload and show error message on the web
2013-05-31 15:57:18 +02:00
2e3bfdb12c
check if the decrypted private key is valid on login and on read/write files
2013-05-31 13:58:58 +02:00
1bfe975938
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-31 12:58:12 +02:00
1c4c89418b
also fix login errors while filesystem is not loaded in app.php
2013-05-31 12:56:08 +02:00
88d74c33af
Merge branch 'master' into files_encryption_fs_loaded_fix
2013-05-31 12:49:46 +02:00
d636e168a6
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
...
File encryption external storage fixes
2013-05-31 03:21:46 -07:00
4a0e69f941
fix login errors while filesystem is not loaded
2013-05-31 11:55:40 +02:00
a730a72dcb
[tx-robot] updated from transifex
2013-05-31 02:04:40 +02:00
96ef926161
normalize path to prevent following split to fail
2013-05-31 01:57:32 +02:00
ccdfb59426
fix legacy key in until test
2013-05-31 01:55:48 +02:00
8e324aad38
fix re-encrypt legacy files
2013-05-31 01:36:49 +02:00
986e9dd362
use legacyDecrypt to decrypt key file like the previous files_encryption
2013-05-31 01:35:48 +02:00
4f9cbadfa4
fix for autoloader while user logged in and system is in maintenance
2013-05-31 01:34:31 +02:00
eaa4f92275
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
2013-05-30 22:07:36 +02:00
b3834b49c3
prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations
2013-05-30 22:05:52 +02:00
bd7771867b
LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links
2013-05-30 16:55:21 +02:00
aa1c5a5d63
Merge pull request #3529 from owncloud/folder-permissions
...
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-30 05:54:29 -07:00
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
6d94b393bf
fix share and un-share for single file
2013-05-30 01:38:11 +02:00
8c17f26226
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files
2013-05-30 01:13:22 +02:00
313631edf6
Merge branch 'master' into file_encryption_external_storage_fixes
...
Conflicts:
apps/files_encryption/hooks/hooks.php
2013-05-30 00:45:29 +02:00
5a47054505
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
2013-05-29 18:22:54 -04:00
d59ae569ba
reformat code
2013-05-29 23:13:45 +02:00
838fd1a20a
changed " to '
2013-05-29 23:11:30 +02:00
ee7c4c4c93
changed l10n to full sentences
2013-05-29 20:27:12 +02:00
df41a60c50
fixed typo
2013-05-29 20:11:53 +02:00
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
d265264542
fix for share folder on external storage
2013-05-29 19:11:39 +02:00
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
5dd865a57f
changes l10n after review
2013-05-29 12:47:50 +02:00
efd629462e
changes after review
2013-05-29 12:23:33 +02:00
c398fc59ad
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
2013-05-29 09:21:00 +02:00
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
71a532fc4d
fixed if fopen returns false typically on external storage
2013-05-28 20:50:14 +02:00
4b4b447e2a
fixed missing convert to new session handler
2013-05-28 17:06:37 +02:00
6ae7bde788
fixed encryption session namespace to avoid problems
2013-05-28 17:04:35 +02:00
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
09b54ccb2b
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
2013-05-28 11:00:49 +02:00
3a76c22372
$_POST["adminEnableRecovery"] is a string
2013-05-28 10:51:12 +02:00
0041711fe3
fix for undefined index
2013-05-28 09:36:14 +02:00
6f9e425939
fix for losing private key while being logged in and accessing a public link
2013-05-28 09:27:04 +02:00
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
9c99048429
fix syntax error
2013-05-28 01:31:26 +02:00
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
e1e1c58969
changed to public log api
2013-05-27 20:51:52 +02:00
7224fc98b2
replace == with === and replace != with !==
2013-05-27 20:44:38 +02:00
6075aff687
changed basic auth to test user
2013-05-27 20:32:59 +02:00
2c3c60c1af
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php
2013-05-27 18:09:35 +02:00
c81e34ef89
replace == with ===
2013-05-27 18:03:29 +02:00
4c05259ccf
legacyBlockDecryprt() needs to be public
2013-05-27 17:35:38 +02:00
df22a7c495
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
2013-05-27 17:35:28 +02:00
8b35578833
fix migration from old to new encryption
2013-05-27 17:35:06 +02:00
5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
690bf9b8c4
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 17:26:35 +02:00
f8d1c32112
Merge pull request #3506 from owncloud/fix_3320
...
fix https://github.com/owncloud/core/issues/3320
2013-05-27 08:04:55 -07:00
841b420bc4
add event.preventDefault to undelete function
2013-05-27 16:37:43 +02:00
710e9c2d14
fix tests, after unused variables are removed
2013-05-27 15:34:57 +02:00
1a3f7891ea
remove unused varaibles
2013-05-27 15:31:26 +02:00
d408cd7f37
fix https://github.com/owncloud/core/issues/3320
2013-05-27 15:24:37 +02:00
80433fc4c4
Merge branch 'master' into file_encryption_util_is_error
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 14:41:53 +02:00
5e243b48bb
Merge pull request #3481 from owncloud/firsttime_enc
...
fix first time encryption after app was enabled
2013-05-27 05:17:31 -07:00
8cf827ee9d
Merge branch 'master' into file_encryption_tests
2013-05-27 12:54:33 +02:00
89f0c8f39d
added check by numRows()
...
changed to public api where it was possible
reformat code to comply with the coding guidelines
2013-05-27 12:41:55 +02:00
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +02:00
9dd277576a
added users for tests
...
reformat code to meet coding guidelines
2013-05-26 20:44:15 +02:00
c7981abbc9
improved test
...
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
2013-05-26 03:22:16 +02:00
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
788c5940f0
fixed error rising from fetchRow
2013-05-25 23:20:55 +02:00
9a6cd89a69
added OC_DB::isError and logging
2013-05-25 21:33:05 +02:00
dbb6a10364
Merge pull request #3478 from davidak/master
...
small typo fix: added 2 whitespaces
2013-05-25 11:21:21 -07:00
29c8cbf4d1
increase version and add warning
2013-05-25 12:08:18 +02:00
86d72b9a61
LDAP: fix possible recursion
2013-05-25 11:03:58 +02:00
bfa715768a
LDAP: fix handling when LDAP Host is offline
2013-05-25 11:02:51 +02:00
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
Florin Peter
Björn Schießle
icewind1991
Frank Karlitschek
Robin Appelman
Jenkins for ownCloud
blizzz
Michael Gapczynski
Björn Schießle
Georg Ehrke