summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9502 from owncloud/add_ocsidsMorris Jobke2014-07-071-0/+3
|\
| * add ocsids to info.xmlGeorg Ehrke2014-07-071-0/+3
* | Merge pull request #9494 from owncloud/issue/9490Morris Jobke2014-07-072-4/+12
|\ \ | |/ |/|
| * Only calculate the WEBROOT from scriptName if it contains $SUBURIJoas Schilling2014-07-071-3/+11
| * Only overwrite serverHost when in unit testsJoas Schilling2014-07-071-1/+1
* | MySQL: adding repair step to convert MyIsam tables to InnoDBThomas Müller2014-07-072-0/+52
* | Merge pull request #9468 from owncloud/fix_logout_error_messagesVincent Petry2014-07-071-1/+4
|\ \ | |/ |/|
| * fix phpDocBlock for OC_App::getAppInfoGeorg Ehrke2014-07-051-1/+1
| * better validation: cadd extra check if appinfo/info.xml existsGeorg Ehrke2014-07-051-0/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-072-0/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-062-3/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-052-1/+31
* | Merge pull request #9419 from owncloud/fix_search_results_in_root_dirJörn Friedrich Dreyer2014-07-041-0/+4
|\ \
| * | deprecate OC_Search_Provider in favor of \OCP\Search\ProviderJörn Friedrich Dreyer2014-07-031-0/+4
* | | Merge pull request #9357 from owncloud/sharing_unshare_on_deleteBjörn Schießle2014-07-041-3/+13
|\ \ \
| * | | make sure that the umount hook always contains the path relative to data/user...Bjoern Schiessle2014-07-041-3/+13
* | | | Merge pull request #9445 from owncloud/filelist-auth-erroricewind19912014-07-041-6/+6
|\ \ \ \
| * | | | Add machine readable error messages to OC\JSONRobin Appelman2014-07-041-6/+6
| | |_|/ | |/| |
* | | | Merge pull request #8308 from owncloud/case_insensitive_search_oracleJörn Friedrich Dreyer2014-07-041-3/+21
|\ \ \ \ | |/ / / |/| | |
| * | | make search case insensitive on postgres and oracleJörn Friedrich Dreyer2014-07-031-3/+21
* | | | Merge pull request #9269 from owncloud/fix_versions_previewThomas Müller2014-07-043-0/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | introduce and use getCurrentConnection()Jörn Friedrich Dreyer2014-07-013-1/+25
| * | | reset collection to 'root' after adding a route to the apiJörn Friedrich Dreyer2014-07-011-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-044-2/+33
* | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |