summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump versionsLukas Reschke2015-07-025-5/+5
* Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
* Merge pull request #17293 from owncloud/revert-z-indexMorris Jobke2015-07-022-2/+1
|\
| * Revert "fix z-index of share-autocomplete"Jan-Christoph Borchardt2015-07-011-1/+0
| * Revert "explicitly set z-index on app-content, fix overlap from navigation"Jan-Christoph Borchardt2015-07-011-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0260-32/+292
* | Merge pull request #17295 from owncloud/scanfilesignatureLukas Reschke2015-07-011-1/+3
|\ \ | |/ |/|
| * Fix scanFile signature to avoid boring warningVincent Petry2015-07-011-1/+3
* | This will be 8.2 in the futureFrank Karlitschek2015-07-012-3/+3
* | Merge pull request #17252 from owncloud/fix-php-errors-in-app-descriptionMorris Jobke2015-07-012-15/+23
|\ \ | |/ |/|
| * Only do the description kung-fu on strings - fixes #17028Thomas Müller2015-07-012-15/+23
* | Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonceVincent Petry2015-07-011-4/+8
|\ \
| * | Only delete part file on error if it is really a part fileVincent Petry2015-07-011-2/+6
| * | Clean up part file only once, not twice on errorVincent Petry2015-07-011-2/+2
* | | Merge pull request #17285 from Rechenzentrum-Universitaet-Augsburg/masterLukas Reschke2015-07-011-2/+2
|\ \ \ | |_|/ |/| |
| * | Changed broken links to php manualMichael Roth2015-07-011-2/+2
|/ /
* | Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypesVincent Petry2015-07-011-13/+7
|\ \
| * | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
| |/
* | Merge pull request #15363 from owncloud/ext-ocpMorris Jobke2015-07-019-49/+70
|\ \ | |/ |/|
| * Use OCP classes as much as possible in files_externalRobin McCorkell2015-07-019-49/+70
|/
* Merge pull request #17088 from owncloud/add-verbosity-to-upgradeMorris Jobke2015-07-013-0/+16
|\
| * [Repair] add repair info for changed collationMorris Jobke2015-06-241-0/+1
| * [upgrade] add verbosity check and show repair info & stepsMorris Jobke2015-06-242-0/+15
* | Merge pull request #17093 from owncloud/upgrade-timestampMorris Jobke2015-07-012-3/+119
|\ \
| * | Use a OutputFormatter instead of hacking into writeln()Joas Schilling2015-06-242-49/+133
| * | Use logtimezone and logdateformatJoas Schilling2015-06-241-2/+5
| * | [upgrade] show timestamp for output during upgradeMorris Jobke2015-06-241-14/+43
| |/
* | Merge pull request #17078 from owncloud/fix-initial-server-hostMorris Jobke2015-07-012-8/+96
|\ \
| * | Fix undefined offsetLukas Reschke2015-06-222-8/+96
* | | Merge pull request #16535 from rullzer/ocs_share_api_urlMorris Jobke2015-07-012-0/+55
|\ \ \
| * | | OCS Share API link shares now always have an urlRoeland Jago Douma2015-05-222-0/+55
* | | | Merge pull request #16406 from owncloud/enc-strlenperffixMorris Jobke2015-07-011-1/+1
|\ \ \ \
| * | | | Small perf tweak in strlen loopVincent Petry2015-05-181-1/+1
* | | | | Merge pull request #15569 from owncloud/remove-getetag-propertiesMorris Jobke2015-07-013-0/+138
|\ \ \ \ \
| * | | | | Remove unneeded getetag entries in properties tableMorris Jobke2015-06-253-0/+138
* | | | | | Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_utilMorris Jobke2015-07-0112-33/+33
|\ \ \ \ \ \
| * | | | | | Move core apps from OC_Log::write to OCP\UtilRoeland Jago Douma2015-05-1812-33/+33
* | | | | | | Merge pull request #15475 from rullzer/files_sharing_OCP_DBMorris Jobke2015-07-017-14/+14
|\ \ \ \ \ \ \
| * | | | | | | Move files sharing app (mostly) to OCP\DBRoeland Jago Douma2015-05-187-14/+14
| |/ / / / / /
* | | | | | | Merge pull request #17224 from owncloud/webdav-handle-ServerNotAvailableExcep...Vincent Petry2015-07-012-29/+86
|\ \ \ \ \ \ \
| * | | | | | | Avoid namespace clashThomas Müller2015-06-301-5/+4
| * | | | | | | Fixing content type detection and handle all local printErrorPage callsThomas Müller2015-06-301-12/+29
| * | | | | | | Adding request specific exception handling - now with WebDAV responses - refs...Thomas Müller2015-06-301-7/+33
| * | | | | | | Adding exception handling for ServerNotAvailableException - refs #17192Thomas Müller2015-06-301-18/+33
* | | | | | | | Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlockVincent Petry2015-07-013-10/+107
|\ \ \ \ \ \ \ \
| * | | | | | | | Catch cache garbage collection exception on postLoginVincent Petry2015-06-301-2/+8
| * | | | | | | | Test for chunk cache garbage collectionVincent Petry2015-06-301-5/+89
| * | | | | | | | Do not try clearing locked files in cache folderVincent Petry2015-06-301-3/+10
| |/ / / / / / /
* | | | | | | | Merge pull request #17264 from owncloud/use-mb-functionsThomas Müller2015-07-012-4/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Use UTF-8 mode for preg_split and preg_replaceLukas Reschke2015-07-012-4/+11