vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

Merge branch 'master' into feature/email-reminders

This commit is contained in:
kolaente 2020-12-18 23:52:52 +01:00
parent 4176e43355 a2ce7e761c
commit f42b20937b
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/integration/list/list.spec.js
View File

@ -33,7 +33,7 @@ describe('Lists', () => {
.contains('Add')
.click()
cy.wait(3000) // Waiting until the request to create the new list is done
cy.wait(1000) // Waiting until the request to create the new list is done
cy.get('.global-notification')
.should('contain', 'Success')
cy.url()

4
cypress/integration/user/settings.spec.js
View File

@ -22,7 +22,7 @@ describe('User Settings', () => {
.contains('Upload Avatar')
.click()
cy.wait(1000) // Wait for the request to finish
cy.wait(3000) // Wait for the request to finish
cy.get('.global-notification')
.should('contain', 'Success')
})
@ -36,7 +36,7 @@ describe('User Settings', () => {
.contains('Save')
.click()
cy.wait(1000) // Wait for the request to finish
cy.wait(3000) // Wait for the request to finish
cy.get('.global-notification')
.should('contain', 'Success')
cy.get('.navbar .user .username')

2
package.json
View File

@ -16,7 +16,7 @@
"camel-case": "4.1.2",
"copy-to-clipboard": "3.3.1",
"date-fns": "2.16.1",
"dompurify": "2.2.5",
"dompurify": "2.2.6",
"lodash": "4.17.20",
"marked": "1.2.7",
"register-service-worker": "1.7.2",

2
src/models/user.js
View File

@ -19,7 +19,7 @@ export default class UserModel extends AbstractModel {
}
getAvatarUrl(size = 50) {
return `${window.API_URL}/${this.username}/avatar?size=${size}`
return `${window.API_URL}/avatar/${this.username}?size=${size}`
}
getDisplayName() {

4
src/styles/components/task.scss
View File

@ -245,10 +245,6 @@
color: $text;
background-color: $light-background !important;
.task {
max-width: 500px;
}
@media screen and (max-width: 800px) {
border-radius: 0;
padding-top: 2rem;

8
yarn.lock
View File

@ -6428,10 +6428,10 @@ domhandler@^2.3.0:
dependencies:
domelementtype "1"
dompurify@2.2.5:
version "2.2.5"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.5.tgz#c42c897dc5a556b296327779270103bb23a64292"
integrity sha512-j5MdOrriBEpuU6MuUcmfvBjDb0grTUM+gsGz2VAVv83nnwjO/m+D43HFUZslR/0/y23tIas/p+oiliQoPWLwng==
dompurify@2.2.6:
version "2.2.6"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz#54945dc5c0b45ce5ae228705777e8e59d7b2edc4"
integrity sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ==
domutils@1.5.1:
version "1.5.1"