Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11249 from owncloud/backport-11032-stable5 | Lukas Reschke | 2014-10-22 | 1 | -1/+10 |
|\ | | | | | Do only follow HTTP and HTTPS redirects | ||||
| * | Do only follow HTTP and HTTPS redirects | Lukas Reschke | 2014-09-23 | 1 | -1/+10 |
| | | | | | | | | Backport of #11032 to stable5 | ||||
* | | create the user 'admin' before running the tests | Bjoern Schiessle | 2014-09-23 | 1 | -12/+6 |
|/ | |||||
* | clearify the use-case of this app | Lukas Reschke | 2014-08-09 | 1 | -1/+1 |
| | | | Backport of 8a24e1e to stable5 | ||||
* | keep long file names in one line to not overflow download button on mobile | Jan-Christoph Borchardt | 2014-06-06 | 1 | -0/+13 |
| | |||||
* | add max-width to directLink input to prevent overflow | Jan-Christoph Borchardt | 2014-06-06 | 1 | -0/+1 |
| | |||||
* | fix layout of external storage config table | Morris Jobke | 2014-04-26 | 1 | -1/+5 |
| | | | | | Conflicts: apps/files_external/css/settings.css | ||||
* | Merge pull request #8298 from owncloud/backport_6290_to_stable5 | Thomas Müller | 2014-04-23 | 2 | -12/+2 |
|\ | | | | | Backport #6290 to stable5 | ||||
| * | restore trashbin download.php | Jörn Friedrich Dreyer | 2014-04-22 | 1 | -0/+46 |
| | | |||||
| * | backport #6290 to stable5 | Jörn Friedrich Dreyer | 2014-04-22 | 2 | -57/+1 |
| | | |||||
* | | Check whether the user has permissions to add personal storage backends | Lukas Reschke | 2014-04-23 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quick’n dirty back port of #8182 - master has a better fix but that should be good enough… missing return - OCP\JSON::success does not terminate the PHP process - which is good ;-) Use error instead of success Revert "Use error instead of success" This reverts commit e2d5535a5aa436c3896e46f0b9e8ff1bd5640d4d. Use error instead of success | ||||
* | | Merge pull request #8115 from owncloud/stable5-fixselectallanddownload | Morris Jobke | 2014-04-17 | 1 | -1/+2 |
|\ \ | |/ |/| | [stable5] Added missing var that messes up IE8 | ||||
| * | Added missing var that messes up IE8 | Vincent Petry | 2014-04-08 | 1 | -1/+2 |
| | | |||||
* | | adding the plugin to the server object | Thomas Müller | 2014-04-16 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #8005 from owncloud/files-fixie8upload | Vincent Petry | 2014-04-10 | 1 | -0/+1 |
|\ \ | | | | | | | [stable5] Added requesttoken back for IE8 | ||||
| * | | Added requesttoken back for IE8 | Vincent Petry | 2014-04-02 | 1 | -0/+1 |
| | | | |||||
* | | | Improve phpdoc | Robin Appelman | 2014-04-03 | 1 | -0/+7 |
| | | | |||||
* | | | Implement getPath for shared files | Robin Appelman | 2014-04-03 | 2 | -0/+76 |
| |/ |/| | |||||
* | | Revert "remove Sabre_DAV_Browser_Plugin" | Thomas Müller | 2014-04-01 | 1 | -0/+1 |
| | | | | | | | | This reverts commit 997a9ce0b127bbfdc7ea4319cc20a276a6f542b1. | ||||
* | | don't block php session while download is in progress | Jörn Friedrich Dreyer | 2014-03-26 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #7763 from owncloud/stable5-fixrestoreall | Vincent Petry | 2014-03-19 | 1 | -1/+1 |
|\ \ | | | | | | | [stable5] Fix "restore all selected files" | ||||
| * | | Fix "restore all selected files" | Vincent Petry | 2014-03-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | It seems that a typo sneaked in during a backport. This fixes the case when selecting files in the trashbin and clicking "Restore" on the tool bar to restore them all. | ||||
* | | | When reading the size of "files" mountpoints need to be excluded | Vincent Petry | 2014-03-17 | 2 | -2/+2 |
|/ / | | | | | | | | | | | | | | | | | | | | | The versions and trashbin app are now passing "includeMountPoints=false" to "getFileInfo()" to make sure that the calculated total size doesn't include mount points like Shared or external storage. This is because the default call (legacy) used to return the size of mount points as well. Fixes #6731 | ||||
* | | fix left-over from merge conflict | Bjoern Schiessle | 2014-03-13 | 1 | -4/+0 |
| | | |||||
* | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-13 | 2 | -4/+131 |
| | | |||||
* | | remove Sabre_DAV_Browser_Plugin | Thomas Müller | 2014-03-12 | 1 | -1/+0 |
| | | | | | | | | | | Conflicts: apps/files/appinfo/remote.php | ||||
* | | add 'received_from' info to the share, so that every share can have a ↵ | Bjoern Schiessle | 2014-03-11 | 1 | -2/+4 |
| | | | | | | | | different value | ||||
* | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-11 | 1 | -3/+261 |
| | | |||||
* | | we need the file_source to delete a share successfully | Bjoern Schiessle | 2014-03-10 | 2 | -7/+42 |
|/ | | | | | Conflicts: apps/files_sharing/tests/api.php | ||||
* | Backported sabre exception logger | Vincent Petry | 2014-02-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | Partial backport of 11ef12a Whenever an exception occurs in the sabre connector code or code called by it, it will be logged. This plugin approach is needed because Sabre already catches exceptions to return them to the client in the XML response, so they don't appear logged in the web server log. This will make it much easier to debug syncing issues. | ||||
* | only add "received_from" if a share was found | Bjoern Schiessle | 2014-02-26 | 1 | -6/+6 |
| | |||||
* | Added extra checks for ext storage class | Lukas Reschke | 2014-02-23 | 1 | -1/+1 |
| | | | | Backport of #7305 | ||||
* | Revert "Partially backport #7305 to stable5" | Lukas Reschke | 2014-02-22 | 1 | -1/+1 |
| | | | | This reverts commit 258997471e919be3e992fc78432397a546417a56. | ||||
* | Partially backport #7305 to stable5 | Lukas Reschke | 2014-02-22 | 1 | -1/+1 |
| | |||||
* | LDAP: improve compilation of filters | Arthur Schiwon | 2014-02-21 | 2 | -0/+14 |
| | |||||
* | Merge pull request #7185 from ↵ | Jan-Christoph Borchardt | 2014-02-20 | 9 | -145/+135 |
|\ | | | | | | | | | owncloud/backport_6777_mobile_style_for_public_pages_stable5 initial backport of #6777 - mobile public pages - to stable5 | ||||
| * | unset box-shadow for mobile devices, unsupported in all but the latest ↵ | Jörn Friedrich Dreyer | 2014-02-19 | 1 | -0/+4 |
| | | | | | | | | mobile browsers | ||||
| * | fix undefined index | Jörn Friedrich Dreyer | 2014-02-13 | 2 | -0/+3 |
| | | |||||
| * | add missing mobile.css | Jörn Friedrich Dreyer | 2014-02-13 | 1 | -0/+49 |
| | | |||||
| * | initial backport of #6777 - mobile public pages - to stable5 | Jörn Friedrich Dreyer | 2014-02-13 | 7 | -145/+79 |
| | | |||||
* | | Merge pull request #6733 from owncloud/stable5-files-filenameescapingfixes | Lukas Reschke | 2014-02-20 | 8 | -54/+73 |
|\ \ | | | | | | | [stable5] Backport: Fixed various file name escaping issues in core apps | ||||
| * | | Fixed various file name escaping issues in core apps | Vincent Petry | 2014-01-12 | 8 | -54/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored file tr lookup into FileList.findFileEl that uses filterAttr to avoid escaping issues in jQuery selectors - Fixed versions and sharing app to properly escape file names in attributes - Prevent uploading file name with invalid characters Backport to stable5 of 1042733 | ||||
* | | | Merge pull request #4782 from ↵ | Vincent Petry | 2014-02-18 | 1 | -10/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/tune_legacy_cache_webdav_properties_prefixing Tune legacy cache webdav properties prefixing | ||||
| * | | | Concatenate string in SQL instead of PHP | Jörn Friedrich Dreyer | 2013-11-01 | 1 | -10/+12 |
| | | | | |||||
* | | | | Make google drive client secret and dropbox api secret a password field | Joas Schilling | 2014-02-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix issue #5794 Backport of 828985d | ||||
* | | | | Merge pull request #7227 from owncloud/stable5-removeunusedversionsmd5 | Vincent Petry | 2014-02-17 | 2 | -22/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Removed unused versions md5 code | ||||
| * | | | Removed unused versions md5 code | Vincent Petry | 2014-02-17 | 2 | -22/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like md5 was used previously to identify the most recent file in the versions list, which seem to be old code, as now the versions list doesn't contain the current file any more. This fix removes the md5 code which caused performance issues with big files. | ||||
* | | | | remove needless element tag | Bjoern Schiessle | 2014-02-03 | 1 | -2/+1 |
| | | | | |||||
* | | | | use more accurate error codes | Bjoern Schiessle | 2014-01-28 | 1 | -5/+5 |
| | | | | |||||
* | | | | don't unshare on delete | Bjoern Schiessle | 2014-01-13 | 1 | -8/+0 |
| |_|/ |/| | |