summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17378 from owncloud/kill-more-legacy-classesMorris Jobke2015-07-0353-555/+184
|\ | | | | Kill more legacy classes
| * Fix unit testThomas Müller2015-07-031-1/+0
| |
| * Fixing unit test executionThomas Müller2015-07-032-4/+3
| |
| * Remove OC_AppconfigThomas Müller2015-07-037-172/+41
| |
| * Remove OC_LogThomas Müller2015-07-0345-209/+142
| |
| * Remove legacy search classesThomas Müller2015-07-034-171/+0
|/
* Merge pull request #17379 from owncloud/kill-file-mapperVincent Petry2015-07-037-1240/+282
|\ | | | | Remove file mapper - was only use in Windows and never worked properly
| * Remove file mapper - was only use in Windows and never worked properlyThomas Müller2015-07-037-1240/+282
| |
* | Merge pull request #16923 from owncloud/flysystem-baseThomas Müller2015-07-031-0/+243
|\ \ | | | | | | Flysystem base adapter
| * | also dont download existing on fopen when using w+ and wb+Robin Appelman2015-07-031-2/+2
| | |
| * | add phpdocRobin Appelman2015-07-031-0/+55
| | |
| * | add flysystem adapaterRobin Appelman2015-07-031-0/+188
| |/
* | Merge pull request #15470 from rullzer/files_sharing_getUrlContentVincent Petry2015-07-032-51/+57
|\ \ | | | | | | Move away from private static function OC_Util::getUrlContent
| * | Depreatace OC_Util::getUrlContentRoeland Jago Douma2015-05-181-0/+1
| | | | | | | | | | | | It is just a wrapper and the other functions are deprecated already
| * | Move away from private static deprecated functioRoeland Jago Douma2015-05-181-51/+56
| | |
* | | Merge pull request #17382 from owncloud/remove-bogus-testresultThomas Müller2015-07-031-0/+0
|\ \ \ | |_|/ |/| | Remove bogus test result
| * | Remove bogus test resultVincent Petry2015-07-031-0/+0
|/ / | | | | | | | | This file was created during a bogus test run that created files in the wrong location, and was checked in by mistake.
* | Merge pull request #17365 from owncloud/update-refThomas Müller2015-07-031-0/+0
|\ \ | | | | | | Update reference to include newest php-parser
| * | Update reference to include newest php-parserLukas Reschke2015-07-031-0/+0
| | |
* | | Merge pull request #17140 from owncloud/trashbin_occBjörn Schießle2015-07-033-0/+339
|\ \ \ | | | | | | | | add occ command to remove deleted files
| * | | add occ command to trashbin to remove deleted filesBjoern Schiessle2015-06-243-0/+339
| | | |
* | | | Merge pull request #17348 from owncloud/fix-lower-thanMorris Jobke2015-07-032-12/+64
|\ \ \ \ | | | | | | | | | | Correct lower than wording
| * | | | fix wordingMorris Jobke2015-07-032-2/+2
| | | | |
| * | | | Correct wordingLukas Reschke2015-07-022-2/+2
| | | | | | | | | | | | | | | | | | | | If a max version of 8.0.1 has been specified the message should indicate that 8.0.1 is also supported.
| * | | | Add missing type annotationsLukas Reschke2015-07-022-10/+62
| | | | |
* | | | | Merge pull request #15663 from owncloud/remove-ocp-app-registerThomas Müller2015-07-031-12/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Remove \OCP\App::register()
| * | | | Remove \OCP\App::register()Morris Jobke2015-04-211-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method can be removed. This isn't used anymore since 4.5.0. It's deprecated since mid 2012 https://github.com/owncloud/core/commit/e4679770c4d85896bef3e81125e86e272bb6cd64 It doesn't do anything since mid 2012 https://github.com/owncloud/core/commit/8a92cd21d6768fc27c4892583bef327da9a7e5f4
* | | | | Merge pull request #17345 from owncloud/app-code-check-searchLukas Reschke2015-07-031-0/+2
|\ \ \ \ \ | | | | | | | | | | | | [app code check] add OC_Search_Provider and _Result
| * | | | | [app code check] add OC_Search_Provider and _ResultMorris Jobke2015-07-021-0/+2
| | |/ / / | |/| | | | | | | | | | | | | Thanks to @libasys for noticing this.
* | | | | Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailableMorris Jobke2015-07-032-1/+18
|\ \ \ \ \ | | | | | | | | | | | | Do not show static share owner if not available
| * | | | | Do not show static share owner if not availableVincent Petry2015-07-022-1/+18
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some corner cases, an outgoing share exists but sharing is not allowed for the current user. This would cause the file list to break because the static text could not be rendered as the owner was undefined.
* | | | | 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
| | | | | | | |