summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9413 from owncloud/fix_hook_namesVincent Petry2014-07-031-2/+2
|\
| * fix hook namesBjoern Schiessle2014-07-031-2/+2
* | Remove forgotten debug logVincent Petry2014-07-031-1/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-033-0/+18
* Merge pull request #9329 from owncloud/sharing_check_targetVincent Petry2014-07-024-9/+40
|\
| * don't move a share mount point into a different mount pointBjoern Schiessle2014-07-011-7/+34
| * add a explicit interface for the home storageBjoern Schiessle2014-07-013-2/+6
* | Merge pull request #9311 from owncloud/storage-not-availableVincent Petry2014-07-025-18/+84
|\ \
| * | Remove invalid mounts from the active fsRobin Appelman2014-07-021-0/+4
| * | Catch StorageInvalidException in webdavRobin Appelman2014-07-011-0/+3
| * | Detect removed public sharesRobin Appelman2014-07-012-0/+25
| * | Handle StorageNotAvailableException in webdavRobin Appelman2014-06-301-1/+6
| * | Add StorageNotAvailableExceptionRobin Appelman2014-06-302-17/+46
* | | Merge pull request #9288 from owncloud/fix_dispatcher_null_valuesMorris Jobke2014-07-021-1/+1
|\ \ \
| * | | don't typecast null values inside dispatcher.phpGeorg Ehrke2014-06-291-1/+1
* | | | Merge pull request #9338 from owncloud/fix-redirect-for-appframeworkVolkan Gezer2014-07-021-0/+2
|\ \ \ \
| * | | | Redirect after session expiry to the previous loaded pageMorris Jobke2014-07-011-0/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-025-2/+79
* | | | | Merge pull request #9327 from owncloud/migrator-postgreskeywordtestVincent Petry2014-07-011-1/+1
|\ \ \ \ \
| * | | | | Fix migrator tests to use the correct migrator instancesVincent Petry2014-07-011-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #9334 from owncloud/defaultappfixVincent Petry2014-07-012-6/+28
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added unit test for default app URLVincent Petry2014-07-011-1/+1
| * | | | Use getAbsoluteUrl for redirection URLVincent Petry2014-07-011-5/+17
| * | | | Support for multiple default appsVincent Petry2014-07-011-3/+11
| * | | | Add bak defaultapp settingVincent Petry2014-07-011-1/+3
* | | | | Merge pull request #9156 from owncloud/solve-8959blizzz2014-07-014-10/+50
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | loop over usernames, not passwordsArthur Schiwon2014-06-301-1/+1
| * | | | extend Dummy user and group implementation to pass testsArthur Schiwon2014-06-252-4/+40
| * | | | return int, not stringArthur Schiwon2014-06-241-1/+5
| * | | | search term for users and groups may occur anywhere in the name or displaynam...Arthur Schiwon2014-06-232-5/+5
* | | | | Merge pull request #9306 from owncloud/publicneedsupgradeJan-Christoph Borchardt2014-07-011-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Return 503 OCS response with requested formatVincent Petry2014-06-301-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #9292 from owncloud/issue/9161Morris Jobke2014-07-011-2/+2
|\ \ \ \
| * | | | Use get random bytes as uniqeid() is not unique in some casesJoas Schilling2014-06-301-2/+2
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2014-07-014-0/+124
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-3012-3/+382
* | | Merge pull request #9266 from owncloud/fix_objectstore_etag_updateThomas Müller2014-06-291-1/+1
|\ \ \
| * | | always regenerate etag when writing back file to objectstoreJörn Friedrich Dreyer2014-06-271-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-291-0/+1
| |_|/ |/| |
* | | more strings to translate in utils also some fixes in defaultsVolkan Gezer2014-06-283-60/+72
* | | Merge pull request #9263 from owncloud/remote-share-updateicewind19912014-06-271-15/+54
|\ \ \ | |/ / |/| |
| * | Fix parsing of webdav permissionsRobin Appelman2014-06-271-1/+2
| * | Also check for updated permissions for webdav storagesRobin Appelman2014-06-271-17/+36
| * | Use the etag to check for updates in webdav storages where availableRobin Appelman2014-06-271-0/+19
* | | Merge pull request #8383 from owncloud/object_storageVincent Petry2014-06-279-22/+849
|\ \ \ | |/ / |/| |
| * | use normalize path to convert '.' to '' in objectstorestorageJörn Friedrich Dreyer2014-06-271-9/+11
| * | update hasUpdated description, overwrtie testStat for objectstore testJörn Friedrich Dreyer2014-06-272-2/+7
| * | fix objectstore test executionJörn Friedrich Dreyer2014-06-261-1/+1
| * | delete object without downloading it firstJörn Friedrich Dreyer2014-06-251-2/+2
| * | Don't bother checking for external updates for objectstore storagesRobin Appelman2014-06-241-1/+11