1
0
Fork 0
mirror of synced 2024-06-03 03:14:50 +12:00
Commit graph

1375 commits

Author SHA1 Message Date
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 f22f7cd20c
Fix lock lint 2024-02-01 01:53:44 +13: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
Khushboo Verma 8df8a5a1e1 composer update 2024-01-31 12:38:47 +05:30
Jake Barnby f0a14a441e
Add back csv lib 2024-01-30 19:15:11 +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 91e09f5f43 Increase labels max value 2024-01-29 08:55:11 +02:00
fogelito 41421ba178 Fix Domains not found 2024-01-25 17:49:50 +02:00
fogelito e0f760c32a composer.lock 2024-01-25 17:45:57 +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
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
Bradley Schofield 1e247bdde1 Address Christy's Comments and Update Lib 2024-01-19 13:18:37 +00:00
Khushboo Verma 3e5443f127 Add env variables to mails worker instead of webhooks worker 2024-01-19 17:09:48 +05:30
Jake Barnby 6629fdd87f
Bump generator 2024-01-20 00:24:09 +13:00
Jake Barnby de96e0f3dc
Update ruby 2024-01-18 20:07:39 +13:00
Khushboo Verma 5904b17b5c Design changes 2024-01-15 17:07:12 +05:30
Khushboo Verma 882e049ac9 Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts 2024-01-15 13:05:05 +05:30
Bradley Schofield 4cb48638be Rename usage_network_infinity to usage_bandwidth_infinity 2024-01-12 15:22:18 +00:00
Torsten Dittmann e2a0c2d825 sync: with 1.5.x 2024-01-12 14:04:31 +01:00
Khushboo Verma 5f42326514 Added sms translation key for all languages 2024-01-11 20:24:07 +05:30
Khushboo Verma 8a8fc28cb0 Update composer.lock 2024-01-10 19:39:48 +05:30
Khushboo Verma f6830f4e85 Resolve merge conflict 2024-01-10 19:38:55 +05:30
Khushboo Verma e91a652feb Updated composer.lock 2024-01-10 15:05:23 +05:30
Khushboo Verma b74c7671e8 Resolve merge conflicts 2024-01-10 13:13:09 +05:30
Khushboo Verma 20524316bf Composer update 2024-01-10 01:57:16 +05:30
Matej Bačo e59bdbbb8f Implement translation generator 2024-01-09 14:44:58 +00: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 219f091925
Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 12:40:07 +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 Dittmann 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
Khushboo Verma 6d8443d5cd Addressed PR comments 2024-01-05 15:13:54 +05:30
Steven Nguyen 2de8c7a68a
Update composer.lock to fix merge conflict 2024-01-05 00:32:47 +00:00
Bradley Schofield 01d76a1746 Add Queue Retry Command to Appwrite 2024-01-04 13:00:25 +00:00
Khushboo Verma 431e26c153 Allow certain domains to skip validation 2024-01-04 16:37:15 +05:30
Khushboo Verma 3863677735 Updated composer.json 2024-01-03 00:44:39 +05:30
Khushboo Verma cfca9f232c Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-02 21:57:58 +05:30
Matej Bačo 554e9f93b6 Implement max password length 2024-01-02 10:59:35 +00:00
shimon f14250bf2a sync with main 2024-01-02 12:24:57 +02:00
Damodar Lohani d070989f73 update utopia storage 2023-12-31 11:46:27 +00:00
Damodar Lohani c99976560d update utopia-storage 2023-12-31 11:37:22 +00:00
shimon bf0f1ee12c console version update + db lib version update 2023-12-28 16:27:34 +02:00
Khushboo Verma d418a581b7 Allow only public domains in webhook url 2023-12-28 15:16:08 +05:30
prateek banga 5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
Prateek Banga 1957bc57c2 makes messaging worker compatible with new messaging lib version 2023-12-19 18:28:25 +05:30
Jake Barnby 8fc3f99a8e
Update messaging lib 2023-12-15 19:55:50 +13:00
Jake Barnby 7b99fab512
Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby 2eace5a627
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
2023-12-15 02:47:59 +13:00
Jake Barnby 5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
德华 刘 dc89501012 chore: linter 2023-12-14 04:51:36 +00:00
Christy Jacob f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
Prateek Banga e7dca6b2d5 adds uniform logic for worker and extra params for email 2023-12-05 15:01:32 +01:00
shimon 235e31e6d6 composer.lock 2023-11-30 17:02:46 +02:00
prateek banga 739cc36fdc updated providerType wherever left to update 2023-11-29 15:22:26 +05:30
Jake Barnby 0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
#	src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
Jake Barnby 6ad4566b6b
Update CLI 2023-11-21 00:15:50 +13:00
Jake Barnby 02b6659b35
SDK releases 2023-11-16 21:50:39 +13:00
Jake Barnby c3015340ce
Update database 2023-11-15 16:46:43 +13:00
prateek banga f84a00dded adds search attribute filter 2023-11-14 14:07:52 +05:30
Jake Barnby 17919ecfbe
Update database 2023-11-10 12:11:21 +13:00
Steven Nguyen 5087ae61e7 Bump utopia-php/vcs and utopia-php/messaging 2023-11-09 05:51:47 +00:00
Jake Barnby 3652ab61d8
Revert "Enum tests"
This reverts commit 74450b1178.
2023-11-01 21:02:42 +13:00
Jake Barnby 74450b1178
Enum tests 2023-11-01 18:29:54 +13:00
Steven Nguyen c3b7b5af80
Fix inconsistent composer.lock
For some reason the composer.json had version 0.2.* of
utopia-php/messaging, but the composer.lock had 0.1.1.
2023-10-27 09:45:07 -07:00
Khushboo Verma 30abfb01b7 Composer update 2023-10-27 19:40:24 +05:30
Khushboo Verma 36fcc6c293 Resolve merge conflicts 2023-10-27 18:13:50 +05:30
Jake Barnby 995c404f35
Update db 2023-10-26 21:24:30 +13:00
shimon 6527a506af composer json 2023-10-25 17:27:15 +03:00
shimon b80bfb0a3c usage sync 2023-10-25 11:00:21 +03:00
Jake Barnby 8db372a7d3
Update dependencies 2023-10-25 13:55:32 +13:00
Khushboo Verma ad4db114bc Updated composer.lock 2023-10-23 15:23:52 +05:30
Khushboo Verma 2cf8639b68 Resolve merge conflicts 2023-10-23 15:06:01 +05:30
Khushboo Verma 97c1099961 Refactor code and add more assertions 2023-10-23 15:03:24 +05:30
德华 刘 79612bd80f Merge branch 'main' of https://github.com/appwrite/appwrite into feat-sm-db 2023-10-22 18:30:14 +00:00
Christy Jacob c89bace5e4 chore: revert logger version 2023-10-19 12:25:10 +00:00
shimon 23926e9530 hard coding utopia logger to 0.3.1 2023-10-19 14:01:06 +03:00
Jake Barnby 9cb2e834a6
Update db 2023-10-19 20:41:06 +13:00
Jake Barnby db3fa21468
Update database 2023-10-19 14:26:44 +13:00
Christy Jacob be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
Christy Jacob 80086e9edc chore: fix composer dependencies 2023-10-18 19:26:35 +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
Christy Jacob 72d0865ad8 chore: use deletes worker for deleting audit logs 2023-10-18 18:54:20 +00:00
shimon 59052b4fd1 some fixes 2023-10-17 18:12:43 +03:00
shimon b42a9e94e2 some fixes 2023-10-17 18:12:24 +03:00
shimon 6d98b38e23 addressing some comments 2023-10-17 07:29:37 +03:00
shimon d7b7dfef25 addressing some comments 2023-10-17 07:28:51 +03:00
shimon 5dc55110b4 small fixes 2023-10-16 17:34:55 +03:00
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Khushboo Verma fe7aa60a11 Updated composer.json 2023-10-13 18:55:33 +05:30
Khushboo Verma f18d33a0d6 Resolved merge conflicts 2023-10-13 18:54:14 +05:30
Khushboo Verma 66ec7f2e1d VCS tests 2023-10-13 18:50:58 +05:30
shimon 66c57c9a4f Merge remote-tracking branch 'origin/refactor-workers' into refactor-workers 2023-10-12 16:34:31 +03:00
shimon 4088941f70 sync with main 2023-10-12 16:34:13 +03:00
Jake Barnby 1ac3372239
Set queue name per worker 2023-10-12 17:55:30 +13:00
shimon 002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
shimon 24e09d3d8e queueForBuilds fix via functions controller 2023-10-09 13:16:05 +03:00
Khushboo Verma bd2999037d WIP: Add VCS tests 2023-10-09 15:15:36 +05:30
shimon 31466c44d8 update projects database 2023-10-08 16:44:14 +03:00
shimon 948f36a023 sync with 1.4 2023-10-05 16:15:39 +03:00
shimon a643a8c907 sync with 1.4 2023-10-04 13:43:21 +03:00
shimon 7f1507f810 sync with 1.4 2023-10-04 11:20:32 +03:00
shimon 9995ccfd51 composer 2023-10-02 09:48:06 +03:00
Steven Nguyen 785304b034
Merge branch 'main' into chore-merge-main 2023-09-29 12:36:04 -07:00
Christy Jacob 1423ad1a1c chore: update references 2023-09-28 12:56:27 +00:00
Jake Barnby 4491975f78
Update database 2023-09-28 18:41:58 +13:00
Christy Jacob 9fa93e0449 chore: review comments 2023-09-27 22:13:03 +00:00
Steven Nguyen 376cfc9d6a
Bump composer to fix migration bug 2023-09-27 11:18:03 -07:00
shimon dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
Matej Bačo 007d6953bf PR review changes 2023-09-19 09:21:11 +02:00
Matej Bačo 1669ead4e0 Transfer for Git deploys to prevent memory issues 2023-09-18 13:55:32 +02:00
Christy Jacob 1e6b37f980 chore: update appwrite version 2023-09-14 19:53:32 +00:00
Christy Jacob ac0238a336
Merge pull request #6241 from appwrite/chore-bump-sdk-versions
Chore bump sdk versions
2023-09-14 15:49:49 -04:00
Jake Barnby 316cd4f8f8
Bump CLI, Swift, Apple SDK versions 2023-09-14 15:11:40 -04:00
Christy Jacob 0f902d4d2e chore: update dependencies 2023-09-14 18:18:18 +00:00
Christy Jacob 629e0879ff chore: update composer 2023-09-14 15:22:44 +00:00
Christy Jacob 2ea8dbff29 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-bun-support 2023-09-14 15:21:31 +00:00
Prateek Banga f8c9c2f39b fixes manual internal id insertion 2023-09-14 00:48:50 +05:30
Matej Bačo 408bef06e8 Upgrade VCS lib 2023-09-13 21:08:12 +02:00
Matej Bačo 8728171728 Add Bun support 2023-09-13 19:29:58 +02:00
Christy Jacob 3d267bb4d9 chore: remove leftovers 2023-09-07 17:38:29 -04:00
Christy Jacob 1e3639bf6d Merge branch 'master' of github.com:appwrite/appwrite into chore-update-sdks 2023-09-07 17:18:42 -04:00
Christy Jacob a1aa51aa2f chore: downgrade database versiong 2023-09-06 21:14:03 +00:00
Christy Jacob 11f2ee8a1c feat: prep for 1.4.2 2023-09-06 18:22:04 +00:00
Bradley Schofield 9568cc1b01 Update composer.lock 2023-09-06 09:14:07 +01:00
Christy Jacob bf4444b045 chore: update sdks for apwrite 1.4.1 2023-08-31 18:08:24 -04:00
Jake Barnby ebf942339a
Update migrations version 2023-08-31 00:14:34 -04:00
Christy Jacob cc8aa27fea feat: update specs 2023-08-30 12:36:47 -04:00
Christy Jacob 0a162f9c92 chore: add update framework version 2023-08-30 12:19:18 -04:00
Torsten Dittmann de503318f7 chore: update composer lock 2023-08-30 11:21:34 +02:00
Khushboo Verma 1293e7bc5f Optimised list repositories endpoint 2023-08-29 23:07:34 +05:30
Matej Bačo 1f82228914 Upgrade lib versions (db mainly) 2023-08-29 13:23:42 +02:00
Bradley Schofield 07e6c34501 Merge branch 'feat-git-integration' into feat-smtp-fixes-2 2023-08-28 06:16:56 +01:00
Bradley Schofield ee0563c46f Cover other routes and cleanup code 2023-08-28 06:09:28 +01:00
Matej Bačo 5dc681377e Temporarly remove clone fix 2023-08-27 14:01:31 +02:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Jake Barnby e8ae7fb49a
Fix test wrong depends 2023-08-23 01:17:14 -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
Eldad A. Fux 8e46bdf7cb
Merge branch 'feat-git-integration' into feat-usage-rollback 2023-08-21 22:46:09 +03:00
Khushboo Verma c016ad7415 Added commitHash to git clone command 2023-08-21 17:03:07 +05:30
shimon d05718e75c rolling back usage flow 2023-08-20 16:56:49 +03:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Matej Bačo 46c7010908 Uprade dependencies 2023-08-20 11:04:42 +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 0ebd6d43d5
Merge branch 'feat-git-integration' into feat-git-integration-migrations 2023-08-18 11:18:58 +01:00