summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | [Repair] add repair info for changed collationMorris Jobke2015-07-071-0/+1
| * | | | | | [upgrade] add verbosity check and show repair info & stepsMorris Jobke2015-07-072-0/+15
| |/ / / / /
* | | | | | Merge pull request #17431 from owncloud/stable8.1-update-readmeThomas Müller2015-07-072-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update README version and bowerVincent Petry2015-07-072-3/+3
|/ / / / /
* | | | | 8.1.0v8.1.0C Montero-Luque2015-07-021-2/+2
* | | | | Merge pull request #17356 from owncloud/stable8.1-apps-keepgloballistLukas Reschke2015-07-022-2/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix global app list stateVincent Petry2015-07-022-2/+29
|/ / / /
* | | | Merge pull request #17317 from owncloud/stable81-clean-ocsidLukas Reschke2015-07-026-5/+7
|\ \ \ \
| * | | | Bump versionsLukas Reschke2015-07-025-5/+5
| * | | | Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
| | |/ / | |/| |
* | | | Merge pull request #17311 from owncloud/stable81-remove-ocs-idsLukas Reschke2015-07-025-5/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | [stable81] Remove OCS IDsLukas Reschke2015-07-025-5/+0
| |/ /
* | | Merge pull request #17308 from owncloud/stable8.1-backport-17293Björn Schießle2015-07-022-2/+1
|\ \ \ | |/ / |/| |
| * | Revert "fix z-index of share-autocomplete"Jan-Christoph Borchardt2015-07-021-1/+0
| * | Revert "explicitly set z-index on app-content, fix overlap from navigation"Jan-Christoph Borchardt2015-07-021-1/+1
|/ /
* | Merge pull request #17266 from owncloud/stable8.1-backport-17224Thomas Müller2015-07-012-29/+86
|\ \
| * | Avoid namespace clashThomas Müller2015-07-011-5/+4
| * | Fixing content type detection and handle all local printErrorPage callsThomas Müller2015-07-011-12/+29
| * | Adding request specific exception handling - now with WebDAV responses - refs...Thomas Müller2015-07-011-7/+33
| * | Adding exception handling for ServerNotAvailableException - refs #17192Thomas Müller2015-07-011-18/+33
| |/
* | Merge pull request #17267 from owncloud/stable8.1-backport-17264Morris Jobke2015-07-012-4/+11
|\ \ | |/ |/|
| * Use UTF-8 mode for preg_split and preg_replaceLukas Reschke2015-07-012-4/+11
|/
* Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendis...Vincent Petry2015-06-301-1/+4
|\
| * Do not set callback wrapper when locking is disabledVincent Petry2015-06-301-1/+4
* | Merge pull request #17225 from owncloud/fix_12106Björn Schießle2015-06-301-3/+19
|\ \
| * | if it is a mount point we need to get the path from the mount managerBjoern Schiessle2015-06-301-3/+19
* | | Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-...Vincent Petry2015-06-301-2/+6
|\ \ \
| * | | Perform the filesize only when the file existsJoas Schilling2015-06-301-2/+6
| | |/ | |/|
* | | Merge pull request #17189 from owncloud/files-straypartfilesonexceptionMorris Jobke2015-06-304-61/+416
|\ \ \ | |/ / |/| |
| * | Unlock first path on rename if second path is lockedVincent Petry2015-06-292-1/+39
| * | Cleanup part file after upload exceptionVincent Petry2015-06-292-60/+377
* | | Merge pull request #17249 from owncloud/file-cache-is-a-icacheJoas Schilling2015-06-302-1/+5
|\ \ \
| * | | Fixing "ImportController::__construct() must implement interface OCP\\ICache,...Thomas Müller2015-06-292-1/+5
| |/ /
* | | Merge pull request #17239 from owncloud/files-nameconflictfixThomas Müller2015-06-291-3/+2
|\ \ \
| * | | Fix class name conflictVincent Petry2015-06-291-3/+2
| |/ /
* | | Merge pull request #17240 from owncloud/do-not-rely-on-php-being-fastThomas Müller2015-06-291-5/+5
|\ \ \ | |/ / |/| |
| * | Do not rely on actual time in unit testsLukas Reschke2015-06-291-5/+5
|/ /
* | Merge pull request #17231 from owncloud/add-missing-version-fieldMorris Jobke2015-06-292-6/+6
|\ \
| * | Typehint $targetVersionLukas Reschke2015-06-291-4/+4
| * | Add missing version fieldLukas Reschke2015-06-291-2/+2
* | | Merge pull request #17229 from owncloud/maintenance-plugin-testJoas Schilling2015-06-294-5/+92
|\ \ \ | |/ / |/| |
| * | Fixing ctor calls and ctor itself to not break usage in calendar and contacts...Thomas Müller2015-06-293-3/+3
| * | Unit tests added for MaintenancePluginThomas Müller2015-06-292-3/+90
* | | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-295-35/+58
|\ \ \ | |/ / |/| |
| * | Send OC version to appstore so it can reply with the right linksJoas Schilling2015-06-295-35/+58
| |/
* | Merge pull request #17030 from owncloud/lock-posthooksJoas Schilling2015-06-296-25/+706
|\ \
| * | Remove test-specific method to make Bjoern and Joas happyVincent Petry2015-06-262-10/+1
| * | Release locks after class in testsVincent Petry2015-06-251-0/+8
| * | Keep shared locks in post hooksVincent Petry2015-06-257-25/+707
* | | Merge pull request #17226 from owncloud/webdav-add-message-on-maintenanceMorris Jobke2015-06-291-11/+13
|\ \ \