Commit 8dd5937
committed
Merge branch 'main' into feature/turnstile-captcha-registration
Resolved conflicts:
- angular.json: Took main's Angular 19 build config (vitest, @angular/build)
- registration.component.css: Merged turnstile styles with main's CSS variables
- registration.component.spec.ts: Merged turnstile mocks with vitest syntax
- company.service.ts: Kept turnstileToken feature with main's safer error handlingFile tree
124 files changed
+21926
-18412
lines changed- .github/workflows
- docs/specs
- frontend
- src
- app
- components
- audit
- company
- connect-db
- db-connection-confirm-dialog
- db-connection-delete-dialog
- connection-settings
- connections-list/own-connections
- dashboard
- db-table-view
- db-bulk-action-confirmation-dialog
- db-table-actions
- db-table-ai-panel
- db-table-row-view
- db-table-settings
- db-table-widgets
- widget
- saved-filters-panel
- saved-filters-dialog
- db-table-row-edit
- email-change
- email-verification
- login
- sso-dialog
- password-change
- password-request
- registration
- secrets
- audit-log-dialog
- create-secret-dialog
- delete-secret-dialog
- edit-secret-dialog
- master-password-dialog
- sso
- ui-components
- alert
- filter-fields
- boolean
- date-time
- date
- foreign-key
- json-editor
- password
- timezone
- record-edit-fields
- boolean
- code
- date-time
- date
- foreign-key
- id
- json-editor
- markdown
- money
- password
- phone
- point
- s3
- timezone
- record-view-fields/range
- table-display-fields
- range
- timezone
- upgrade
- user-settings
- account-delete-dialog
- users
- group-add-dialog
- group-delete-dialog
- permissions-add-dialog
- user-add-dialog
- user-delete-dialog
- zapier
- lib
- models
- services
- testing
- validators
- types
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
124 files changed
+21926
-18412
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
14 | 17 | | |
| 18 | + | |
| 19 | + | |
15 | 20 | | |
16 | | - | |
| 21 | + | |
17 | 22 | | |
18 | 23 | | |
19 | 24 | | |
| |||
0 commit comments