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

15187 Commits

Author SHA1 Message Date
Vincent Petry c06d8bb007 Fixed normalizePath() to strip out single dot dirs 
Now removing "/./" and trailing "/." from the paths when normalizing.
 2013-11-14 13:15:03 +01:00
Bjoern Schiessle 2624a6cb32 remove debug output 2013-11-14 12:13:22 +01:00
Bjoern Schiessle 2df3763675 test encryptAll() and decryptAll() to make sure that mtime and etag stay the same 2013-11-14 12:11:21 +01:00
tomneedham 1449437c9e Merge multiple failed third party responses when returning the result 2013-11-14 01:21:54 +00:00
tomneedham bb182bbfb2 Merge multiple shipped failures before responding. 2013-11-14 01:19:46 +00:00
tomneedham ca5c39a3a1 Return failed shipped responses over succedded shipped responses 2013-11-14 01:14:37 +00:00
tomneedham 5a2d700866 Fix type in unit test 2013-11-14 01:11:22 +00:00
tomneedham a39f3fdbf9 Return result object when only one successful response is returned 2013-11-14 01:10:56 +00:00
tomneedham 790055571d Update lib/private/api.php after merge conflict 2013-11-14 01:00:14 +00:00
tomneedham b06682b7fb Merge branch 'ocs_api_fix_success_code' into oc_api_tests 2013-11-14 00:41:04 +00:00
tomneedham 00944a376a Merge branch 'master' into oc_api_tests 2013-11-14 00:40:57 +00:00
tomneedham 959513fdc8 Add tests for OC_API::mergeResponses() 2013-11-14 00:40:09 +00:00
tomneedham f19caeed33 Remove OC_App dependancy from OC_API::mergeResponses() 2013-11-13 22:46:24 +00:00
Frank Karlitschek 8d0d0836ba Merge branch 'master' of https://github.com/owncloud/core 2013-11-13 19:43:18 +01:00
Frank Karlitschek cd4a816c11 beta 4 2013-11-13 19:42:52 +01:00
Frank Karlitschek 58ff8a8673 Merge pull request #5805 from owncloud/shared-storage-copy-folder 
Use View::copy and View::rename when copying or renaming files in the shared storage
 2013-11-13 10:17:37 -08:00
Arthur Schiwon 84a882c651 LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take too much awareness 2013-11-13 19:07:28 +01:00
Arthur Schiwon 7a61dcadd2 LDAP Wizard: move status indicator in one line with back and continue buttons 2013-11-13 19:07:28 +01:00
Arthur Schiwon 4ee296051b LDAP Wizard: introduce configuration status indicator, fixes #5741 2013-11-13 19:07:28 +01:00
Frank Karlitschek 15c4e4ed09 Merge pull request #5806 from owncloud/styles-fix-external_storage 
Fix spacing issue for checkboxes, vertically center checkboxes on person...
 2013-11-13 07:43:59 -08:00
Morris Jobke 5aae550b11 Merge pull request #5809 from owncloud/fix5753 
LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
 2013-11-13 06:52:07 -08:00
Morris Jobke 408ce91b25 Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-home-only 
Do not use -1 as the size for the root folder of the home storage
 2013-11-13 05:57:16 -08:00
Morris Jobke ac0e87b1cc Merge pull request #5831 from owncloud/files-charatissue 
Fixed total dirs/files message hiding condition
 2013-11-13 05:22:48 -08:00
Bjoern Schiessle 222fa88eec Merge branch 'master' into encryption_fixes 2013-11-13 12:11:12 +01:00
Vincent Petry 3fa651f2b1 Merge pull request #5447 from owncloud/fixing-5117-master 
No data corruption duriing parallel upload
 2013-11-13 02:59:34 -08:00
Vincent Petry 5bdfccfc47 Fixed total dirs/files message hiding condition 
Fixes #5829
 2013-11-13 10:53:16 +01:00
Tom Needham 17e45e2002 Pick any none 100 status code before defaulting to 100 2013-11-13 00:45:49 +00:00
Thomas Tanghus ec51825d31 Use dedicated OC_Image loader methods 
This prevents excessive logging and disk access
 2013-11-13 00:36:42 +01:00
Bjoern Schiessle dd0ebcede2 fixPartialFilePath() is now stripPartialFileExtension() 2013-11-12 18:48:31 +01:00
Vincent Petry 34c92f6656 Now using HomeStorage for legacy home storage ids 
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
 2013-11-12 18:01:02 +01:00
Bjoern Schiessle 77429c28fd rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does 2013-11-12 16:48:24 +01:00
Vincent Petry 1a65e3a725 Now calling parent method when path is not root 2013-11-12 16:15:44 +01:00
Robin Appelman 32a703ab36 Do not use -1 as the size for the root folder of the home storage 2013-11-12 16:15:43 +01:00
Morris Jobke dc30056025 Merge pull request #5822 from owncloud/delete_hooks_trash_and_versions 
Implement delete hooks for trashbin and filesversions apps.
 2013-11-12 07:03:37 -08:00
Bjoern Schiessle e2fb8d7128 only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry 2013-11-12 15:55:59 +01:00
Bjoern Schiessle 894856ce01 make sure that we keep the correct timestamp and etag after encryoption/decryption 2013-11-12 15:51:51 +01:00
Robin Appelman abc428916c Fix fatal error when trying to open a non existing public link 2013-11-12 15:38:00 +01:00
Georg Ehrke 49cd5dad24 add trash bin and file versions delete hooks in OC::registerPreviewHooks 2013-11-12 14:08:55 +01:00
Georg Ehrke 238e4bc3eb implement delete hooks in file versions lib 2013-11-12 14:06:32 +01:00
Georg Ehrke 90fac1f371 replace $path with '/files_trashbin/files/' . $file 2013-11-12 14:03:50 +01:00
Georg Ehrke feee4b865b add delete hook for trash bin app 2013-11-12 14:00:36 +01:00
Oliver Gasser 53f17a71d1 treat numeric as an alias for decimal 2013-11-12 13:55:20 +01:00
Oliver Gasser 4b01eaf6cc changed type to decimal 2013-11-12 13:47:47 +01:00
Morris Jobke 9c1c8d57f0 fix DB schema test - no default value 2013-11-12 13:45:28 +01:00
Morris Jobke a745901d50 Merge pull request #5810 from owncloud/disbaledtextareas 
Disabled textareas should look like they are disabled
 2013-11-12 02:34:51 -08:00
Morris Jobke c9517c4fc8 new line for css rule 2013-11-12 11:31:58 +01:00
Oliver Gasser 95b3eb2c75 Add DB tests for default numeric 
Add a table with a numeric column and an empty default directive.
 2013-11-12 11:27:57 +01:00
Bjoern Schiessle fcbb5d6cb3 missed some replacements... now tests should work 2013-11-12 11:17:34 +01:00
Thomas Müller 735752f232 Merge pull request #5816 from Wikinaut/patch-1 
Update config.sample.php
 2013-11-12 02:12:06 -08:00
Bjoern Schiessle 9f10f15fd4 fixing tests for the new part file handling 2013-11-12 10:24:10 +01:00