Eldad A. Fux
e5fca85d88
Merge branch 'main' into feat-reclaim-only-current-connection
2023-10-21 06:42:59 -04:00
Christy Jacob
01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep
2023-10-19 05:28:02 -04:00
Christy Jacob
4b08729131
Update app/init.php
2023-10-19 05:27:52 -04:00
Christy Jacob
a46b3d088c
Merge branch '1.4.x' into feat-api-db-timeout
2023-10-19 05:15:44 -04:00
Jake Barnby
03b6d65669
Add timeout on vcs project DBs
2023-10-19 17:21:11 +13:00
Jake Barnby
b17e24f645
Use const for timeout
2023-10-19 15:45:32 +13:00
Jake Barnby
389d367fca
Set hard timeouts for API dbs
2023-10-19 15:32:45 +13:00
Steven Nguyen
435b20df77
Bump appwrite version to 1.4.6
2023-10-18 16:07:47 -07:00
Steven Nguyen
9bc6b124c0
Bump console to version 3.2.3
2023-10-18 15:51:13 -07:00
Christy Jacob
be26e4b729
chore: remove resque library and update health check endpoints
2023-10-18 19:44:06 +00:00
Christy Jacob
74e3f3f7d2
fix: remove unused variable
2023-10-18 19:08:21 +00:00
Christy Jacob
066dd6393d
Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes
2023-10-18 18:57:16 +00:00
shimon
1036cb406d
some fixes
2023-10-17 21:32:38 +03:00
Jake Barnby
dbfe5e45aa
Delegate custom deletes
2023-10-17 12:18:51 +13:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
Eldad Fux
c6c7734c29
Merge pull request #6496 from appwrite/fix-readme-cn
...
Update logo in README-CN.md
<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.
Help us understand your motivation by explaining why you decided to make this change.
You can learn more about contributing to appwrite here: https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md
Happy contributing!
-->
## What does this PR do?
(Provide a description of what this PR does and why it's needed.)
## Test Plan
(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Screenshots may also be helpful.)
## Related PRs and Issues
- (Related PR or issue)
## Checklist
- [ ] Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md )?
- [ ] If the PR includes a change to an API's metadata (desc, label, params, etc.), does it also include updated API specs and example docs?
2023-10-11 22:01:01 +02:00
shimon
893b1d0ba7
Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.gitmodules
app/controllers/api/functions.php
app/controllers/api/health.php
app/init.php
app/views/install/compose.phtml
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Workers/Builds.php
src/Appwrite/Platform/Workers/Deletes.php
src/Appwrite/Platform/Workers/Functions.php
src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
Steven Nguyen
071920fb30
Bump version to 1.4.5
2023-10-09 16:39:46 -07:00
Steven Nguyen
2620328810
Bump APP_CACHE_BUSTER to make sure browsers fetch the new console
2023-10-09 16:38:54 -07:00
shimon
7f1507f810
sync with 1.4
2023-10-04 11:20:32 +03:00
shimon
75d8741eaa
sync against master
2023-10-01 21:30:52 +03:00
shimon
b02d51c794
migrations worker
2023-10-01 20:39:26 +03:00
Christy Jacob
0c2cd174a5
chore: prep for 1.4.4
2023-09-27 21:28:28 +00:00
shimon
c4bd6e008e
Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.env
app/cli.php
app/config/collections.php
app/console
app/controllers/api/account.php
app/controllers/api/databases.php
app/controllers/api/functions.php
app/controllers/api/projects.php
app/controllers/api/storage.php
app/controllers/api/teams.php
app/controllers/api/users.php
app/controllers/general.php
app/controllers/shared/api.php
app/init.php
app/worker.php
app/workers/audits.php
app/workers/builds.php
app/workers/certificates.php
app/workers/databases.php
app/workers/deletes.php
app/workers/functions.php
app/workers/mails.php
bin/worker-usage
composer.json
composer.lock
docker-compose.yml
src/Appwrite/Event/Delete.php
src/Appwrite/Event/Mail.php
src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Christy Jacob
27b58fdf1e
chore: increase cache buster
2023-09-14 20:06:10 +00:00
Christy Jacob
1e6b37f980
chore: update appwrite version
2023-09-14 19:53:32 +00:00
Christy Jacob
11f2ee8a1c
feat: prep for 1.4.2
2023-09-06 18:22:04 +00:00
Christy Jacob
4ea0541623
Merge pull request #6150 from appwrite/fix-global-vars
...
Fix: Global variables
2023-09-06 13:51:13 -04:00
Matej Bačo
1a6530fb57
Fix project variables
2023-09-05 10:21:36 +02:00
Matej Bačo
7588a9c4ec
Make v2 functions work again
2023-09-04 19:53:25 +02:00
Jake Barnby
afbc39b34b
Update version
2023-08-30 15:45:38 -04:00
Jake Barnby
e3a9fae033
Fix maildev auth
2023-08-30 00:56:08 -04:00
Jake Barnby
a1d0b67c6b
Fix SMTP
2023-08-30 00:30:44 -04:00
Jake Barnby
3f3d518f36
Merge remote-tracking branch 'origin/1.4.x' into feat-git-integration
...
# Conflicts:
# docker-compose.yml
2023-08-29 14:40:46 -04:00
Jake Barnby
cfdc9dff1b
Remove cloud specific config
2023-08-29 14:25:00 -04:00
Matej Bačo
8802e318d5
Fix pools resource
2023-08-23 13:52:17 +02:00
Matej Bačo
d3a9766c4f
Sync env & storage setup with 1.4.x
2023-08-23 12:08:48 +02:00
Jake Barnby
39ef0cc3c9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-git-integration-update-migration
...
# Conflicts:
# app/controllers/api/proxy.php
# composer.lock
2023-08-22 18:07:11 -04:00
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# app/controllers/api/functions.php
# composer.json
# composer.lock
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Jake Barnby
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04:00
Steven Nguyen
a13b7606a2
Fix console db namespace
2023-08-21 15:53:30 -07:00
Steven Nguyen
6bb04ca95e
Bump appwrite version to 1.4.0
2023-08-21 15:53:30 -07:00
shimon
e86286e7e3
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
...
Conflicts:
composer.lock
2023-08-20 18:07:57 +03:00
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
Matej Bačo
621e49e4b6
Add host to execution detail
2023-08-20 13:43:06 +02:00
Jake Barnby
a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.json
# composer.lock
2023-08-18 13:23:35 -04:00
Bradley Schofield
aa9ea0e013
Increment Version Number
2023-08-18 15:23:47 +01:00
Jake Barnby
a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.lock
2023-08-17 19:51:36 -04:00
Bradley Schofield
7fedac9306
Handle Eldad Suggestions
2023-08-16 19:08:24 +01:00
Bradley Schofield
a0cd65b94b
Fix Migrations Stability
2023-08-16 16:01:56 +01:00
