summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11414 from ↵Morris Jobke2018-09-289-81/+191
|\ | | | | | | | | nextcloud/csp/11029/contacts_menu_compiled_handlebars Compile contactmenu handlebars templates
| * Compile contactmenu handlebars templatesRoeland Jago Douma2018-09-279-81/+191
| | | | | | | | | | | | | | | | | | | | Fixes #11029 For https://github.com/orgs/nextcloud/projects/18 Ship the compiled handlebars templates. This makes it possible to have a scricter CSP. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11423 from nextcloud/inline-input-error-fixMorris Jobke2018-09-281-160/+160
|\ \ | | | | | | Fix invalid inline input confirm border
| * | TABS :DJohn Molakvoæ (skjnldsv)2018-09-281-160/+160
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix invalid inline input confirm borderJohn Molakvoæ (skjnldsv)2018-09-281-5/+5
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #11417 from nextcloud/hover-quota-used-space-regressionJohn Molakvoæ2018-09-286-17/+42
|\ \ \ | | | | | | | | Add back the total used space per user
| * | | State default unknown quota to 0John Molakvoæ (skjnldsv)2018-09-284-7/+12
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix class selector for acceptance testsJohn Molakvoæ (skjnldsv)2018-09-281-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix string formattingJohn Molakvoæ (skjnldsv)2018-09-273-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Add back the total used space per userJohn Molakvoæ (skjnldsv)2018-09-275-12/+32
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #11412 from nextcloud/csp/11032/authtoekn_compiled_handlebarsChristoph Wurst2018-09-284-32/+69
|\ \ \ | | | | | | | | Compile handlebars template for AuthTokenView
| * | | Compile handlebars template for AuthTokenViewRoeland Jago Douma2018-09-274-32/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11032 For https://github.com/orgs/nextcloud/projects/18 Compile the default authtoken handlebars view. This avoids runtime compilations (speed) and avoids unsafe eval calls thus allowing a stricter CSP. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11410 from ↵Roeland Jago Douma2018-09-275-13/+26
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/csp/11030/filesummary_compiled_handlebars Compile filesummary handlebars
| * | | Compile filesummary handlebarsRoeland Jago Douma2018-09-275-13/+26
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11030 For https://github.com/orgs/nextcloud/projects/18 This template is now compiled so this no longer has to happen in the browser. Another step towards a stricter CSP. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11416 from nextcloud/bugfix/11218/show-email-authtype-noneblizzz2018-09-271-1/+1
|\ \ \ | | | | | | | | Show auth type "None" in email settings
| * | | Show auth type "None" in email settingsMorris Jobke2018-09-271-1/+1
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #10833 from nextcloud/fix_8623Morris Jobke2018-09-271-2/+3
|\ \ \ | |_|/ |/| | Re-enable upload button after updating Avatar fixes #8623
| * | Re-enable upload button after updating Avatar fixes #8623Tobia De Koninck2018-08-241-2/+3
| | | | | | | | | | | | Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
* | | Merge pull request #11411 from ↵Morris Jobke2018-09-271-2/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-checkWellKnownUrl-not-being-executed Fix "checkWellKnownUrl" not being run
| * | | Fix "checkWellKnownUrl" not being runDaniel Calviño Sánchez2018-09-271-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The check is run only if its last parameter is true; data() tries to convert the HTML attribute string to an actual JavaScript value, so "true" is returned as an actual boolean instead of an string; as a strict comparison against "true" was used the result was false and thus the checks were not run. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #11384 from nextcloud/11372/fix/logo-heightRoeland Jago Douma2018-09-271-3/+3
|\ \ \ | |/ / |/| | Fixes the logo height
| * | Fixes the logo heightMichael Weimann2018-09-271-3/+3
|/ / | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Merge pull request #11398 from nextcloud/refactor/settings-manager-complexityChristoph Wurst2018-09-273-150/+62
|\ \ | | | | | | Reduce settings manager complexity by loading sections via DI
| * | Remove unused constructor argumentChristoph Wurst2018-09-273-11/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Reduce settings manager complexity by loading sections via DIChristoph Wurst2018-09-273-140/+63
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #11163 from nextcloud/refactor/vue-backup-codesChristoph Wurst2018-09-2715-224/+4890
|\| | | | | | | | Migrate backup codes settings to Vue
| * | Fix generate button event and show regenerate button only when enabledChristoph Wurst2018-09-273-27/+30
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Bump npm packagesRoeland Jago Douma2018-09-273-435/+314
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add drone supportRoeland Jago Douma2018-09-271-0/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move to standard formatRoeland Jago Douma2018-09-2715-43/+87
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Migrate backup codes settings to VueChristoph Wurst2018-09-2713-223/+4955
|/ / | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/11034. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #11402 from nextcloud/fix_acceptanceChristoph Wurst2018-09-271-5/+5
|\ \ | | | | | | Also test enabling of the Antivirus App for files
| * | Also test enabling of the Antivirus App for filesRoeland Jago Douma2018-09-261-5/+5
| | | | | | | | | | | | | | | | | | | | | Since there is no calendar release for 15 yet we should use an app that we can quickly release for 15 as well. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-09-27138-144/+288
|/ /
* | Merge pull request #11135 from nextcloud/babel-npm-webpack-fixesRoeland Jago Douma2018-09-266-942/+1303
|\ \ | | | | | | Update config and babel for ie11
| * | Rebase and bumpJohn Molakvoæ (skjnldsv)2018-09-262-494/+310
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Merge branch 'master' into babel-npm-webpack-fixesJohn Molakvoæ (skjnldsv)2018-09-26411-3312/+5919
| |\ \ | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Update config and babel for ie11John Molakvoæ (skjnldsv)2018-09-106-822/+1219
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #11150 from nextcloud/feature/noid/unit-test-find-webrootblizzz2018-09-262-20/+74
|\ \ \ \ | | | | | | | | | | Extract logic for webroot into method and add test
| * | | | Change visibility to privateDaniel Kesselberg2018-09-132-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Restore previous state for OC::$CLIDaniel Kesselberg2018-09-111-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Change return false to throw newDaniel Kesselberg2018-09-102-10/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Extract logic for webroot into method and add testDaniel Kesselberg2018-09-102-18/+57
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #11112 from ↵Morris Jobke2018-09-261-1/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/do-not-hide-the-progress-bar-while-the-chunked-upload-is-being-assembled Do not hide the progress bar while the chunked upload is being assembled
| * | | | | Do not hide the progress bar while the chunked upload is being assembledDaniel Calviño Sánchez2018-09-071-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Large files are not uploaded in a single operation, but uploaded in several chunks; once all the chunks are uploaded then the server needs to assemble them to get the final file. Before, once the chunks were uploaded the progress bar was hidden. However, this was confusing for the users, as the file could still need some time to appear in the file list due to the assembling. Now once all the chunks are uploaded the text in the progress bar changes to inform the user that there are still some pending operations, and only when the file is finally assembled the progress bar is hidden. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #11383 from nextcloud/fix/noid/files-unavailable-deleted-userMorris Jobke2018-09-261-1/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | do not explode when getting permissions from a FailedStorage
| * | | | | do not explode when getting permissions from a FailedStorageArthur Schiwon2018-09-261-1/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for instance if a user of an external user backend is not available currently, the whole Files UI would be frozen. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-09-2634-64/+66
| | | | |
* | | | | Merge pull request #11240 from ↵Morris Jobke2018-09-252-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/noid/consider-openssl-settings-from-config.php Consider openssl settings from config.php
| * | | | | Add openssl to mockDaniel Kesselberg2018-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 22:05:59 +0000