1
0
Fork 0
mirror of synced 2024-07-03 13:41:01 +12:00
Commit graph

3377 commits

Author SHA1 Message Date
Torsten Dittmann 8adf6a2b7a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2024-03-04 10:29:06 +01:00
Torsten Dittmann 0cb1fed43a fix: release console sdk 2024-03-04 10:04:51 +01:00
Matej Bačo e6ad1c6830 Add more recovery code endpoints 2024-03-02 13:05:22 +00:00
Matej Bačo 7a29c79fb1 Fix bugs during QA 2024-03-01 17:04:09 +00:00
Matej Bačo 5cefca1c22 Fix MFA flows and docs 2024-03-01 16:22:51 +00:00
Torsten Dittmann 7fa578c901 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2024-03-01 14:20:32 +01:00
Torsten Dittmann 3542d360b0
Merge pull request #7698 from appwrite/update-error-message
chore: update error types for create account endpoints
2024-03-01 14:03:49 +01:00
Torsten Dittmann 1ca143417c
Update app/config/collections.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-03-01 13:29:10 +01:00
Christy Jacob c8a3b709ee chore: update error types for create account endpoints 2024-03-01 07:37:31 +00:00
Torsten Dittmann 3fe3cd0dec Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa-collection 2024-02-29 22:55:30 +01:00
Steven Nguyen fed197a313
Merge branch '1.4.x' into chore-sync-1.4.x-into-main 2024-02-29 21:53:39 +00:00
Torsten Dittmann 50c2ac9cd6
Merge branch '1.5.x' into feat-rc-sdks 2024-02-29 22:14:02 +01:00
Torsten Dittmann 8569311e73 fix: collections order 2024-02-29 22:07:10 +01:00
Torsten Dittmann b7d3996960 feat: mfa collection restructure 2024-02-29 21:59:49 +01:00
Jake Barnby 2a85c7cd96
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-27 21:56:05 +13:00
Jake Barnby 8a9a1a07a1
Update versions 2024-02-27 18:32:25 +13:00
Jake Barnby 16071d9056
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
2024-02-27 18:19:02 +13:00
Khushboo Verma af3d6b2308 Allow ssl along with tls in custom smtp 2024-02-26 20:40:41 +05:30
Jake Barnby 5015c092b5
Update specs 2024-02-27 00:46:51 +13:00
Jake Barnby cd554aa17f
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/config/specs/open-api3-1.5.x-client.json
#	app/config/specs/open-api3-1.5.x-console.json
#	app/config/specs/open-api3-1.5.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.5.x-client.json
#	app/config/specs/swagger2-1.5.x-console.json
#	app/config/specs/swagger2-1.5.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.lock
2024-02-26 18:43:52 +13:00
Jake Barnby a4ff6e4eba
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
# Conflicts:
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2024-02-26 15:50:48 +13:00
Vincent (Wen Yu) Ge ab36133a8f Add descriptions 2024-02-25 22:58:33 +00:00
Jake Barnby b1200f4cbd
Merge branch '1.5.x' into refactor-disallow-new-session-with-existing 2024-02-26 01:29:14 +13:00
David 58d4def6b8
Merge branch '1.5.x' into patch-5 2024-02-25 13:12:36 +01:00
David a5779971cf
Update es.json
Added missing dots
2024-02-24 20:46:09 +01:00
David 77bb6b31a7
Fix es.json 2024-02-24 20:38:58 +01:00
loks0n 3a7236c66d fix: specs 2024-02-24 15:01:13 +00:00
loks0n b650884351 chore: fix hide in specs 2024-02-24 14:38:09 +00:00
Jake Barnby 4190a09333
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-25 03:00:47 +13:00
loks0n 42e9865dff fix: hideServer & hideClient 2024-02-24 13:42:33 +00:00
loks0n e89d7f051b chore: specs 2024-02-24 13:19:14 +00:00
Jake Barnby 589153b729
Fix git url 2024-02-25 00:29:13 +13:00
Jake Barnby 7f0b611d69
Update versions 2024-02-25 00:20:57 +13:00
Jake Barnby a3fe6a5119
Update specs 2024-02-25 00:19:32 +13:00
Jake Barnby 46575b6df7
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/controllers/api/account.php
#	composer.lock
2024-02-25 00:16:40 +13:00
Torsten Dittmann 076ffe8866 fix: missing team variable and added mfa templates to config 2024-02-23 14:59:12 +01:00
Torsten Dittmann 6a8140a80f fix: move comma from language files into templates 2024-02-23 14:59:12 +01:00
Torsten Dittmann f5cdd5e4cc fix: comma in email templates 2024-02-23 14:59:12 +01:00
Torsten Dittmann f577811c04 fix: formatting on emails 2024-02-23 14:59:12 +01:00
Torsten Dittmann 9ae2948d0e fix: mfa email template 2024-02-23 14:59:12 +01:00
Jake Barnby 7c42a59c85
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-23 18:01:59 +13:00
loks0n b06765d238 chore: specs 2024-02-22 13:59:27 +00:00
Luke B. Silver f285173f4e
Merge branch '1.5.x' into feat-ssr-dx 2024-02-22 13:22:41 +00:00
Torsten Dittmann e7259f0a3d
Merge branch '1.5.x' into feat-rc-sdks 2024-02-21 18:22:17 +01:00
Torsten Dittmann e7f94d7095 fix: update mfa sdk method name 2024-02-21 18:08:22 +01:00
Torsten Dittmann 6cd456a35e fix: mfa sdk method 2024-02-21 17:54:39 +01: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 942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.php
#	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
#	app/controllers/api/account.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby 81b9c4dca2
Push SDKs 2024-02-22 00:31:50 +13:00
loks0n dd4809f3c8 feat: vincent error message 2024-02-21 08:57:50 +00:00