mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
56,476 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

56476 Commits

Author SHA1 Message Date
Florin Peter b840de4e01 user should set into session before postLogin hook otherwise it will break not only the files_encryption app 2013-05-31 21:30:13 +02:00
blizzz 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
Florin Peter d85a10ebc5 fix broken tests 2013-05-31 20:55:05 +02:00
Florin Peter 8761242f52 Merge branch 'master' into files_encryption_upgrade_fix 
Conflicts:
	apps/files_encryption/appinfo/app.php
 2013-05-31 20:34:43 +02:00
blizzz 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
Arthur Schiwon 2ff9677cd1 LDAP: sqlite compatibility for emptyiing tables 2013-05-31 20:07:13 +02:00
Arthur Schiwon c49ee4d3e3 LDAP: fix setting value of checkbox after loading configuration 2013-05-31 20:06:40 +02:00
FlorinPeter 35e83f8fed Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fix 
fix login errors while filesystem is not loaded
 2013-05-31 11:02:33 -07:00
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
Georg Ehrke a11a40d9a9 add backend for microsoft office 2007 documents 2013-05-31 12:23:51 +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
Michael Gapczynski 8be23efa73 Implement hasUpdated() to watch for changes on Google Drive side 2013-05-30 21:45:16 -04: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
Thomas Tanghus ad5c4bf771 Cleanup hacke v.2 2013-05-31 00:53:57 +02:00
Thomas Tanghus e21649ccff Revert "Clean up hack." 
This reverts commit 138c7f615b.
 2013-05-31 00:53:15 +02:00
Thomas Tanghus 138c7f615b Clean up hack. 2013-05-31 00:28:03 +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
Michael Gapczynski bd0d189f6f Merge branch 'master' into googledrive 2013-05-30 11:20:22 -04: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
Georg Ehrke f7c80a391d load getID3 only if needed 2013-05-30 15:29:38 +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
Georg Ehrke b944b1c5d2 add javascript preview backend 2013-05-30 11:12:12 +02:00
Georg Ehrke a014662c52 improve imagick error handling 2013-05-30 11:06:52 +02:00
Georg Ehrke 5433a50461 validate size of file 2013-05-30 10:44:27 +02: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