1
0
Fork 0
mirror of synced 2024-08-30 01:12:44 +12:00
Commit graph

3444 commits

Author SHA1 Message Date
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
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
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
Jake Barnby
883d9436ea
Update specs 2024-02-21 20:03:35 +13:00
Jake Barnby
5123fddd56
Update versions 2024-02-21 20:03:14 +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
607ba5b32f
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 18:40:01 +13:00
Jake Barnby
9b251207cf
Merge branch '1.5.x' into feat-push-images 2024-02-21 18:06:58 +13:00
Jake Barnby
52d4b649e4
Add missing unique index 2024-02-21 13:09:14 +13:00
Jake Barnby
41be4da5c9
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 13:01:53 +13:00
Jake Barnby
ad8450af32
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 03:29:00 +13:00
Jake Barnby
400b28de8a
Replace resourceCollection with switch 2024-02-21 03:25:01 +13:00
Jake Barnby
64eaf91ee7
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 03:15:23 +13:00
loks0n
1fa0f18e44 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr-dx 2024-02-20 12:43:50 +00:00
loks0n
f0a981226e chore: specs 2024-02-20 12:11:33 +00:00
loks0n
fa28496b32 feat: ssr dx changes 2024-02-20 11:45:11 +00:00
Jake Barnby
eb4d6f8e20
Update specs 2024-02-20 23:23:07 +13:00
Jake Barnby
5747b33e38
Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
Jake Barnby
1bb75fdd63
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images
# Conflicts:
#	src/Appwrite/Extend/Exception.php
2024-02-19 20:44:11 +13:00
Jake Barnby
bc12187e62
Fix console SDK git ref 2024-02-19 17:09:08 +13:00
Jake Barnby
c86d26a459
Update versions 2024-02-19 16:57:57 +13:00
Jake Barnby
52c302f448
Update specs 2024-02-19 16:56:36 +13:00
Torsten Dittmann
874b20bd58 chore: release console sdk 2024-02-17 13:38:02 +00:00
Torsten Dittmann
ce4f92a6c8 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-rc-sdks 2024-02-17 13:25:56 +00:00
Torsten Dittmann
de0e83f703 fix: move user and project logic from general to api hook 2024-02-16 17:58:51 +00:00
Torsten Dittmann
ca650fce1b fix: status code for more factors required 2024-02-16 14:59:40 +00:00
Jake Barnby
14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Jake Barnby
c192f14d01
Merge remote-tracking branch 'origin/1.5.x' into feat-topic-totals-per-type 2024-02-16 14:08:04 +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
14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
Jake Barnby
d38197380e
Support adding image to push notification via storage file 2024-02-15 22:36:34 +13:00
Jake Barnby
5f59f4c5c8
Fix syntax error 2024-02-15 17:56:06 +13:00
Jake Barnby
afba7f75f0
Update appropriate total count when mutating topic 2024-02-15 17:23:30 +13:00
Jake Barnby
e462e916f0
Add email, sms and push totals to topic 2024-02-15 17:22:43 +13:00
Jake Barnby
1f470aecd2
Add subscribe permission to topics 2024-02-13 17:24:31 +13:00
Jake Barnby
66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby
8f525f5304
Merge pull request #7551 from appwrite/fix-template-enum-seperation
Fix email/sms template type enums getting the same values
2024-02-13 12:39:07 +13:00
Jake Barnby
0bd3fe6473
Merge pull request #7571 from appwrite/fix-updating-message-status
Fix updating message status
2024-02-13 12:38:39 +13:00
Jake Barnby
e26230cc34
Disallow creating a session if one already exists 2024-02-12 22:59:49 +13:00
shimon
e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
shimon
6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby
f237e863de
Throw on updating sent, processing, failed message 2024-02-12 16:55:00 +13:00
Jake Barnby
f2efe9ca72
Merge remote-tracking branch 'origin/1.5.x' into fix-template-enum-seperation
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-latest-console.json
2024-02-12 15:03:51 +13:00
Jake Barnby
18f7168160
Merge main 2024-02-12 14:18:19 +13:00
Christy Jacob
e2baefe8c6
Merge pull request #7500 from appwrite/fix-account-delete
PEA-233-prevent console user deletion before deleting their team
2024-02-11 14:52:24 +05:30
Damodar Lohani
a8718bccb5
fix rename 2024-02-11 14:42:21 +05:45
Damodar Lohani
eba03cb126
Update app/config/errors.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:32 +05:45
Damodar Lohani
622bdb7b2b
Update app/config/errors.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:25 +05:45
Jake Barnby
63e91cb3f3
Merge remote-tracking branch 'origin/1.5.x' into fix-password-version-enum-name
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2024-02-08 19:40:57 +13:00
Jake Barnby
9eaa0fff86
Merge remote-tracking branch 'origin/1.5.x' into fix-template-enum-seperation
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-latest-console.json
2024-02-08 19:24:21 +13:00
Jake Barnby
df60ee9e72
Fix SHA function enum name 2024-02-08 00:17:38 +13:00
Jake Barnby
66a38898eb
Fix message status values and enums 2024-02-07 23:50:05 +13:00
Jake Barnby
4a45927af9
Fix email/sms template type enums getting the same values 2024-02-07 23:03:59 +13:00
Jake Barnby
96cd478624
Update examples 2024-02-07 20:12:15 +13:00
Jake Barnby
2276dd2f49
Bump SDK generator RC 2024-02-07 19:17:44 +13:00
Jake Barnby
d7544f85cf
Merge branch 'fix-mfa-user-route-auth-types' into feat-rc-sdks 2024-02-07 19:14:21 +13:00
Jake Barnby
7014b2c2cd
Fix user API mfa route auth 2024-02-07 18:08:51 +13:00
Bradley Schofield
559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Christy Jacob
2f93dcc4df
Merge pull request #7547 from appwrite/feat-certificate-health-check
Add health certificate validity endpoint
2024-02-06 22:31:07 +05:30
Christy Jacob
4dee937e36
Update app/config/variables.php 2024-02-06 22:26:47 +05:30
Khushboo Verma
fb127270ce Add test for empty domain 2024-02-06 16:04:58 +05:30
Khushboo Verma
11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Jake Barnby
16e0f6d21f
Merge branch '1.5.x' into feat-rc-sdks 2024-02-06 02:25:09 +13:00
Jake Barnby
987b02083c
Array instead of JSON 2024-02-06 02:22:25 +13:00
Jake Barnby
0a72b37b3e
Fix session response model 2024-02-06 02:17:04 +13:00
Jake Barnby
6c17a9ef95
Update generator and deploy RC SDKs 2024-02-06 01:40:51 +13:00
Jake Barnby
7ce01deec3
Fix console enum specs 2024-02-06 00:39:52 +13:00
Khushboo Verma
8ed5489d9c Added env variable to variables.php and compose.phtml 2024-02-05 16:11:37 +05:30
Khushboo Verma
e8523e38f7 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:26:52 +05:30
Jake Barnby
15f433794f
Add missing enum cases 2024-02-05 20:25:34 +13:00
Jake Barnby
c193260335
Fix usage enums 2024-02-05 19:32:05 +13:00
shimon
af2b640948 updates 2024-02-04 10:33:04 +02:00
shimon
a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby
68931c8672
Merge pull request #7538 from appwrite/fix-spec-generation
Fix spec generation
2024-02-03 04:04:00 +13:00
Jake Barnby
94d82c75c0
Update specs 2024-02-03 03:41:23 +13:00
Jake Barnby
f14c0cc0aa
Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation
# 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-03 03:35:14 +13:00
Jake Barnby
38f93a3e89
Add session ID + internal ID to targets 2024-02-03 03:06:23 +13:00
Khushboo Verma
52c9109685 Improve error message 2024-02-02 19:35:35 +05:30
Khushboo Verma
7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Torsten Dittmann
db321db0fb fix: code review 2024-02-02 13:42:15 +01:00
Torsten Dittmann
75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Jake Barnby
0e8e455903
Fix spec generation 2024-02-02 23:54:34 +13:00
Jake Barnby
499f0a53ea
Update to standard namespacing for enums 2024-02-02 17:53:19 +13:00
shimon
a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02:00
Khushboo Verma
d3b002a48e Merge branch '1.5.x' into feat-block-countries 2024-02-01 17:49:14 +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
shimon
350d72eb1f updates 2024-02-01 12:21:50 +02:00
loks0n
d84cfab244 feat: remove users.createSession 2024-02-01 10:21:38 +00:00
Torsten Dittmann
3f688a2aa7 fix: remove some leftovers 2024-01-30 16:09:58 +01:00
Khushboo Verma
f4426d553c Throw 451 exception 2024-01-29 16:49:13 +05:30
Matej Bačo
36ce992e9f Add API Tokens 2024-01-29 11:15:07 +00:00
Jake Barnby
61dd4a123c
Remove descriptions 2024-01-29 19:29:58 +13:00
Damodar Lohani
215a139e87 prevent console user deletion before deleting their team 2024-01-28 02:10:14 +00:00
Christy Jacob
7e444b037d
Merge pull request #7482 from appwrite/feat-improve-cname-logging
Feat: CNAME validation logs
2024-01-26 19:08:26 +04:00
Bradley Schofield
73b1837d66 Remove HealthFailedJobs Model 2024-01-26 09:41:30 +00:00
Jake Barnby
d405106aaa Throw on enable if provider credentials are missing instead of ignoring 2024-01-25 17:59:26 +01:00
Jake Barnby
7106131545
Merge branch '1.5.x' into feat-maintenance-delete-expired-targets 2024-01-26 00:26:29 +13:00
Bradley Schofield
26d8278a89 Merge branch 'feat-impl-queue-retry' into feat-queue-failed-health-endpoints 2024-01-24 18:00:51 +00:00
Torsten Dittmann
672b2d3cf7 chore: bump console version 2024-01-24 18:52:53 +01: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
d087a76329
Merge branch '1.5.x' into sync-main-with-1.5.x 2024-01-24 12:06:22 +01:00
Christy Jacob
6f52b5f7a1
Merge pull request #7475 from appwrite/fix-certificate-mail-branding
Fix: Certificate email style
2024-01-24 14:47:21 +04: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
Matej Bačo
5bd106afaf Implement better cname validation logging 2024-01-23 15:40:32 +00:00
Matej Bačo
52786b8273 PR review changes 2024-01-23 10:35:47 +00:00
Matej Bačo
89f778014a Fix invalid specs 2024-01-23 09:27:25 +00:00
Matej Bačo
187165f397 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-23 09:12:22 +00:00
Matej Bačo
8a05b634fe Merge remote-tracking branch 'origin/1.5.x' into fix-certificate-mail-branding 2024-01-23 09:04:20 +00:00
Matej Bačo
e26a9d17cb PR review changes 2024-01-23 09:03:18 +00:00
Christy Jacob
3c3c34add9
Merge pull request #7474 from appwrite/fix-email-image-endpoint
Fix: Email image endpoints
2024-01-23 00:05:01 +04:00
Torsten Dittmann
f1293d2636 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 18:32:22 +01:00
Torsten Dittmann
a9f1e4d78d
feat: delete account (#7392)
* feat: delete account

* fix: new endpoint only for console sdk

* fix: hide endpoint from public sdks

* fix: account delete scope
2024-01-22 18:29:10 +01:00
Matej Bačo
0c7a69e665 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 16:05:38 +00:00
Matej Bačo
871c29d1a5 PR review changes 2024-01-22 15:53:11 +00:00
Christy Jacob
cfc25288b5
Merge pull request #7422 from appwrite/feat-email-otp
Feat: Email OTP
2024-01-22 19:18:39 +04:00
Matej Bačo
05a83d6d1b Merge branch 'feat-email-otp' of https://github.com/appwrite/appwrite into feat-email-otp 2024-01-22 15:02:51 +00:00
Matej Bačo
fc3fa8f1d7 PR review changes 2024-01-22 15:02:33 +00:00
Matej Bačo
f7e9d8fc19
Update app/config/locale/translations/en.json
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-22 15:57:06 +01:00
Matej Bačo
cba974805d PR review changes 2024-01-22 14:30:11 +00:00
Christy Jacob
3656be3da5
Merge pull request #7452 from appwrite/feat-session-renewal
Feat: session renewal
2024-01-22 18:28:55 +04: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
Matej Bačo
33e1d61bd9 Fix missing languages 2024-01-22 13:18:19 +00:00
Matej Bačo
58fa2efad2 Translate new keys 2024-01-22 11:15:24 +00:00
Matej Bačo
724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +00:00
Matej Bačo
4366f8e5d8 Remove incorrect translations, improve script 2024-01-22 10:01:02 +00:00
Khushboo Verma
5e3212bbff Rename redirect to path 2024-01-22 14:26:40 +05:30
Khushboo Verma
506e8c658d Refactored url construction 2024-01-22 13:48:19 +05:30
Matej Bačo
32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00
shimon
370704fafd moved cache collection to $commonCollections collection config 2024-01-21 10:47:00 +02:00
Matej Bačo
933b64001c Improve design 2024-01-20 12:49:23 +00:00
Matej Bačo
5e0c3c509d WIP: Certificate branded mail 2024-01-20 12:06:52 +00:00
Matej Bačo
284c1746eb Add proper endpoint to email images 2024-01-20 11:05:44 +00:00
Matej Bačo
df9bc6df56 Implement OTP email endpoint + tests 2024-01-19 13:42:26 +00:00
Matej Bačo
31a67a7667 Merge remote-tracking branch 'origin/1.5.x' into feat-email-otp 2024-01-19 12:12:07 +00:00
Matej Bačo
f2291f1686 Add OTP translations 2024-01-19 12:11:20 +00:00
Khushboo Verma
a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30
Khushboo Verma
3e5443f127 Add env variables to mails worker instead of webhooks worker 2024-01-19 17:09:48 +05:30