summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-0584-160/+10
|
* Merge pull request #23682 from owncloud/group_sharing_disabled_capabilityMorris Jobke2016-04-044-0/+51
|\ | | | | Add capability to show if group sharing is enabled
| * Add intergration testsRoeland Jago Douma2016-04-042-0/+31
| |
| * Add capability to show if group sharing is enabledRoeland Jago Douma2016-04-042-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 Jobke2016-04-042-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-pageThomas Müller2016-04-048-3/+229
|\ | | | | In case of exception we return an html page in case the client is a b…
| * Add magical regex to catch browsersLukas Reschke2016-03-242-1/+15
| |
| * In case of exception we return an html page in case the client is a browserThomas Müller2016-03-247-3/+215
| |
* | Merge pull request #23743 from ↵Björn Schießle2016-04-042-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 ManagerJoas Schilling2016-04-042-6/+10
| | |
| * | Unmount the share before deleting it, so we don't try to use it later onJoas Schilling2016-04-011-0/+6
| | |
* | | core: Fix typos (found by codespell)Stefan Weil2016-04-047-9/+9
| | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | Fixed 'Help Translate' linkPau2016-04-041-1/+1
| | |
* | | Add better messages for sometimes obscure exceptionsBernhard Posselt2016-04-041-2/+27
| | | | | | | | | | | | | | | | | | * add better messages for sometimes obscure exceptions * fix formatting
* | | Merge pull request #23722 from ↵Thomas Müller2016-04-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | owncloud/also-hide-password-for-private-key-password-update Also replace password in updatePrivateKeyPassword
| * | | Also replace password in updatePrivateKeyPasswordLukas Reschke2016-04-011-1/+1
| |/ / | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23717
* | | Merge pull request #23728 from owncloud/sanitize-more-data-for-config-reportJoas Schilling2016-04-041-1/+13
|\ \ \ | | | | | | | | Sanitize more data in config report
| * | | Sanitize more data in config reportLukas Reschke2016-04-011-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-generatorJan-Christoph Borchardt2016-04-031-6/+56
|\ \ \ \ | | | | | | | | | | New colour generator
| * | | | New colour generatorJohn Molakvoæ2016-04-011-6/+56
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-0234-2/+116
| | | | |
* | | | | Merge pull request #23487 from owncloud/core-globalajaxerrorwhengoingawayVincent Petry2016-04-012-7/+77
|\ \ \ \ \ | |_|/ / / |/| | | | Detect user navigating away, don't interpret as ajax error
| * | | | Adjust core unit tests for unload/reload casesVincent Petry2016-03-232-6/+43
| | | | |
| * | | | Stronger fix for navigate away detectionVincent Petry2016-03-221-2/+10
| | | | |
| * | | | Firefox returns 303 on cross-domain redirectVincent Petry2016-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | Added 303 to catch SSO cross-domain redirect in Firefox.
| * | | | Detect user navigating away, don't interpret as ajax errorVincent Petry2016-03-221-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-followupLukas Reschke2016-04-011-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Initialise the printcss array
| * | | | Initialise the printcss arrayJoas Schilling2016-04-011-0/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-0170-58/+104
| | | |
* | | | Merge pull request #22834 from owncloud/webdav_property_for_share_permissionsThomas Müller2016-03-315-0/+238
|\ \ \ \ | | | | | | | | | | Add sharePermissions webdav property
| * | | | Fix unit testsRoeland Jago Douma2016-03-312-3/+14
| | | | |
| * | | | Correct share permissions for external storagesRoeland Jago Douma2016-03-311-0/+9
| | | | |
| * | | | Add sharePermissions webdav propertyRoeland Jago Douma2016-03-315-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-sftpThomas Müller2016-03-312-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Add urlencode to username part of ftp and sftp links
| * | | | | Add urlencode to username part of ftp and sftp linksSenorsen2016-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | according to #17796
* | | | | | Merge pull request #23713 from owncloud/small_encryption_fixThomas Müller2016-03-311-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 Schiessle2016-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | version was created
* | | | | | | Merge pull request #23564 from owncloud/public-ajaxbasicauthMorris Jobke2016-03-312-2/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Return 401 DummyBasicAuth in case of ajax call in public link page
| * | | | | | | Enforce typeLukas Reschke2016-03-311-2/+5
| | | | | | | |
| * | | | | | | Return 401 DummyBasicAuth in case of ajax callVincent Petry2016-03-312-2/+17
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #23655 from owncloud/better-ldap-designMorris Jobke2016-03-311-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Design LDAP wizard to better integrate into the design
| * | | | | | | Design LDAP wizard to better integrate into the designMorris Jobke2016-03-301-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mostly replaces gray background with white one
* | | | | | | | Merge pull request #23676 from owncloud/handle-null-return-getAppInfoMorris Jobke2016-03-313-1/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Properly handle return values of OC_App::getAppInfo()
| * | | | | | | | Properly handle return values of OC_App::getAppInfo()Morris Jobke2016-03-303-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #23668
* | | | | | | | | Merge pull request #23694 from owncloud/add-cov-graphMorris Jobke2016-03-311-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Adding coverage graph to see how we progress
| * | | | | | | | | Adding coverage graph to see how we progressThomas Müller2016-03-311-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #16857 from owncloud/printStylesheetsC. Montero Luque2016-03-314-12/+51
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Support for print stylesheets
| * | | | | | | | | support print stylesheetsHendrik Leppelsack2016-01-134-12/+51
| | | | | | | | | |
* | | | | | | | | | Merge pull request #23517 from owncloud/gdrive-stream-downloadFrank Karlitschek2016-03-311-4/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | GDrive stream download with RetryWrapper
| * | | | | | | | | | GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
| | | | | | | | | | |