Robin Appelman
|
cdb2f559a8
|
Fix postLogin hook
|
2013-05-31 19:58:31 +02:00 |
|
Robin Appelman
|
473f3c6916
|
fix typo
|
2013-05-31 18:18:13 +02:00 |
|
Robin Appelman
|
f00844a003
|
fix caching of user objects
|
2013-05-31 17:42:51 +02:00 |
|
Robin Appelman
|
b8b0b7606a
|
initialize the session earlier
|
2013-05-31 17:31:52 +02:00 |
|
Robin Appelman
|
a8fb803319
|
cache instances of \OC\User\User
|
2013-05-31 17:31:27 +02:00 |
Florin Peter
|
a134ffcf2c
|
code optimized and cleaned up unused vars
|
2013-05-31 16:52:33 +02:00 |
|
Robin Appelman
|
542bcf9156
|
Merge branch 'master' into user
|
2013-05-31 16:35:51 +02:00 |
|
Florin Peter
|
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 |
|
Florin Peter
|
2e3bfdb12c
|
check if the decrypted private key is valid on login and on read/write files
|
2013-05-31 13:58:58 +02:00 |
|
Florin Peter
|
1bfe975938
|
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/lib/util.php
|
2013-05-31 12:58:12 +02:00 |
|
Florin Peter
|
1c4c89418b
|
also fix login errors while filesystem is not loaded in app.php
|
2013-05-31 12:56:08 +02:00 |
|
Florin Peter
|
88d74c33af
|
Merge branch 'master' into files_encryption_fs_loaded_fix
|
2013-05-31 12:49:46 +02:00 |
|
FlorinPeter
|
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 |
|
Florin Peter
|
4a0e69f941
|
fix login errors while filesystem is not loaded
|
2013-05-31 11:55:40 +02:00 |
Jenkins for ownCloud
|
a730a72dcb
|
[tx-robot] updated from transifex
|
2013-05-31 02:04:40 +02:00 |
|
Florin Peter
|
96ef926161
|
normalize path to prevent following split to fail
|
2013-05-31 01:57:32 +02:00 |
|
Florin Peter
|
ccdfb59426
|
fix legacy key in until test
|
2013-05-31 01:55:48 +02:00 |
|
Florin Peter
|
8e324aad38
|
fix re-encrypt legacy files
|
2013-05-31 01:36:49 +02:00 |
|
Florin Peter
|
986e9dd362
|
use legacyDecrypt to decrypt key file like the previous files_encryption
|
2013-05-31 01:35:48 +02:00 |
|
Florin Peter
|
4f9cbadfa4
|
fix for autoloader while user logged in and system is in maintenance
|
2013-05-31 01:34:31 +02:00 |
|
Florin Peter
|
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 |
|
Florin Peter
|
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 |
Arthur Schiwon
|
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 |
Jörn Friedrich Dreyer
|
476747ee89
|
Merge pull request #3509 from owncloud/update_jquery_to_1_10
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
|
2013-05-30 06:00:52 -07:00 |
icewind1991
|
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 |
|
Jenkins for ownCloud
|
8e1d9261aa
|
[tx-robot] updated from transifex
|
2013-05-30 02:34:14 +02:00 |
|
Florin Peter
|
6d94b393bf
|
fix share and un-share for single file
|
2013-05-30 01:38:11 +02:00 |
|
Florin Peter
|
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 |
|
Florin Peter
|
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 |
Michael Gapczynski
|
5a47054505
|
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
|
2013-05-29 18:22:54 -04:00 |
|
Michael Gapczynski
|
dbbf195727
|
Only retrieve the current user's permissions
|
2013-05-29 18:08:18 -04:00 |
Thomas Tanghus
|
2ce555fe55
|
Merge pull request #3533 from owncloud/signature-delimiter
fix wrong signature delimiter - fix #3523
|
2013-05-29 14:58:00 -07:00 |
Morris Jobke
|
4a6f774642
|
Merge pull request #3507 from owncloud/remove_unused_vars
remove unused varaibles
|
2013-05-29 14:46:04 -07:00 |
|
Florin Peter
|
d59ae569ba
|
reformat code
|
2013-05-29 23:13:45 +02:00 |
|
Florin Peter
|
838fd1a20a
|
changed " to '
|
2013-05-29 23:11:30 +02:00 |
|
Florin Peter
|
1337f48d64
|
fixes for pgsql
|
2013-05-29 20:41:07 +02:00 |
|
Florin Peter
|
8c6eec7a8f
|
Merge branch 'master' into remove_unused_vars
|
2013-05-29 20:29:09 +02:00 |
|
Florin Peter
|
ee7c4c4c93
|
changed l10n to full sentences
|
2013-05-29 20:27:12 +02:00 |
|
Morris Jobke
|
5c04b3a63a
|
fix wrong signature delimiter - fix #3523
|
2013-05-29 20:21:48 +02:00 |
|
Florin Peter
|
f1b884aa5d
|
changed deprecated class
|
2013-05-29 20:15:04 +02:00 |
|
Florin Peter
|
df41a60c50
|
fixed typo
|
2013-05-29 20:11:53 +02:00 |
|
Florin Peter
|
353d19d183
|
fixes if cache returns false
|
2013-05-29 20:11:13 +02:00 |
|
Florin Peter
|
c8d1cd224d
|
fix $parent/$source typo
|
2013-05-29 19:58:05 +02:00 |
|
Michael Gapczynski
|
5bbc583b56
|
Merge pull request #3532 from owncloud/scan-update
Only update metadata that has changed
|
2013-05-29 10:23:41 -07:00 |
|
Florin Peter
|
1202ab9995
|
Merge branch 'master' into file_encryption_external_storage_fixes
|
2013-05-29 19:19:40 +02:00 |
|
Florin Peter
|
d265264542
|
fix for share folder on external storage
|
2013-05-29 19:11:39 +02:00 |
|
icewind1991
|
8a5dec7775
|
Merge pull request #3530 from owncloud/cache-mimeicon
Cache mimetype icons
|
2013-05-29 08:20:58 -07:00 |
|
Michael Gapczynski
|
59655e9afd
|
Style fixes
|
2013-05-29 10:56:28 -04:00 |
|
Michael Gapczynski
|
ea55367678
|
Organize conditionals in a better order
|
2013-05-29 10:40:05 -04:00 |
|
Michael Gapczynski
|
04805d0be9
|
Only update metadata that has changed
|
2013-05-29 10:19:03 -04:00 |