summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1738 from ↵Morris Jobke2016-10-2616-185/+574
|\ | | | | | | | | nextcloud/comments-provide-displaynames-with-mentions comment mentions: show displayname not uid
| * fix JS test and introduce tests for rendering mentions to displaynamesArthur Schiwon2016-10-251-8/+62
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * avoid that all avatars are copied to the author row when editing commentsArthur Schiwon2016-10-211-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * add missing methods to test fake managerArthur Schiwon2016-10-201-0/+4
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * consolidate error handlingArthur Schiwon2016-10-191-27/+41
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix avatar displaying after submit (either edit or new)Arthur Schiwon2016-10-191-3/+7
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * display avatar (if enabled) alongside displaynamesArthur Schiwon2016-10-192-1/+12
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix regexArthur Schiwon2016-10-191-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * improve regex, fixes replacements of usernames with same trunkArthur Schiwon2016-10-191-1/+12
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * show displayname not uid in commit mentionsArthur Schiwon2016-10-192-17/+76
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * resolve displayname via manager and registerable resolversArthur Schiwon2016-10-196-4/+198
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * move mention extraction to (I)Comment and report mentions via DAVArthur Schiwon2016-10-197-149/+187
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #1923 from nextcloud/fix-template-urlMorris Jobke2016-10-261-1/+1
|\ \ | | | | | | Fix issue template url
| * | … and the raw version of itblizzz2016-10-261-1/+1
| | |
| * | Fix issue template urlblizzz2016-10-261-1/+1
|/ / | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #1907 from nextcloud/downstream-26164Morris Jobke2016-10-263-5/+15
|\ \ | | | | | | Highlight files and update storage stats at end of upload (#26164)
| * | Highlight files and update storage stats at end of upload (#26164)Vincent Petry2016-10-253-5/+15
| | | | | | | | | | | | | | | Properly trigger the "stop" even from the uploader. Also update storage stats at the end of all uploads instead of for each upload.
* | | Merge pull request #1921 from nextcloud/ignore-htaccessMorris Jobke2016-10-261-0/+1
|\ \ \ | | | | | | | | Ignore .htaccess So no one commits the crappy 403 and 404 anymore
| * | | So no one commits the crappy 403 and 404 anymoreJoas Schilling2016-10-261-0/+1
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1355 from nextcloud/apps_flexboxMorris Jobke2016-10-261-1/+11
|\ \ \ | | | | | | | | Use flexbox on app page
| * | | Limit to apps list, add proper flex attributesFelix Epp2016-10-251-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Let app-name headline break, increase padding on the right for more visual clearance. Make experimental header full width Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | | Use flexbox on app pageRoeland Jago Douma2016-09-101-0/+3
| | | |
* | | | Merge pull request #1914 from nextcloud/downstream-26468Morris Jobke2016-10-261-6/+1
|\ \ \ \ | | | | | | | | | | Remove all unneeded set_include_path()
| * | | | Remove all unneeded set_include_path()Thomas Müller2016-10-251-6/+1
| | |/ / | |/| |
* | | | [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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 16:34:25 +0000