8000 sync 1.3.x by TorstenDittmann · Pull Request #5637 · appwrite/appwrite · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

sync 1.3.x #5637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Version 1.3.6

## Bugs

- Fix Console deep linking to result in a 404 [#5632](https://github.com/appwrite/appwrite/pull/5632)
- Fix ACME HTTP Challenge [#5632](https://github.com/appwrite/appwrite/pull/5632)

# Version 1.3.5

## Bugs
Expand Down
6 changes: 3 additions & 3 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ docker run -it --rm \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
--entrypoint="install" \
appwrite/appwrite:1.3.5
8000 appwrite/appwrite:1.3.6
```

### Windows
Expand All @@ -78,7 +78,7 @@ docker run -it --rm ^
--volume //var/run/docker.sock:/var/run/docker.sock ^
--volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
--entrypoint="install" ^
appwrite/appwrite:1.3.5
appwrite/appwrite:1.3.6
```

#### PowerShell
Expand All @@ -88,7 +88,7 @@ docker run -it --rm `
--volume /var/run/docker.sock:/var/run/docker.sock `
--volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
--entrypoint="install" `
appwrite/appwrite:1.3.5
appwrite/appwrite:1.3.6
```

运行后,可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后,服务器可能需要几分钟才能启动。
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ docker run -it --rm \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
--entrypoint="install" \
appwrite/appwrite:1.3.5
appwrite/appwrite:1.3.6
```

### Windows
Expand All @@ -87,7 +87,7 @@ docker run -it --rm ^
--volume //var/run/docker.sock:/var/run/docker.sock ^
--volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
--entrypoint="install" ^
appwrite/appwrite:1.3.5
appwrite/appwrite:1.3.6
```

#### PowerShell
Expand All @@ -97,7 +97,7 @@ docker run -it --rm `
--volume /var/run/docker.sock:/var/run/docker.sock `
--volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
--entrypoint="install" `
appwrite/appwrite:1.3.5
appwrite/appwrite:1.3.6
```

Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/general.php
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@
$response->text($template->render(false));
});

App::get('/.well-known/acme-challenge')
App::get('/.well-known/acme-challenge/*')
->desc('SSL Verification')
->label('scope', 'public')
->label('docs', false)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/web/console.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Appwrite\Utopia\Response;
use Utopia\App;

App::get('/console')
App::get('/console/*')
->alias('/')
->alias('/invite')
->alias('/login')
Expand Down
4 changes: 2 additions & 2 deletions app/init.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return in list API calls
const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
const APP_CACHE_BUSTER = 504;
const APP_VERSION_STABLE = '1.3.5';
const APP_CACHE_BUSTER = 505;
const APP_VERSION_STABLE = '1.3.6';
const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
const APP_DATABASE_ATTRIBUTE_IP = 'ip';
Expand Down
51 changes: 26 additions & 25 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/Appwrite/Migration/Migration.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ abstract class Migration
'1.3.3' => 'V18',
'1.3.4' => 'V18',
'1.3.5' => 'V18',
'1.3.6' => 'V18',
];

/**
Expand Down
5 changes: 3 additions & 2 deletions tests/e2e/General/HTTPTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public function testAcmeChallenge()
'origin' => 'http://localhost',
]));

$this->assertEquals(404, $response['headers']['status-code']);
// 'Unknown path', but validation passed
$this->assertEquals(404, $response['headers']['status-code']);

/**
* Test for FAILURE
Expand All @@ -87,7 +87,8 @@ public function testAcmeChallenge()
'origin' => 'http://localhost',
]));

$this->assertEquals(404, $response['headers']['status-code']);
// Check for too many path segments
$this->assertEquals(400, $response['headers']['status-code']);

// Cleanup
$this->client->setEndpoint($previousEndpoint);
Expand Down
0