summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-204-0/+12
|
* Merge pull request #17698 from owncloud/allow-update-of-disabled-appsLukas Reschke2015-07-191-8/+6
|\ | | | | Allow upgrade of not enabled apps
| * Allow upgrade of not enabled appsThomas Müller2015-07-091-8/+6
| |
* | Merge pull request #17540 from owncloud/enc_detect_legacy_files2Björn Schießle2015-07-172-44/+95
|\ \ | | | | | | make sure that we always detect legacy files correctly
| * | set targetIsEncrypted to true if file cache indicates that we try to read a ↵Bjoern Schiessle2015-07-171-0/+1
| | | | | | | | | | | | encrypted file
| * | make sure that we always detect legacy files correctlyBjoern Schiessle2015-07-172-44/+94
| | |
* | | Merge pull request #17682 from owncloud/fix-undefined-REMOTE_ADDR-masterThomas Müller2015-07-171-1/+2
|\ \ \ | | | | | | | | Fixing 'Undefined index: REMOTE_ADDR'
| * | | Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460Thomas Müller2015-07-161-1/+2
| | | |
* | | | Merge pull request #17663 from owncloud/occ-memcacheMorris Jobke2015-07-172-16/+44
|\ \ \ \ | | | | | | | | | | Missing memcache should not cause occ hard-fail
| * | | | Fix memcache factory unit testsRobin McCorkell2015-07-161-2/+2
| | | | |
| * | | | Fix memcache factory creation when not installedRobin McCorkell2015-07-151-4/+3
| | | | | | | | | | | | | | | | | | | | Memcache factory expects a class name, not an instantiated object
| * | | | Missing memcache should not cause occ hard-failRobin McCorkell2015-07-152-12/+41
| | | | | | | | | | | | | | | | | | | | Warning is now printed to logs, but occ and cron will still work.
* | | | | Merge pull request #17282 from owncloud/s2s-catchremotelockexceptionsMorris Jobke2015-07-171-17/+27
|\ \ \ \ \ | |_|_|/ / |/| | | | Throw lock exceptions if remote share returned 423 status code
| * | | | Throw lock exceptions if remote share returned 423 status codeVincent Petry2015-07-031-17/+27
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-172-0/+2
| |_|/ / |/| | |
* | | | Merge pull request #17046 from nicolas-grekas/fix-16654blizzz2015-07-162-17/+7
|\ \ \ \ | |_|/ / |/| | | Do not use OC*::mb_*_replace(), they are useless
| * | | Do not use OC*::mb_*_replace(), they are uselessNicolas Grekas2015-07-162-17/+7
| | | |
* | | | Merge pull request #17620 from owncloud/s2s-hasupdated-catch405Morris Jobke2015-07-141-1/+5
|\ \ \ \ | | | | | | | | | | Throw StorageNotAvailable if propfind on root failed
| * | | | Throw StorageNotAvailable if propfind on root failedVincent Petry2015-07-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | If PROPFIND fails with 404 or 405 on the remote share root, it means the storage is not available. Throw StorageNotAvailable is such case.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-144-0/+4
|/ / / /
* | | | Strip public webdav info about sharing and mount pointsVincent Petry2015-07-131-2/+16
| | | | | | | | | | | | | | | | | | | | Remove information about whether a file is an incoming share or mount point when requested over public webdav.
* | | | Merge pull request #17481 from rullzer/mimetype-listMorris Jobke2015-07-133-202/+12
|\ \ \ \ | | | | | | | | | | Move mimetypes.list.php to config/mimetypemapping.dist.json
| * | | | Move to OC::$configDifRoeland Jago Douma2015-07-101-3/+3
| | | | |
| * | | | Move mimetypemapping.json to mimetypemapping.dist.jsonRoeland Jago Douma2015-07-081-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to create their own mapping file to extend our current mappings. This makes sure that custom mappings are not lost on OC upgrades.
| * | | | Move mimetypes.list.php to config/mimetypemapping.jsonRoeland Jago Douma2015-07-083-202/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to add new mimetypemappings (extention -> mimetype) themself. And not have to wait until a new release for updated mimetypes. Fixes: #15384
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-122-0/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-112-0/+6
| | | | |
* | | | | Move mimetypealiases.json to mimetypealiases.dist.jsonRoeland Jago Douma2015-07-101-1/+6
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-104-6/+14
| | | | |
* | | | | Merge pull request #17517 from RealRancor/fix_failed_login_syntaxMorris Jobke2015-07-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed "Remote IP:" syntax on failed logins
| * | | | | Fixed "Remote IP:" syntax on failed loginsRealRancor2015-07-091-1/+1
| | | | | |
* | | | | | Merge pull request #15586 from Egari/addThemeSupportToMimeIconMorris Jobke2015-07-091-15/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add theme support to mimetypeIcon through imagePath integration
| * | | | | | Add theme support to mimetypeIcon through imagePath integrationstolter2015-07-071-15/+20
| | | | | | |
* | | | | | | Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolderMorris Jobke2015-07-095-24/+42
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add getUserFolder to IRootFolder
| * | | | | | Add getUserFolder to IRootFolderMorris Jobke2015-07-035-24/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * untangle DI of user specific folders * allows to autodetect the dependency
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-092-0/+2
| | | | | | |
* | | | | | | Merge pull request #17472 from RealRancor/add_is_dirMorris Jobke2015-07-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add is_dir check to getAllApps() function
| * | | | | | | Add is_dir check to getAllApps() functionRealRancor2015-07-081-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptionsMorris Jobke2015-07-081-10/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix the path for users which have an exception for a group share
| * | | | | | Make sure the owner always has the right pathJoas Schilling2015-07-071-3/+6
| | | | | | |
| * | | | | | Fix the path for users which have an exception for a group shareJoas Schilling2015-07-021-7/+22
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-082-2/+2
| | | | | | |
* | | | | | | Add missing tunnel on new classJoas Schilling2015-07-071-0/+8
| | | | | | |
* | | | | | | Merge pull request #17399 from rullzer/mimetype-phpMorris Jobke2015-07-071-71/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PHP mimetype stuff should also use config/mimetypealiases.json
| * | | | | | | Make php also use config/mimetypealiases.jsonRoeland Jago Douma2015-07-071-71/+7
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-076-0/+8
|/ / / / / /
* | | | | | Merge pull request #16724 from owncloud/mimetype-jsRoeland Douma2015-07-061-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Javascript to fetch mimetype icons
| * | | | | | Javascript mimetype icon resolverRoeland Jago Douma2015-07-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to retrieve the icon for mimetypes in javascript. It makes no additional queries to the server to retrieve the mimetype. * config/mimetypealiases.json added * mimetype.js: this is where the logic resides to convert from mimetype to icon url * mimetypelist.js: generated file with a list of mimetype mapping (aliases) and the list of icon files * ./occ maintenance:mimetypesjs : new command for occ to gernerate mimetypes.js * unit tests updated and still work * javascript tests added * theming support * folder of the theme is now present in javascript (OC.theme.folder)
* | | | | | | Merge pull request #16924 from owncloud/copy-recursive-polyfillThomas Müller2015-07-061-0/+89
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | add recursive copy polyfill for storage backends
| * | | | | | better handling of foldersRobin Appelman2015-07-031-1/+1
| | | | | | |