summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | [config sample] Update info about appstoreMorris Jobke2015-07-131-1/+0
|/ / /
* | | Merge pull request #17288 from owncloud/stable8.1-chunk-cleanupgracefulonlockMorris Jobke2015-07-093-10/+107
|\ \ \
| * | | Catch cache garbage collection exception on postLoginVincent Petry2015-07-011-2/+8
| * | | Test for chunk cache garbage collectionVincent Petry2015-07-011-5/+89
| * | | Do not try clearing locked files in cache folderVincent Petry2015-07-011-3/+10
* | | | Merge pull request #17518 from owncloud/stable8.1-backport-config-sampleMorris Jobke2015-07-091-105/+117
|\ \ \ \
| * | | | [config sample] improve RST markup and wordingMorris Jobke2015-07-091-16/+26
| * | | | refine sample config textMorris Jobke2015-07-091-9/+12
| * | | | [config sample] merge Miscellaneous & All other optionsMorris Jobke2015-07-091-87/+86
|/ / / /
* | | | Merge pull request #17289 from owncloud/stable8.1-files-cleanuppartfileonlyonceMorris Jobke2015-07-081-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 #17332 from owncloud/fix-temporary-mountpoint-name-in-acti...Morris Jobke2015-07-082-2/+8
|\ \ \ \
| * | | | Use the item name when refering to the unaccepted remote shareJoas Schilling2015-07-022-2/+8
| | |_|/ | |/| |
* | | | Merge pull request #17338 from owncloud/stable8.1-backport-17252Morris Jobke2015-07-082-15/+23
|\ \ \ \
| * | | | Only do the description kung-fu on strings - fixes #17028Thomas Müller2015-07-022-15/+23
| | |_|/ | |/| |
* | | | Merge pull request #17366 from owncloud/fix_16740_8.1Morris Jobke2015-07-082-2/+4
|\ \ \ \
| * | | | call post_addToGroup als for class OC_User because sharing and LDAP are using...Bjoern Schiessle2015-07-031-0/+2
| * | | | owner is stored as 'uid_owner', not as 'owner' in the oc_share tableBjoern Schiessle2015-07-031-2/+2
* | | | | Merge pull request #17370 from owncloud/stable8.1-share-onlyshowstaticownerif...Morris Jobke2015-07-082-1/+18
|\ \ \ \ \
| * | | | | Do not show static share owner if not availableVincent Petry2015-07-032-1/+18
* | | | | | Merge pull request #17417 from owncloud/stable8.1-backport-17159Morris Jobke2015-07-082-2/+2
|\ \ \ \ \ \
| * | | | | | remove duplicate ID in HTML template for public sharesMorris Jobke2015-07-062-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #17429 from owncloud/stable8.1-backport-17088Morris Jobke2015-07-083-0/+16
|\ \ \ \ \ \
| * | | | | | [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