aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17291 from owncloud/mount-manager-publicVincent Petry2015-07-035-5/+127
|\ | | | | expose the mount manager in the public api
| * fix typehintingRobin Appelman2015-07-011-2/+3
| |
| * phpdocRobin Appelman2015-07-011-0/+21
| |
| * expose the mount manager in the public apiRobin Appelman2015-07-015-3/+103
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0334-18/+132
| |
* | Merge pull request #17327 from owncloud/fix_indexMorris Jobke2015-07-022-2/+4
|\ \ | | | | | | owner is stored as 'uid_owner', not as 'owner' in the oc_share table
| * | call post_addToGroup als for class OC_User because sharing and LDAP are ↵Bjoern Schiessle2015-07-021-0/+2
| | | | | | | | | | | | using this class. Minimal approach to fix #16740
| * | owner is stored as 'uid_owner', not as 'owner' in the oc_share tableBjoern Schiessle2015-07-021-2/+2
| | |
* | | Merge pull request #17353 from owncloud/apps-keepgloballistLukas Reschke2015-07-022-2/+29
|\ \ \ | | | | | | | | Fix global app list state
| * | | Unit test for app listVincent Petry2015-07-021-0/+26
| | | |
| * | | Fix global app list stateVincent Petry2015-07-021-2/+3
| | | |
* | | | Merge pull request #17159 from owncloud/fix-duplicate-idMorris Jobke2015-07-021-1/+1
|\ \ \ \ | | | | | | | | | | remove duplicate ID in HTML template for public shares
| * | | | remove duplicate ID in HTML template for public sharesMorris Jobke2015-06-251-1/+1
| | | | |
* | | | | Merge pull request #17343 from owncloud/share-disablepluginwhennocoreshareMorris Jobke2015-07-021-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Do not register JS share plugin if core sharing API is disabled
| * | | | Do not register JS share plugin if core sharing API is disabledVincent Petry2015-07-021-0/+4
|/ / / /
* | | | Merge pull request #17328 from owncloud/revert-15363-ext-ocpThomas Müller2015-07-029-70/+49
|\ \ \ \ | | | | | | | | | | Revert "Use OCP classes as much as possible in files_external"
| * | | | Revert "Use OCP classes as much as possible in files_external"Thomas Müller2015-07-029-70/+49
| | |/ / | |/| |
* | | | Merge pull request #17077 from owncloud/files-scan-absolute-pathMorris Jobke2015-07-024-8/+58
|\ \ \ \ | | | | | | | | | | fix getting mount points when passing a path to the files:scan command
| * | | | handle invalid results from mount providersRobin Appelman2015-06-291-1/+4
| | | | |
| * | | | handle error during setupRobin Appelman2015-06-291-3/+5
| | | | |
| * | | | add unit testRobin Appelman2015-06-292-2/+48
| | | | |
| * | | | fix getting mount points when passing a path to the files:scan commandRobin Appelman2015-06-291-3/+2
| | | | |
* | | | | Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-blockVincent Petry2015-07-021-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Fix duplicated line in doc block
| * | | | | Fix duplicated line in doc blockJoas Schilling2015-07-021-1/+0
| | | | | |
* | | | | | Merge pull request #17321 from rullzer/3rdparty-doctering-v1.2.6Morris Jobke2015-07-021-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Upgrade 3rdparty submodule for docterine v1.2.6
| * | | | | | Upgrade 3rdparty submodule for docterine v1.2.6Roeland Jago Douma2015-07-021-0/+0
| | | | | | |
* | | | | | | Merge pull request #17316 from ↵Joas Schilling2015-07-026-5/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | owncloud/master-delete-ocsid-from-db-if-none-specified [Master] Delete OCS ID from DB if none is specified
| * | | | | | Bump versionsLukas Reschke2015-07-025-5/+5
| | | | | | |
| * | | | | | Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value. Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
* | | | | | Merge pull request #17246 from owncloud/share-lock-owner-parentJoas Schilling2015-07-023-10/+134
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | lock parent folders for the owner when locking a shared file as recipient
| * | | | | only lock the parent foldersRobin Appelman2015-07-012-2/+13
| | | | | |
| * | | | | lock parent folders for the owner when locking a shared file as recipientRobin Appelman2015-07-013-10/+123
| | |_|_|/ | |/| | |
* | | | | Merge pull request #17310 from owncloud/master-remove-ocs-idsThomas Müller2015-07-025-5/+0
|\ \ \ \ \ | |_|/ / / |/| | | | [master] Remove OCS IDs
| * | | | [master] Remove OCS IDsLukas Reschke2015-07-025-5/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* | | | Merge pull request #17293 from owncloud/revert-z-indexMorris Jobke2015-07-022-2/+1
|\ \ \ \ | | | | | | | | | | Revert z-index changes
| * | | | Revert "fix z-index of share-autocomplete"Jan-Christoph Borchardt2015-07-011-1/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 4edf388a3852507886e1fc1c396725ea0a6c8e82.
| * | | | Revert "explicitly set z-index on app-content, fix overlap from navigation"Jan-Christoph Borchardt2015-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 71e5bc180399e75af7b67b4187c19d94b5586a5f.
* | | | | [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 warning
| * | | | 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
| * | | | 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
|\ \ \ \ | | | | | | | | | | Clean up part file only once, not twice on error
| * | | | 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 manual
| * | | | 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 shares
| * | | | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the time it doesn't make sense to forward Guzzle's RequestException, so we convert it to StorageNotAvailable instead. This prevents unpredictable error codes to block access to unrelated folders needlessly.
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-31 22:31:40 +0000