Commit Graph
976 Commits
Author SHA1 Message Date
Jake Barnby 0d4d046d1f Revert "Revert DB update"
This reverts commit f3eda05708.
2024-02-23 00:17:25 +13:00
Jake Barnby f3eda05708 Revert DB update 2024-02-22 23:53:18 +13:00
Torsten DittmannandGitHub e7259f0a3d Merge branch '1.5.x' into feat-rc-sdks 2024-02-21 18:22:17 +01:00
loks0n e3c261b9e4 fix: msg91 2024-02-21 16:24:55 +00:00
Jake Barnby 623c82c727 Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	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-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-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
#	src/Appwrite/Auth/Validator/Phone.php
2024-02-22 01:32:26 +13:00
Jake Barnby 39f7b3dff2 Update generator 2024-02-21 22:07:35 +13:00
Jake Barnby e91565ecc9 Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# 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
2024-02-21 19:17:50 +13:00
Jake Barnby 89fac6cfdf Update messaging lib 2024-02-20 20:32:08 +13:00
Jake Barnby ff2e22d78f Update messaging lib 2024-02-19 20:58:27 +13:00
Jake Barnby 7f8ac3186c Update generator 2024-02-19 16:56:16 +13:00
Torsten Dittmann e35a9efb12 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-rc-sdks 2024-02-15 11:32:15 +00:00
Torsten Dittmann 62fd796167 chore: update console 2024-02-14 17:54:18 +00:00
Jake Barnby be761b31c1 Update image lib 2024-02-12 14:21:06 +13:00
Jake Barnby 18f7168160 Merge main 2024-02-12 14:18:19 +13:00
Jake Barnby 2276dd2f49 Bump SDK generator RC 2024-02-07 19:17:44 +13:00
Khushboo Verma 11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Jake Barnby 6c17a9ef95 Update generator and deploy RC SDKs 2024-02-06 01:40:51 +13:00
Khushboo Verma 7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Khushboo Verma 1f0dc6cc1e Update swoole version 2024-02-02 12:50:27 +05:30
Torsten Dittmann ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
Jake Barnby e4194c690f Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider
# Conflicts:
#	composer.lock
2024-02-01 01:50:36 +13:00
Jake Barnby d9f53cacfa Add SMTP provider 2024-02-01 01:30:09 +13:00
Jake Barnby f0a14a441e Add back csv lib 2024-01-30 19:15:11 +13:00
Jake Barnby 1be0997db5 Update composer platform 2024-01-30 19:11:42 +13:00
Jake Barnby ab0fae216d Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
# Conflicts:
#	composer.lock
2024-01-30 18:44:16 +13:00
fogelito accf75156c Remove "league/csv": "9.7.1" 2024-01-29 09:24:44 +02:00
fogelito 9c8c017618 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
 Conflicts:
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2024-01-29 08:50:53 +02:00
fogelito 41421ba178 Fix Domains not found 2024-01-25 17:49:50 +02:00
fogelito a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Bradley Schofield 192599d7c6 Merge branch 'main' into feat-impl-queue-retry 2024-01-24 17:54:29 +00:00
Torsten Dittmann 9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
fogelito 55c72521e9 Upgrade base:0.7.2 2024-01-24 10:37:28 +02:00
fogelito e8a390bff6 DSN changes check 2024-01-23 13:07:08 +02:00
Torsten Dittmann 185e4258df Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 14:45:07 +01:00
fogelito a614152d78 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
 Conflicts:
	composer.lock
2024-01-22 13:05:42 +02:00
Bradley Schofield 1e247bdde1 Address Christy's Comments and Update Lib 2024-01-19 13:18:37 +00:00
Jake Barnby 8d6915aef5 Update libs 2024-01-19 23:06:11 +13:00
Jake Barnby de96e0f3dc Update ruby 2024-01-18 20:07:39 +13:00
Torsten Dittmann e2a0c2d825 sync: with 1.5.x 2024-01-12 14:04:31 +01:00
Khushboo Verma f6830f4e85 Resolve merge conflict 2024-01-10 19:38:55 +05:30
Khushboo Verma b74c7671e8 Resolve merge conflicts 2024-01-10 13:13:09 +05:30
Matej Bačo e59bdbbb8f Implement translation generator 2024-01-09 14:44:58 +00:00
Jake Barnby 28c75bda1b Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1 2024-01-09 16:56:14 +13:00
Steven Nguyen a7048255e8 Fix utopia-php/framework version
The framework version needs to be 0.33.0 as a new param was added to Template->setParam()
that is used across Appwrite.
2024-01-09 01:36:07 +00:00
Jake Barnby baf807d389 Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
2024-01-09 14:08:39 +13:00
shimon 472712dbb7 update utopia-framework version 2024-01-08 19:30:27 +02:00
shimon deb189f44b sync with main
and bump utopia-cache lib version
2024-01-08 19:16:47 +02:00
Torsten DittmannandGitHub 9ba2eafa83 fix: escape html in email params (#7409)
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
2024-01-08 18:08:17 +01:00
Torsten Dittmann 208abe17e7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-08 12:20:08 +01:00