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

3674 Commits

Author SHA1 Message Date
Florin Peter 31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +02:00
Florin Peter 58a8d67a9b fix for webdav because initMounts() is triggered twice so we lost the root path 2013-05-20 01:57:16 +02:00
Florin Peter b3b6738d59 Revert "fix for webdav and wrong reference for findByStorageId" 
This reverts commit 079f918d5c.
 2013-05-20 01:47:35 +02:00
Florin Peter 079f918d5c fix for webdav and wrong reference for findByStorageId 2013-05-19 22:30:03 +02:00
Michael Gapczynski 67729f5f9f Merge pull request #3421 from owncloud/pre_login_password 
Add password to pre_login
 2013-05-19 10:09:24 -07:00
Lukas Reschke 7ec36c5bbb Add password to pre_login 
I need this to intercept passwords for my WIP multi-factor
authentication app.
 2013-05-19 13:33:33 +02:00
FlorinPeter 0f314c1404 Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup 
fix for SQLite3Result::fetchArray() on setup
 2013-05-17 01:55:28 -07:00
Jenkins for ownCloud 6a6079176b [tx-robot] updated from transifex 2013-05-17 02:07:36 +02:00
Florin Peter d7dc710c8b revert changes 2013-05-17 01:22:30 +02:00
Florin Peter a92dead754 only connect share hooks if installation OC is installed 2013-05-17 01:20:02 +02:00
Florin Peter 469d6028ad revert changes 2013-05-17 01:17:55 +02:00
Björn Schießle 95297c2469 add pre-shared hooks 2013-05-16 17:44:28 +02:00
Björn Schießle 9d1e60325c allow admin to recover users files in case of password lost 2013-05-16 14:53:04 +02:00
Jenkins for ownCloud 966c2231e3 [tx-robot] updated from transifex 2013-05-16 02:01:37 +02:00
Thomas Mueller 5dcec346e5 Merge branch 'master' into fix-3353 2013-05-15 23:43:46 +02:00
Thomas Müller dfddaf8fbf Merge pull request #3374 from owncloud/vobject_compound_property 
Add Compound property to avoid double escaping values.
 2013-05-15 14:34:16 -07:00
Florin Peter c50bf3e3c5 fix for losing mount point "/" 2013-05-15 20:09:02 +02:00
Florin Peter 68059b1ec3 fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup 2013-05-15 19:49:40 +02:00
Thomas Tanghus cb41a30b00 Add Compound property to avoid double escaping values. 2013-05-15 18:56:54 +02:00
Florin Peter 0916769f67 fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup 2013-05-15 17:00:01 +02:00
Michael Gapczynski d91161186b Fix finding mount in background watcher, fixes #3353 2013-05-15 09:33:38 -04:00
Florin Peter 751487ded7 merge changes for files_encryption 2013-05-15 10:20:19 +02:00
Florin Peter 807740a07a fix for losing mount point "/" 2013-05-15 10:19:38 +02:00
Florin Peter 226aec8d56 Merge branch 'master' into files_encryption 2013-05-15 03:22:06 +02:00
Frank Karlitschek 0e55accee2 Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues. 2013-05-13 02:42:18 +02:00
Morris Jobke c5cb3f9577 Merge pull request #3311 from owncloud/disable_mbstring.func_overload 
disable mbstring.func_overload in setup v.3
 2013-05-12 03:28:18 -07:00
Thomas Tanghus baf058316c disable mbstring.func_overload in setup 2013-05-12 10:56:32 +02:00
Lukas Reschke 63d51980e1 Get config from template 2013-05-12 10:51:21 +02:00
Jenkins for ownCloud 74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Morris Jobke 9f3c156aca Merge pull request #3283 from owncloud/move-legacy-fs 
Move legacy filesystem classes
 2013-05-10 07:53:04 -07:00
Jörn Friedrich Dreyer 9134395b43 don't emit rename hooks on partial file renames 2013-05-10 12:01:50 +02:00
Jörn Friedrich Dreyer c3b0d3d38c rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted 2013-05-10 12:00:13 +02:00
Björn Schießle 2e81efc37e don't call correctFolder() in touchHook, it will be called later in the writeUpdate() 2013-05-08 23:00:24 +02:00
Björn Schießle 0e30e68b22 update etag for for the touched file 2013-05-08 23:00:03 +02:00
Robin Appelman d9c19fa8d7 Move legacy filesystem classes 2013-05-08 16:48:47 +02:00
FlorinPeter e8a80c6c2f Merge pull request #3271 from owncloud/fix_for_util_tearDownFS 
fix for tearDownFS, after filesystem::tearDown() in Util
 2013-05-08 05:43:54 -07:00
Robin Appelman 71fc4a2cf4 Autoloader: fix loading app clases located in lib/ 2013-05-08 00:50:33 +02:00
Robin Appelman 2a01d39940 Autoloader: load the 3rdparty libraries using prefixes 2013-05-07 23:07:47 +02:00
Robin Appelman 0d25c0001c check for setlocale after setting up the paths to prevent autoloader confusion 2013-05-07 22:53:07 +02:00
Robin Appelman 6d903cf7ae Autoloader: add support for custom namespace paths 2013-05-07 22:39:35 +02:00
Robin Appelman 72ed74f28a Autoloader: split getting the class paths and loading the class 2013-05-07 22:26:55 +02:00
Florin Peter 03d8907df8 fix for tearDownFS, after filesystem::tearDown() the root is not mounted 2013-05-07 22:26:16 +02:00
Robin Appelman cac86bb4db Allow disabling the global classpath in an autoloader 2013-05-07 22:24:47 +02:00
Robin Appelman d1fcb7eb52 Allow the autoloader to try mutliple possible paths for each path 2013-05-07 22:21:59 +02:00
Robin Appelman 19cfe74bf5 Add per-autoloader classPath 2013-05-07 22:19:00 +02:00
Robin Appelman 0b5f6b9c13 Move autoloader to it's own class 2013-05-07 22:16:17 +02:00
icewind1991 5b61c5d478 Merge pull request #3044 from owncloud/backgroundwatcher 
Add a background job to watch for external filesystem changes
 2013-05-07 10:00:00 -07:00
Michael Gapczynski 349a533f66 Merge pull request #3025 from owncloud/move-file 
Cache: only look for child entires when doing a move operation when moving a folder
 2013-05-07 07:52:57 -07:00
Bart Visscher 398fbb61f8 Merge pull request #2813 from owncloud/improve-lib-check 
added correct check for gd and check for php-intl
 2013-05-07 06:12:40 -07:00
Morris Jobke 2b9da8a6c9 remove hard php-intl requirement 2013-05-07 13:51:30 +02:00