summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11445 from ↵Roeland Jago Douma2018-09-292-118/+107
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.20.2 Bump webpack from 4.19.1 to 4.20.2 in /apps/oauth2
| * Bump webpack from 4.19.1 to 4.20.2 in /apps/oauth2dependabot[bot]2018-09-282-118/+107
| | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.19.1 to 4.20.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.19.1...v4.20.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | [tx-robot] updated from transifexNextcloud bot2018-09-29278-794/+836
|/
* Merge pull request #11193 from nextcloud/add-group-settingsMorris Jobke2018-09-2812-298/+1517
|\ | | | | Add new group entry on users list + fixes
| * Add new group entry on users list + fixesJohn Molakvoæ (skjnldsv)2018-09-2812-298/+1517
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #11432 from nextcloud/assemblystream-eofMorris Jobke2018-09-281-1/+1
|\ \ | | | | | | AssemblyStream is also eof if we have no more source stream
| * | AssemblyStream is also eof if we have no more source streamRobin Appelman2018-09-281-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #11037 from nextcloud/trash-webui-davMorris Jobke2018-09-2823-788/+584
|\ \ \ | |_|/ |/| | Use trashbin dav endpoint to list trash in webui
| * | fix trashbin js testsRobin Appelman2018-09-261-143/+141
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | fix sharing trashbin integration testsRobin Appelman2018-09-202-3/+23
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | fix trashbin infoparsers interfering with other dav clientsRobin Appelman2018-09-201-0/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | more trashbin integration testsRobin Appelman2018-09-202-26/+101
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | fix trashbin integration tests and add a few moreRobin Appelman2018-09-203-66/+85
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | quote paths in behat.ymlRobin Appelman2018-09-201-10/+10
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | use dav trashbin api for restoreRobin Appelman2018-09-202-48/+33
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | use dav trash api for removing from trashbinRobin Appelman2018-09-202-73/+67
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | remove old trashbin apiRobin Appelman2018-09-204-232/+0
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | remove old trashbin endpointRobin Appelman2018-09-203-55/+9
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Use trashbin dav endpoint to list trash in webuiRobin Appelman2018-09-201-43/+39
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | pass existing data to info parsersRobin Appelman2018-09-201-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | expose additional props from trashbin sabre endpointRobin Appelman2018-09-209-130/+116
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #11427 from nextcloud/enhancement/noid/ldap-numerical-idsblizzz2018-09-282-1/+44
|\ \ \ | | | | | | | | extend integration tests with users with numerical IDs
| * | | extend integration tests with users with numerical IDsArthur Schiwon2018-09-282-1/+44
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #11429 from nextcloud/feature/11033/bump_strengthifyMorris Jobke2018-09-283-13/+15
|\ \ \ \ | | | | | | | | | | Bump strengthify
| * | | | Bump strengthifyRoeland Jago Douma2018-09-283-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11033 For https://github.com/orgs/nextcloud/projects/18 Move to a stricter CSP safe strengthify Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #11428 from nextcloud/history-icon-center-fixRoeland Jago Douma2018-09-282-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Center back the history icon
| * | | | | CleanupJohn Molakvoæ (skjnldsv)2018-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Center back the history iconJohn Molakvoæ (skjnldsv)2018-09-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-28276-704/+820
| |/ / / / |/| | | |
* | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 13:53:07 +0000