summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-10-26160-372/+250
|
* Merge pull request #1917 from nextcloud/ocjs_inlineMorris Jobke2016-10-2615-32/+426
|\ | | | | Inline oc.js when possible!
| * Missing returns + autoloader fileLukas Reschke2016-10-255-2/+7
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Inlince oc.js if possible!Roeland Jago Douma2016-10-254-1/+32
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Move browserSupportsCspV3 to CSPNonceManagerRoeland Jago Douma2016-10-256-28/+53
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Move oc.js to a proper classRoeland Jago Douma2016-10-254-4/+337
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1911 from nextcloud/downstream-26477Roeland Jago Douma2016-10-251-1/+1
|\ \ | | | | | | Fix malformed attribute in files app
| * | Fix malformed attribute in files appVincent Petry2016-10-251-1/+1
| | |
* | | Merge pull request #1913 from nextcloud/downstream-26441Roeland Jago Douma2016-10-253-17/+12
|\ \ \ | |_|/ |/| | Require to use at least desktop client 2.0 by default
| * | Set 2.0.0 as minimum requirement for the desktop client in config.sample.phpThomas Müller2016-10-251-1/+1
| | |
| * | Fix unit tests for BlockLegacyClientPluginThomas Müller2016-10-251-15/+10
| | |
| * | Require to use at least desktop client 2.0 by defaultThomas Müller2016-10-251-1/+1
| |/
* | Merge pull request #1910 from nextcloud/ignore-build-binLukas Reschke2016-10-251-2/+3
|\ \ | | | | | | Add build/bin to gitignore
| * | Add build/bin to gitignoreFelix A. Epp2016-10-251-2/+3
| | | | | | | | | | | | | | | | | | When phantomjs and karma are not installed globally, they are installed into this folder. Signed-off-by: Felix A. Epp <work@felixepp.de>
* | | Merge pull request #1891 from nextcloud/downstream-26430Lukas Reschke2016-10-252-32/+37
|\ \ \ | | | | | | | | add upgrade command before repair, handle NeedsUpgradeException better
| * | | add upgrade command before repair, handle NeedsUpgradeExcaption betterJörn Friedrich Dreyer2016-10-242-32/+37
| | | |
* | | | Merge pull request #1878 from nextcloud/downstream-25936Morris Jobke2016-10-252-7/+8
|\ \ \ \ | | | | | | | | | | Adjust unit tests to upstream
| * | | | [9.2] Add missing unit tests (#25936)Thomas Müller2016-10-242-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adjust unit test execution after folder rename * Adjust login controller tests to match current behavior * Fix broken unit tests
* | | | | Merge pull request #1906 from nextcloud/downstream-26460Morris Jobke2016-10-252-24/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Remove any detailed information about the exception in the browser er…
| * | | | Remove any detailed information about the exception in the browser error pluginThomas Müller2016-10-252-24/+2
| | | | |
* | | | | Merge pull request #1871 from nextcloud/use-csp-noncesMorris Jobke2016-10-2519-12/+302
|\ \ \ \ \ | | | | | | | | | | | | Use CSP nonces
| * | | | | Update autoload files 🙈Morris Jobke2016-10-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Add ContentSecurityPolicyNonceManagerLukas Reschke2016-10-249-4/+130
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add support for CSP noncesLukas Reschke2016-10-2414-12/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSP nonces are a feature available with CSP v2. Basically instead of saying "JS resources from the same domain are ok to be served" we now say "Ressources from everywhere are allowed as long as they add a `nonce` attribute to the script tag with the right nonce. At the moment the nonce is basically just a `<?php p(base64_encode($_['requesttoken'])) ?>`, we have to decode the requesttoken since `:` is not an allowed value in the nonce. So if somebody does on their own include JS files (instead of using the `addScript` public API, they now must also include that attribute.) IE does currently not implement CSP v2, thus there is a whitelist included that delivers the new CSP v2 policy to newer browsers. Check http://caniuse.com/#feat=contentsecuritypolicy2 for the current browser support list. An alternative approach would be to just add `'unsafe-inline'` as well as `'unsafe-inline'` is ignored by CSPv2 when a nonce is set. But this would make this security feature unusable at all in IE. Not worth it at the moment IMO. Implementing this offers the following advantages: 1. **Security:** As we host resources from the same domain by design we don't have to worry about 'self' anymore being in the whitelist 2. **Performance:** We can move oc.js again to inline JS. This makes the loading way quicker as we don't have to load on every load of a new web page a blocking dynamically non-cached JavaScript file. If you want to toy with CSP see also https://csp-evaluator.withgoogle.com/ Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #1890 from nextcloud/downstream-25428Morris Jobke2016-10-252-2/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixing php 32 bit (arm) filemtime on large file issue (#18971) (#25428)
| * | | | | | Add check for linux osLukas Reschke2016-10-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | Move function to LargeFileHelperLukas Reschke2016-10-252-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | fixing php 32 bit (arm) filemtime on large file issue (#18971) (#25428)Boris Rybalkin2016-10-251-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixing php 32 bit (arm) filemtime on large file issue (#18971) * cast to int
* | | | | | | Merge pull request #1876 from nextcloud/shareesAPI_emailMorris Jobke2016-10-252-12/+314
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add ShareesAPI E-mail search
| * | | | | | Add ShareesAPI E-mail searchRoeland Jago Douma2016-10-242-12/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow to search for SHARE_TYPE_EMAIL (4) * Added tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #1883 from nextcloud/downstream-26145Morris Jobke2016-10-256-11/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Storage 503 message improvements
| * | | | | | | Storage 503 message improvementsVincent Petry2016-10-246-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Storage not available" is now "Storage temporarily not available". Exceptions are now logged in DEBUG level, not FATAL.
* | | | | | | | Merge pull request #1902 from nextcloud/fix-largefile-helper-not-existentLukas Reschke2016-10-252-12/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Remove not existent function call
| * | | | | | | Remove not existent function callLukas Reschke2016-10-252-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes a not existent function call - Removes a fallback for Windows Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-10-25330-2868/+2934
|/ / / / / / /
* | | | | | | Merge pull request #1884 from nextcloud/downstream-26292Lukas Reschke2016-10-252-34/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix logClientIn for non-existing users (#26292)
| * | | | | | | Fix and cleanup SessionTestRoeland Jago Douma2016-10-251-43/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Fix logClientIn for non-existing users (#26292)Vincent Petry2016-10-252-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for two factor enforcement would return true for non-existing users. This fix makes it return false in order to be able to perform the regular login which will then fail and return false. This prevents throwing PasswordLoginForbidden for non-existing users.
* | | | | | | | Merge pull request #1897 from nextcloud/fix-public-buttonMorris Jobke2016-10-251-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix button on public upload page for mobile
| * | | | | | | | fix button on public upload pageJan-Christoph Borchardt2016-10-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | Merge pull request #1452 from nextcloud/appconfig-endpointJoas Schilling2016-10-2518-161/+775
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Appconfig endpoint
| * | | | | | | | | Fix missing semicolonJoas Schilling2016-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Add unit testsJoas Schilling2016-10-212-5/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Switch to public APIJoas Schilling2016-10-215-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Make AppConfig part of the public APIJoas Schilling2016-10-2113-141/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | Merge pull request #1283 from nextcloud/us_files-ui-webdav-uploadLukas Reschke2016-10-2520-873/+1572
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use Webdav PUT for uploads
| * | | | | | | | | | Only enable files_drop plugin when we actuall do files_dropRoeland Jago Douma2016-10-242-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | | | Fix public files_drop pageRoeland Jago Douma2016-10-241-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | | | Make files_drop workRoeland Jago Douma2016-10-243-10/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | | | Fix permision maskRoeland Jago Douma2016-10-242-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we move a file from the temp part file to the original file we don't need update permissions. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>