Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-20 | 4 | -0/+12 |
| | |||||
* | Merge pull request #17698 from owncloud/allow-update-of-disabled-apps | Lukas Reschke | 2015-07-19 | 1 | -8/+6 |
|\ | | | | | Allow upgrade of not enabled apps | ||||
| * | Allow upgrade of not enabled apps | Thomas Müller | 2015-07-09 | 1 | -8/+6 |
| | | |||||
* | | Merge pull request #17540 from owncloud/enc_detect_legacy_files2 | Björn Schießle | 2015-07-17 | 2 | -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 Schiessle | 2015-07-17 | 1 | -0/+1 |
| | | | | | | | | | | | | encrypted file | ||||
| * | | make sure that we always detect legacy files correctly | Bjoern Schiessle | 2015-07-17 | 2 | -44/+94 |
| | | | |||||
* | | | Merge pull request #17682 from owncloud/fix-undefined-REMOTE_ADDR-master | Thomas Müller | 2015-07-17 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Fixing 'Undefined index: REMOTE_ADDR' | ||||
| * | | | Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460 | Thomas Müller | 2015-07-16 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #17663 from owncloud/occ-memcache | Morris Jobke | 2015-07-17 | 2 | -16/+44 |
|\ \ \ \ | | | | | | | | | | | Missing memcache should not cause occ hard-fail | ||||
| * | | | | Fix memcache factory unit tests | Robin McCorkell | 2015-07-16 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix memcache factory creation when not installed | Robin McCorkell | 2015-07-15 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | Memcache factory expects a class name, not an instantiated object | ||||
| * | | | | Missing memcache should not cause occ hard-fail | Robin McCorkell | 2015-07-15 | 2 | -12/+41 |
| | | | | | | | | | | | | | | | | | | | | Warning is now printed to logs, but occ and cron will still work. | ||||
* | | | | | Merge pull request #17282 from owncloud/s2s-catchremotelockexceptions | Morris Jobke | 2015-07-17 | 1 | -17/+27 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Throw lock exceptions if remote share returned 423 status code | ||||
| * | | | | Throw lock exceptions if remote share returned 423 status code | Vincent Petry | 2015-07-03 | 1 | -17/+27 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-17 | 2 | -0/+2 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #17046 from nicolas-grekas/fix-16654 | blizzz | 2015-07-16 | 2 | -17/+7 |
|\ \ \ \ | |_|/ / |/| | | | Do not use OC*::mb_*_replace(), they are useless | ||||
| * | | | Do not use OC*::mb_*_replace(), they are useless | Nicolas Grekas | 2015-07-16 | 2 | -17/+7 |
| | | | | |||||
* | | | | Merge pull request #17620 from owncloud/s2s-hasupdated-catch405 | Morris Jobke | 2015-07-14 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Throw StorageNotAvailable if propfind on root failed | ||||
| * | | | | Throw StorageNotAvailable if propfind on root failed | Vincent Petry | 2015-07-13 | 1 | -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 transifex | Jenkins for ownCloud | 2015-07-14 | 4 | -0/+4 |
|/ / / / | |||||
* | | | | Strip public webdav info about sharing and mount points | Vincent Petry | 2015-07-13 | 1 | -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-list | Morris Jobke | 2015-07-13 | 3 | -202/+12 |
|\ \ \ \ | | | | | | | | | | | Move mimetypes.list.php to config/mimetypemapping.dist.json | ||||
| * | | | | Move to OC::$configDif | Roeland Jago Douma | 2015-07-10 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Move mimetypemapping.json to mimetypemapping.dist.json | Roeland Jago Douma | 2015-07-08 | 1 | -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.json | Roeland Jago Douma | 2015-07-08 | 3 | -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 transifex | Jenkins for ownCloud | 2015-07-12 | 2 | -0/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-11 | 2 | -0/+6 |
| | | | | | |||||
* | | | | | Move mimetypealiases.json to mimetypealiases.dist.json | Roeland Jago Douma | 2015-07-10 | 1 | -1/+6 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-10 | 4 | -6/+14 |
| | | | | | |||||
* | | | | | Merge pull request #17517 from RealRancor/fix_failed_login_syntax | Morris Jobke | 2015-07-10 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed "Remote IP:" syntax on failed logins | ||||
| * | | | | | Fixed "Remote IP:" syntax on failed logins | RealRancor | 2015-07-09 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #15586 from Egari/addThemeSupportToMimeIcon | Morris Jobke | 2015-07-09 | 1 | -15/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add theme support to mimetypeIcon through imagePath integration | ||||
| * | | | | | | Add theme support to mimetypeIcon through imagePath integration | stolter | 2015-07-07 | 1 | -15/+20 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder | Morris Jobke | 2015-07-09 | 5 | -24/+42 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Add getUserFolder to IRootFolder | ||||
| * | | | | | | Add getUserFolder to IRootFolder | Morris Jobke | 2015-07-03 | 5 | -24/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * untangle DI of user specific folders * allows to autodetect the dependency | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-09 | 2 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17472 from RealRancor/add_is_dir | Morris Jobke | 2015-07-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add is_dir check to getAllApps() function | ||||
| * | | | | | | | Add is_dir check to getAllApps() function | RealRancor | 2015-07-08 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions | Morris Jobke | 2015-07-08 | 1 | -10/+28 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix the path for users which have an exception for a group share | ||||
| * | | | | | | Make sure the owner always has the right path | Joas Schilling | 2015-07-07 | 1 | -3/+6 |
| | | | | | | | |||||
| * | | | | | | Fix the path for users which have an exception for a group share | Joas Schilling | 2015-07-02 | 1 | -7/+22 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-08 | 2 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Add missing tunnel on new class | Joas Schilling | 2015-07-07 | 1 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17399 from rullzer/mimetype-php | Morris Jobke | 2015-07-07 | 1 | -71/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PHP mimetype stuff should also use config/mimetypealiases.json | ||||
| * | | | | | | | Make php also use config/mimetypealiases.json | Roeland Jago Douma | 2015-07-07 | 1 | -71/+7 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* / | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-07 | 6 | -0/+8 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #16724 from owncloud/mimetype-js | Roeland Douma | 2015-07-06 | 1 | -0/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Javascript to fetch mimetype icons | ||||
| * | | | | | | Javascript mimetype icon resolver | Roeland Jago Douma | 2015-07-06 | 1 | -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-polyfill | Thomas Müller | 2015-07-06 | 1 | -0/+89 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | add recursive copy polyfill for storage backends | ||||
| * | | | | | | better handling of folders | Robin Appelman | 2015-07-03 | 1 | -1/+1 |
| | | | | | | |