Skip to content

Commit

Permalink
Merge branch 'master' into fix/whats-new
Browse files Browse the repository at this point in the history
  • Loading branch information
Twixes committed Jan 30, 2024
2 parents e854a51 + 10cd61d commit ba74d97
Show file tree
Hide file tree
Showing 200 changed files with 10,549 additions and 4,999 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ module.exports = {
},
{
name: 'antd',
importNames: ['Card', 'Col', 'Row', 'Alert', 'Tooltip'],
importNames: ['Card', 'Col', 'Row', 'Alert', 'Tooltip', 'Progress'],
message: 'please use the Lemon equivalent instead',
},
],
Expand Down Expand Up @@ -169,6 +169,10 @@ module.exports = {
element: 'LemonButtonWithDropdown',
message: 'use <LemonMenu> with a <LemonButton> child instead',
},
{
element: 'Progress',
message: 'use <LemonProgress> instead',
},
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/auth-password-reset.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('Password Reset', () => {
it('Shows validation error if passwords do not match', () => {
cy.visit('/reset/e2e_test_user/e2e_test_token')
cy.get('[data-attr="password"]').type('12345678')
cy.get('.ant-progress-bg').should('be.visible')
cy.get('.LemonProgress__track').should('be.visible')
cy.get('[data-attr="password-confirm"]').type('1234567A')
cy.get('button[type=submit]').click()
cy.get('.text-danger').should('contain', 'Passwords do not match')
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/invites.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('Invite Signup', () => {
cy.get('.BridgePage__left').should('contain', "You've been invited to join")
cy.get('input[type="email"]').should('have.value', target_email)
cy.get('[data-attr="password"]').type('12345678')
cy.get('.ant-progress-bg').should('not.have.css', 'width', '0px') // Password strength indicator is working
cy.get('.LemonProgress__track').should('not.have.css', 'width', '0px') // Password strength indicator is working
cy.get('[data-attr="first_name"]').type(randomString('Bob'))
cy.get('[data-attr=signup-role-at-organization]').click()
cy.get('.Popover li:first-child').click()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
{
"data": {
"adds": [
{
"parentId": 183891344,
"wireframe": {
"childWireframes": [
{
"childWireframes": [
{
"disabled": false,
"height": 19,
"id": 52129787,
"style": {
"color": "#000000",
"fontFamily": "sans-serif",
"fontSize": 14,
"horizontalAlign": "left",
"paddingBottom": 0,
"paddingLeft": 0,
"paddingRight": 0,
"paddingTop": 0,
"verticalAlign": "top"
},
"text": "PostHog/posthog-ios",
"type": "text",
"width": 368,
"x": 66,
"y": 556
},
{
"disabled": false,
"height": 19,
"id": 99571736,
"style": {
"color": "#000000",
"fontFamily": "sans-serif",
"fontSize": 14,
"horizontalAlign": "left",
"paddingBottom": 0,
"paddingLeft": 0,
"paddingRight": 0,
"paddingTop": 0,
"verticalAlign": "top"
},
"text": "PostHog iOS integration",
"type": "text",
"width": 150,
"x": 10,
"y": 584
},
{
"disabled": false,
"height": 32,
"id": 240124529,
"style": {
"color": "#000000",
"fontFamily": "sans-serif",
"fontSize": 14,
"horizontalAlign": "center",
"paddingBottom": 6,
"paddingLeft": 32,
"paddingRight": 0,
"paddingTop": 6,
"verticalAlign": "center"
},
"text": "20",
"type": "text",
"width": 48,
"x": 10,
"y": 548
}
],
"disabled": false,
"height": 62,
"id": 209272202,
"style": {},
"width": 406,
"x": 2,
"y": 540
}
],
"disabled": false,
"height": 70,
"id": 142908405,
"style": {
"backgroundImage": "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\n"
},
"width": 411,
"x": 0,
"y": 536
}
},
{
"parentId": 142908405,
"wireframe": {
"childWireframes": [
{
"disabled": false,
"height": 19,
"id": 52129787,
"style": {
"color": "#000000",
"fontFamily": "sans-serif",
"fontSize": 14,
"horizontalAlign": "left",
"paddingBottom": 0,
"paddingLeft": 0,
"paddingRight": 0,
"paddingTop": 0,
"verticalAlign": "top"
},
"text": "PostHog/posthog-ios",
"type": "text",
"width": 368,
"x": 66,
"y": 556
},
{
"disabled": false,
"height": 19,
"id": 99571736,
"style": {
"color": "#000000",
"fontFamily": "sans-serif",
"fontSize": 14,
"horizontalAlign": "left",
"paddingBottom": 0,
"paddingLeft": 0,
"paddingRight": 0,
"paddingTop": 0,
"verticalAlign": "top"
},
"text": "PostHog iOS integration",
"type": "text",
"width": 150,
"x": 10,
"y": 584
},
{
"disabled": false,
"height": 32,
"id": 240124529,
"style": {
"color": "#000000",
"fontFamily": "sans-serif",
"fontSize": 14,
"horizontalAlign": "center",
"paddingBottom": 6,
"paddingLeft": 32,
"paddingRight": 0,
"paddingTop": 6,
"verticalAlign": "center"
},
"text": "20",
"type": "text",
"width": 48,
"x": 10,
"y": 548
}
],
"disabled": false,
"height": 62,
"id": 209272202,
"style": {},
"width": 406,
"x": 2,
"y": 540
}
},
{
"parentId": 209272202,
"wireframe": {
"disabled": false,
"height": 19,
"id": 52129787,
"style": {
"color": "#000000",
"fontFamily": "sans-serif",
"fontSize": 14,
"horizontalAlign": "left",
"paddingBottom": 0,
"paddingLeft": 0,
"paddingRight": 0,
"paddingTop": 0,
"verticalAlign": "top"
},
"text": "PostHog/posthog-ios",
"type": "text",
"width": 368,
"x": 66,
"y": 556
}
}
],
"removes": [
{
"id": 149659273,
"parentId": 47740111
},
{
"id": 151255663,
"parentId": 149659273
}
],
"source": 0
},
"timestamp": 1706104140861,
"type": 3
}
Loading

0 comments on commit ba74d97

Please sign in to comment.