Skip to content

Commit

Permalink
Merge branch 'main' into feat-pro-1302-self-hosted-support-pricing
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/routes/pricing/+page.svelte
  • Loading branch information
ernstmul committed Oct 30, 2024
2 parents 34b5bc6 + 8d07503 commit 009cbcb
Show file tree
Hide file tree
Showing 232 changed files with 6,327 additions and 3,060 deletions.
7 changes: 7 additions & 0 deletions docker/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ services:
- --providers.docker.exposedByDefault=false
- --entrypoints.web.address=:80
- --entrypoints.websecure.address=:443
- --entrypoints.web.transport.lifeCycle.requestAcceptGraceTimeout=60s
- --entrypoints.web.proxyProtocol.trustedIPs=10.0.0.0/8
- --entrypoints.websecure.transport.lifeCycle.requestAcceptGraceTimeout=60s
- --entrypoints.websecure.proxyProtocol.trustedIPs=10.0.0.0/8
- --entryPoints.websecure.forwardedHeaders.trustedIPs=103.21.244.0/22,103.22.200.0/22,103.31.4.0/22,104.16.0.0/13,104.24.0.0/14,108.162.192.0/18,131.0.72.0/22,141.101.64.0/18,162.158.0.0/15,172.64.0.0/13,173.245.48.0/20,188.114.96.0/20,190.93.240.0/20,197.234.240.0/22,198.41.128.0/17
- --ping
- --ping.entryPoint=web
- --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https
- --providers.docker.constraints=Label(`traefik.constraint-label-stack`,`appwrite`)
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"@types/morgan": "^1.9.9",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"analytics": "^0.8.14",
"clsx": "^2.1.1",
"cva": "npm:class-variance-authority@^0.7.0",
"date-fns": "^3.6.0",
Expand All @@ -65,6 +66,7 @@
"node-html-parser": "^6.1.13",
"openapi-types": "^12.1.3",
"oslllo-svg-fixer": "^3.0.0",
"plausible-tracker": "^0.3.9",
"postcss": "^8.4.39",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.5",
Expand Down
3,733 changes: 1,789 additions & 1,944 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions src/icons/output/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
$web-icon-apple: '\ea01';
$web-icon-appwrite: '\ea02';
$web-icon-arrow-down: '\ea03';
$web-icon-arrow-ext-link: '\ea04';
$web-icon-arrow-left: '\ea05';
$web-icon-arrow-right: '\ea06';
$web-icon-arrow-up: '\ea07';
$web-icon-calendar: '\ea08';
$web-icon-check: '\ea09';
$web-icon-chevron-down: '\ea0a';
$web-icon-chevron-left: '\ea0b';
$web-icon-chevron-right: '\ea0c';
$web-icon-chevron-up: '\ea0d';
$web-icon-close: '\ea0e';
$web-icon-command: '\ea0f';
$web-icon-copy: '\ea10';
$web-icon-daily-dev: '\ea11';
$web-icon-dark: '\ea12';
$web-icon-discord: '\ea13';
$web-icon-divider-vertical: '\ea14';
$web-icon-download: '\ea15';
$web-icon-ext-link: '\ea16';
$web-icon-firebase: '\ea17';
$web-icon-github: '\ea18';
$web-icon-google: '\ea19';
$web-icon-hamburger-menu: '\ea1a';
$web-icon-light: '\ea1b';
$web-icon-linkedin: '\ea1c';
$web-icon-location: '\ea1d';
$web-icon-logout-left: '\ea1e';
$web-icon-logout-right: '\ea1f';
$web-icon-mailgun: '\ea20';
$web-icon-message: '\ea21';
$web-icon-microsoft: '\ea22';
$web-icon-minus: '\ea23';
$web-icon-nuxt: '\ea24';
$web-icon-platform: '\ea25';
$web-icon-play: '\ea26';
$web-icon-plus: '\ea27';
$web-icon-product-hunt: '\ea28';
$web-icon-refine: '\ea29';
$web-icon-rest: '\ea2a';
$web-icon-search: '\ea2b';
$web-icon-sendgrid: '\ea2c';
$web-icon-star: '\ea2d';
$web-icon-system: '\ea2e';
$web-icon-textmagic: '\ea2f';
$web-icon-twitter: '\ea30';
$web-icon-vue: '\ea31';
$web-icon-x: '\ea32';
$web-icon-ycombinator: '\ea33';
$web-icon-youtube: '\ea34';
$web-icon-apple: "\ea01";
$web-icon-appwrite: "\ea02";
$web-icon-arrow-down: "\ea03";
$web-icon-arrow-ext-link: "\ea04";
$web-icon-arrow-left: "\ea05";
$web-icon-arrow-right: "\ea06";
$web-icon-arrow-up: "\ea07";
$web-icon-calendar: "\ea08";
$web-icon-check: "\ea09";
$web-icon-chevron-down: "\ea0a";
$web-icon-chevron-left: "\ea0b";
$web-icon-chevron-right: "\ea0c";
$web-icon-chevron-up: "\ea0d";
$web-icon-close: "\ea0e";
$web-icon-command: "\ea0f";
$web-icon-copy: "\ea10";
$web-icon-daily-dev: "\ea11";
$web-icon-dark: "\ea12";
$web-icon-discord: "\ea13";
$web-icon-divider-vertical: "\ea14";
$web-icon-download: "\ea15";
$web-icon-ext-link: "\ea16";
$web-icon-firebase: "\ea17";
$web-icon-github: "\ea18";
$web-icon-google: "\ea19";
$web-icon-hamburger-menu: "\ea1a";
$web-icon-light: "\ea1b";
$web-icon-linkedin: "\ea1c";
$web-icon-location: "\ea1d";
$web-icon-logout-left: "\ea1e";
$web-icon-logout-right: "\ea1f";
$web-icon-mailgun: "\ea20";
$web-icon-message: "\ea21";
$web-icon-microsoft: "\ea22";
$web-icon-minus: "\ea23";
$web-icon-nuxt: "\ea24";
$web-icon-platform: "\ea25";
$web-icon-play: "\ea26";
$web-icon-plus: "\ea27";
$web-icon-product-hunt: "\ea28";
$web-icon-refine: "\ea29";
$web-icon-rest: "\ea2a";
$web-icon-search: "\ea2b";
$web-icon-sendgrid: "\ea2c";
$web-icon-star: "\ea2d";
$web-icon-system: "\ea2e";
$web-icon-textmagic: "\ea2f";
$web-icon-twitter: "\ea30";
$web-icon-vue: "\ea31";
$web-icon-x: "\ea32";
$web-icon-ycombinator: "\ea33";
$web-icon-youtube: "\ea34";
Loading

0 comments on commit 009cbcb

Please sign in to comment.