Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page | Thomas Müller | 2016-04-04 | 6 | -2/+217 |
|\ | | | | | In case of exception we return an html page in case the client is a b… | ||||
| * | Add magical regex to catch browsers | Lukas Reschke | 2016-03-24 | 1 | -1/+7 |
| | | |||||
| * | In case of exception we return an html page in case the client is a browser | Thomas Müller | 2016-03-24 | 6 | -2/+211 |
| | | |||||
* | | Merge pull request #22834 from owncloud/webdav_property_for_share_permissions | Thomas Müller | 2016-03-31 | 3 | -0/+120 |
|\ \ | | | | | | | Add sharePermissions webdav property | ||||
| * | | Fix unit tests | Roeland Jago Douma | 2016-03-31 | 2 | -3/+14 |
| | | | |||||
| * | | Correct share permissions for external storages | Roeland Jago Douma | 2016-03-31 | 1 | -0/+9 |
| | | | |||||
| * | | Add sharePermissions webdav property | Roeland Jago Douma | 2016-03-31 | 3 | -0/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property can be queries by the clients so they know the max permissions they can use to share a file with. This will improve the UX. The oc:permissions proptery is not enough since mountpoints have different permissions (delete + move by default). By making it a new property the clients can just request it. On older servers it will just return a 404 for that property (and thus they know they have to fall back to their hacky work arounds). But if the property is returned the client can show proper info. * unit tests * intergration test | ||||
* | | | Enforce type | Lukas Reschke | 2016-03-31 | 1 | -2/+5 |
| | | | |||||
* | | | Return 401 DummyBasicAuth in case of ajax call | Vincent Petry | 2016-03-31 | 2 | -2/+17 |
|/ / | |||||
* | | Merge pull request #23642 from stweil/master | Thomas Müller | 2016-03-30 | 4 | -5/+5 |
|\ \ | | | | | | | apps: Fix some typos found by codespell | ||||
| * | | apps/dav: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-30 | 4 | -5/+5 |
| | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
* | | | Merge pull request #23508 from owncloud/text-columns-should-have-length | Thomas Müller | 2016-03-30 | 2 | -1/+22 |
|\ \ \ | |/ / |/| | | Text columns should really have a length :see_no_evil: | ||||
| * | | Text columns should really have a length :see_no_evil: | Thomas Müller | 2016-03-23 | 2 | -1/+22 |
| | | | |||||
* | | | Merge pull request #23568 from ↵ | Thomas Müller | 2016-03-29 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/finally-fix-23328-now-for-addressbooks-as-well Handle group shares of addressbooks on v1 as well ... now FINALLY .... | ||||
| * | | | Handle group shares of addressbooks on v1 as well ... now FINALLY .... | Thomas Müller | 2016-03-24 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #23549 from owncloud/dav-sharetypes-remote | Thomas Müller | 2016-03-24 | 2 | -1/+4 |
|\ \ \ | |/ / |/| | | Return remote shares in oc:share-types Webdav property | ||||
| * | | Return remote shares in oc:share-types Webdav property | Vincent Petry | 2016-03-24 | 2 | -1/+4 |
| |/ | | | | | | | | | Fixes web UI to properly display the share status icon when an outgoing remote share exists | ||||
* | | Merge pull request #23342 from ↵ | Thomas Müller | 2016-03-24 | 10 | -88/+212 |
|\ \ | | | | | | | | | | | | | owncloud/fix-group-sharing-for-v1-caldav-and-carddav Fix group shares on v1 caldav and carddav | ||||
| * | | Fix acls for calendar objects and cards - fixes #23273 | Thomas Müller | 2016-03-24 | 9 | -84/+192 |
| | | | |||||
| * | | Return proper current-user-principal on v1 endpoints - fixes #23306 | Thomas Müller | 2016-03-24 | 1 | -0/+15 |
| | | | |||||
| * | | Fix group shares on v1 caldav and carddav - fixes #23328 | Thomas Müller | 2016-03-24 | 3 | -4/+5 |
| | | | |||||
* | | | Check if request is sent from official ownCloud client | Lukas Reschke | 2016-03-24 | 2 | -36/+239 |
|/ / | | | | | | | | | | | There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check) While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code. | ||||
* | | Merge pull request #23507 from owncloud/fix-23496-master | Thomas Müller | 2016-03-23 | 1 | -2/+4 |
|\ \ | |/ |/| | Avoid fatal php error dring cron execution | ||||
| * | fixes #23496 | Thomas Müller | 2016-03-23 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2 | Thomas Müller | 2016-03-23 | 3 | -14/+29 |
|\ \ | | | | | | | Fix display of vcard and calendar object details page in browser plugin | ||||
| * | | Fix display of vcard and calendar object details page in browser plugin | Thomas Müller | 2016-03-23 | 3 | -14/+29 |
| | | | |||||
* | | | Merge pull request #23404 from owncloud/fix-22988 | Thomas Müller | 2016-03-22 | 2 | -4/+10 |
|\ \ \ | |_|/ |/| | | adjust PrincipalUri as returned from Sabre to effective username | ||||
| * | | fix unittest | Arthur Schiwon | 2016-03-21 | 1 | -3/+3 |
| | | | |||||
| * | | adjust PrincipilUri as returned from Sabre to effective username | Arthur Schiwon | 2016-03-18 | 1 | -1/+7 |
| | | | |||||
* | | | Merge pull request #23320 from owncloud/early-creation-of-birthday-calendar | Thomas Müller | 2016-03-22 | 1 | -16/+12 |
|\ \ \ | | | | | | | | | Create the contact birthday calendar right away as soon as the comman… | ||||
| * | | | Create the contact birthday calendar right away as soon as the command is ↵ | Thomas Müller | 2016-03-16 | 1 | -16/+12 |
| | | | | | | | | | | | | | | | | executed once - fixes #23203 | ||||
* | | | | Merge pull request #23292 from owncloud/dav-chunking-onlyfirehooksonce | Thomas Müller | 2016-03-21 | 2 | -2/+71 |
|\ \ \ \ | | | | | | | | | | | Do not fire pre/post hooks twice on chunk upload | ||||
| * | | | | Do not fire pre/post hooks twice on chunk upload | Vincent Petry | 2016-03-21 | 2 | -2/+71 |
| | | | | | |||||
* | | | | | Merge pull request #23083 from owncloud/generate-birthdays-on-upgrade | Thomas Müller | 2016-03-21 | 4 | -1/+18 |
|\ \ \ \ \ | |/ / / / |/| | | | | Birthday events are generated on upgrade | ||||
| * | | | | Generate birthdays on upgrade from 8.2 as well | Thomas Müller | 2016-03-10 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Birthday events are generated on upgrade | Thomas Müller | 2016-03-10 | 3 | -1/+17 |
| | | | | | |||||
* | | | | | Merge pull request #22789 from owncloud/dav-sharesproperty | Thomas Müller | 2016-03-21 | 4 | -0/+526 |
|\ \ \ \ \ | | | | | | | | | | | | | Add webdav property for share info in PROPFIND response | ||||
| * | | | | | Remove duplicated copyright | Roeland Jago Douma | 2016-03-17 | 2 | -27/+0 |
| | | | | | | |||||
| * | | | | | Add webdav property for share info in PROPFIND response | Vincent Petry | 2016-03-17 | 4 | -0/+553 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser | Thomas Müller | 2016-03-21 | 5 | -10/+31 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | In debugging mode we enable Sabre's browser plugin since it helps a l… | ||||
| * | | | Necessary code changes to make browser plugin properly work | Thomas Müller | 2016-03-17 | 2 | -1/+5 |
| | | | | |||||
| * | | | In debugging mode we enable Sabre's browser plugin since it helps a lot when ↵ | Thomas Müller | 2016-03-17 | 3 | -9/+26 |
| |/ / | | | | | | | | | | debugging | ||||
* / / | Set proper public webdav permissions when public upload disabled | Roeland Jago Douma | 2016-03-17 | 1 | -0/+5 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | Fixes #23325 It can happen that a user shares a folder with public upload. And some time later the admin disables public upload on the server. To make sure this is handled correctly we need to check the config value and reduce the permissions. Fix is kept small to be easy backportable. | ||||
* | | Merge pull request #23082 from owncloud/contacts_calendar_name_color | Thomas Müller | 2016-03-16 | 1 | -0/+5 |
|\ \ | | | | | | | add title and color to birthday calendar | ||||
| * | | add title and color to birthday calendar | Georg Ehrke | 2016-03-10 | 1 | -0/+5 |
| |/ | |||||
* | | Merge pull request #23074 from ↵ | Thomas Müller | 2016-03-15 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | owncloud/issue-22835-correctly-use-querybuilder-api Correctly escape join statements and use selectAlias | ||||
| * | | Correctly escape join statements and use selectAlias | Joas Schilling | 2016-03-10 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #23080 from owncloud/use-non-localized-birthday-title | Thomas Müller | 2016-03-11 | 2 | -3/+3 |
|\ \ | | | | | | | Use a birthday title which does not require translation because we ha… | ||||
| * | | Use a birthday title which does not require translation because we have no ↵ | Thomas Müller | 2016-03-10 | 2 | -3/+3 |
| |/ | | | | | | | idea about the target device language and forcing English upon all users is kind of bad | ||||
* | | Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master | Thomas Müller | 2016-03-10 | 3 | -12/+65 |
|\ \ | | | | | | | getOwner is not available on FileHome |