Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-05 | 84 | -160/+10 |
| | |||||
* | Merge pull request #23682 from owncloud/group_sharing_disabled_capability | Morris Jobke | 2016-04-04 | 4 | -0/+51 |
|\ | | | | | Add capability to show if group sharing is enabled | ||||
| * | Add intergration tests | Roeland Jago Douma | 2016-04-04 | 2 | -0/+31 |
| | | |||||
| * | Add capability to show if group sharing is enabled | Roeland Jago Douma | 2016-04-04 | 2 | -0/+20 |
|/ | | | | | | | fixes #23477 Now clients can correct wording to properly reflect who a user can share with. | ||||
* | Fix PHP memory leak in file_get_contents() | Morris Jobke | 2016-04-04 | 2 | -2/+9 |
| | | | | | | | | | * ref https://bugs.php.net/bug.php?id=61961 * ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256 * code is based on the proposal of @chriseqipe * fixes #20261 | ||||
* | Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page | Thomas Müller | 2016-04-04 | 8 | -3/+229 |
|\ | | | | | 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 | 2 | -1/+15 |
| | | |||||
| * | In case of exception we return an html page in case the client is a browser | Thomas Müller | 2016-03-24 | 7 | -3/+215 |
| | | |||||
* | | Merge pull request #23743 from ↵ | Björn Schießle | 2016-04-04 | 2 | -3/+13 |
|\ \ | | | | | | | | | | | | | owncloud/issue-23686-files-transferownership-share-unmount Unmount the share before deleting it, so we don't try to use it later on | ||||
| * | | Inject the Mount Manager | Joas Schilling | 2016-04-04 | 2 | -6/+10 |
| | | | |||||
| * | | Unmount the share before deleting it, so we don't try to use it later on | Joas Schilling | 2016-04-01 | 1 | -0/+6 |
| | | | |||||
* | | | core: Fix typos (found by codespell) | Stefan Weil | 2016-04-04 | 7 | -9/+9 |
| | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
* | | | Fixed 'Help Translate' link | Pau | 2016-04-04 | 1 | -1/+1 |
| | | | |||||
* | | | Add better messages for sometimes obscure exceptions | Bernhard Posselt | 2016-04-04 | 1 | -2/+27 |
| | | | | | | | | | | | | | | | | | | * add better messages for sometimes obscure exceptions * fix formatting | ||||
* | | | Merge pull request #23722 from ↵ | Thomas Müller | 2016-04-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/also-hide-password-for-private-key-password-update Also replace password in updatePrivateKeyPassword | ||||
| * | | | Also replace password in updatePrivateKeyPassword | Lukas Reschke | 2016-04-01 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23717 | ||||
* | | | Merge pull request #23728 from owncloud/sanitize-more-data-for-config-report | Joas Schilling | 2016-04-04 | 1 | -1/+13 |
|\ \ \ | | | | | | | | | Sanitize more data in config report | ||||
| * | | | Sanitize more data in config report | Lukas Reschke | 2016-04-01 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sanitizes the following keys as well: - `proxyuserpwd` - `shared_secret` of `log.condition` - `license-key` - `password` of `redis` | ||||
* | | | | Merge pull request #23638 from owncloud/new-placeholder-colours-generator | Jan-Christoph Borchardt | 2016-04-03 | 1 | -6/+56 |
|\ \ \ \ | | | | | | | | | | | New colour generator | ||||
| * | | | | New colour generator | John Molakvoæ | 2016-04-01 | 1 | -6/+56 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-02 | 34 | -2/+116 |
| | | | | | |||||
* | | | | | Merge pull request #23487 from owncloud/core-globalajaxerrorwhengoingaway | Vincent Petry | 2016-04-01 | 2 | -7/+77 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Detect user navigating away, don't interpret as ajax error | ||||
| * | | | | Adjust core unit tests for unload/reload cases | Vincent Petry | 2016-03-23 | 2 | -6/+43 |
| | | | | | |||||
| * | | | | Stronger fix for navigate away detection | Vincent Petry | 2016-03-22 | 1 | -2/+10 |
| | | | | | |||||
| * | | | | Firefox returns 303 on cross-domain redirect | Vincent Petry | 2016-03-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Added 303 to catch SSO cross-domain redirect in Firefox. | ||||
| * | | | | Detect user navigating away, don't interpret as ajax error | Vincent Petry | 2016-03-22 | 1 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a user navigates away, all ajax calls will fail with the same result like a cross-domain redirect (SSO). To distinguish these cases, we need to detect whether the error is a result of the user navigating away. For this, we introduce a new flag that will be set in "beforeunload". Additional handling was required for false positives in case "beforeunload" is used (ex: cancelled upload) and the user cancelled the navigation. | ||||
* | | | | | Merge pull request #23719 from owncloud/pr-16857-printcss-followup | Lukas Reschke | 2016-04-01 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Initialise the printcss array | ||||
| * | | | | Initialise the printcss array | Joas Schilling | 2016-04-01 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-01 | 70 | -58/+104 |
| | | | | |||||
* | | | | Merge pull request #22834 from owncloud/webdav_property_for_share_permissions | Thomas Müller | 2016-03-31 | 5 | -0/+238 |
|\ \ \ \ | | | | | | | | | | | 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 | 5 | -0/+218 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftp | Thomas Müller | 2016-03-31 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Add urlencode to username part of ftp and sftp links | ||||
| * | | | | | Add urlencode to username part of ftp and sftp links | Senorsen | 2016-03-16 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | according to #17796 | ||||
* | | | | | | Merge pull request #23713 from owncloud/small_encryption_fix | Thomas Müller | 2016-03-31 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make sure that we always remove the file again from the cache after t… | ||||
| * | | | | | | make sure that we always remove the file again from the cache after the ↵ | Bjoern Schiessle | 2016-03-31 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | version was created | ||||
* | | | | | | | Merge pull request #23564 from owncloud/public-ajaxbasicauth | Morris Jobke | 2016-03-31 | 2 | -2/+20 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Return 401 DummyBasicAuth in case of ajax call in public link page | ||||
| * | | | | | | | 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 #23655 from owncloud/better-ldap-design | Morris Jobke | 2016-03-31 | 1 | -0/+18 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Design LDAP wizard to better integrate into the design | ||||
| * | | | | | | | Design LDAP wizard to better integrate into the design | Morris Jobke | 2016-03-30 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mostly replaces gray background with white one | ||||
* | | | | | | | | Merge pull request #23676 from owncloud/handle-null-return-getAppInfo | Morris Jobke | 2016-03-31 | 3 | -1/+19 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Properly handle return values of OC_App::getAppInfo() | ||||
| * | | | | | | | | Properly handle return values of OC_App::getAppInfo() | Morris Jobke | 2016-03-30 | 3 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #23668 | ||||
* | | | | | | | | | Merge pull request #23694 from owncloud/add-cov-graph | Morris Jobke | 2016-03-31 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Adding coverage graph to see how we progress | ||||
| * | | | | | | | | | Adding coverage graph to see how we progress | Thomas Müller | 2016-03-31 | 1 | -0/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #16857 from owncloud/printStylesheets | C. Montero Luque | 2016-03-31 | 4 | -12/+51 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | Support for print stylesheets | ||||
| * | | | | | | | | | support print stylesheets | Hendrik Leppelsack | 2016-01-13 | 4 | -12/+51 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #23517 from owncloud/gdrive-stream-download | Frank Karlitschek | 2016-03-31 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | GDrive stream download with RetryWrapper | ||||
| * | | | | | | | | | | GDrive stream download with RetryWrapper | Vincent Petry | 2016-03-30 | 1 | -4/+5 |
| | | | | | | | | | | |