Commit Graph
23549 Commits
Author SHA1 Message Date
shimon 88e67c8d58 getCountryCode 2024-05-08 14:23:11 +03:00
shimon 17b9f136f1 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
 Conflicts:
	composer.json
	composer.lock
	src/Appwrite/Platform/Workers/Messaging.php
2024-05-08 14:05:14 +03:00
Jake BarnbyandGitHub 8562823b07 Merge pull request #8095 from appwrite/chore-update-database
Update database
2024-05-08 21:48:37 +12:00
Jake BarnbyandGitHub 637c3fb8c9 Merge pull request #8094 from appwrite/fix-missing-id-attribute
Fix missing id attribute error
2024-05-08 21:31:04 +12:00
Jake Barnby 0fe7235c44 Update database 2024-05-08 21:30:49 +12:00
Jake BarnbyandGitHub bb887bc08e Merge pull request #8093 from appwrite/fix-syntax-error
Fix syntax error
2024-05-08 21:19:53 +12:00
Jake Barnby 360abf4b69 Return from create attribute job is unable to find it in the attributes table 2024-05-08 21:16:27 +12:00
loks0n 91ee67d69f Revert "Merge branch 'main' of https://github.com/appwrite/appwrite into feat-add-version-header"
This reverts commit 824309e4e6, reversing
changes made to 2d09a3a17b.
2024-05-08 10:09:28 +01:00
loks0n 0aadda9605 chore: steven review 2024-05-08 10:07:10 +01:00
Jake Barnby f01922daf9 Fix syntax error 2024-05-08 21:06:30 +12:00
loks0n 824309e4e6 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-add-version-header 2024-05-08 10:05:23 +01:00
shimon 415b70585a adding new usage metric 2024-05-08 10:01:24 +03:00
Damodar Lohani 5105d07bbf Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-tests-for-cl-1 2024-05-08 06:09:46 +00:00
Damodar Lohani b27f70ee81 ignore few tests 2024-05-08 06:08:23 +00:00
Jake BarnbyandGitHub 57a8a8f187 Merge pull request #8092 from appwrite/fix-shared-queue-name
Fix shared queue name
cl-1.5.5-13
2024-05-08 16:31:27 +12:00
Jake Barnby f00133d199 Add tests for queued job status 2024-05-08 16:28:00 +12:00
Jake Barnby 6e3dee4e1f Fix shared tables db queue name 2024-05-08 16:25:12 +12:00
Jake BarnbyandGitHub f31ebd9c60 Merge pull request #8091 from appwrite/fix-namespace-with-override
Ensure namespace is set if override equals shared tables
cl-1.5.5-12
2024-05-08 16:05:32 +12:00
Jake Barnby f7cd1e2361 Ensure namespace is set if override equals shared tables 2024-05-08 16:04:28 +12:00
Jake BarnbyandGitHub 89d6d25749 Merge pull request #7206 from appwrite/feat-isolation-modes
Shared tables support
cl-1.5.5-11
2024-05-08 15:13:02 +12:00
loks0n f1a344a119 chore: specs 2024-05-07 20:02:15 +01:00
loks0n 8d6e176b66 feat: better head demo values 2024-05-07 19:55:58 +01:00
shimon b0912889c8 adding new usage metric 2024-05-07 21:22:17 +03:00
shimon 8559753978 adding new usage metric 2024-05-07 21:16:18 +03:00
508691a9a6 Update CONTRIBUTING.md
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-05-07 20:59:31 +03:00
243bdeb29c Update CONTRIBUTING.md
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-05-07 20:59:19 +03:00
ddda24e34d Update CONTRIBUTING.md
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-05-07 20:59:12 +03:00
ad5c526ca0 Update CONTRIBUTING.md
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-05-07 20:58:11 +03:00
7430cb48d0 Update CONTRIBUTING.md
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-05-07 20:58:04 +03:00
d87df00707 Update CONTRIBUTING.md
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-05-07 20:57:54 +03:00
b8a2de84da Update CONTRIBUTING.md
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-05-07 20:57:42 +03:00
Steven NguyenandGitHub 0f369b0393 Merge pull request #8074 from infysumanta/fix-8062-replace-misspelled-from-censosud-and-consosud-to-cencosud
fix: updated typo in credit-cards.php credit card image filename
2024-05-07 10:43:54 -07:00
shimon 2962fbf7d7 adding new usage metric 2024-05-07 20:12:58 +03:00
Torsten DittmannandGitHub 239a0b4dde Merge pull request #8081 from appwrite/fix-dont-kick-after-enabling-mfa
Don't kick user and require verification after enabling MFA
2024-05-07 17:49:18 +02:00
Steven NguyenandGitHub 7ea7c83415 Merge pull request #8082 from appwrite/fix-mfa-email-verification-code-font
Fix MFA email verification code font
2024-05-07 07:40:09 -07:00
Christy JacobandGitHub 2abd016fe5 Merge pull request #8048 from appwrite/fix-8039-version-in-response
Fix version in error response
2024-05-07 18:39:47 +04:00
Christy JacobandGitHub 958a7c9661 Merge pull request #8084 from appwrite/fix-email-otp-verification-status
Fix: Email OTP verified account
2024-05-07 17:35:23 +04:00
Luke B. SilverandGitHub 2d09a3a17b Merge branch '1.5.x' into feat-add-version-header 2024-05-07 11:34:02 +01:00
Jake Barnby 921eb2b900 App::getEnv -> System::getEnv 2024-05-07 22:08:00 +12:00
Matej BačoandGitHub 977fb67d8b Merge branch 'refactor-usage-sn' into fix-python-build-logs 2024-05-07 11:16:04 +02:00
Matej Bačo 4c6f01ad68 Update tests 2024-05-07 09:05:54 +00:00
Matej Bačo 08bf5aace4 Mark email verified after email OTP 2024-05-07 09:01:57 +00:00
Jake Barnby 5f9c192d72 Add assertion 2024-05-07 19:53:20 +12:00
Jake Barnby 7023cdfb9e Revert "Fix google issuer change"
This reverts commit e69862bd6f.
2024-05-07 18:23:54 +12:00
Jake Barnby 82dfbbd614 Fix isolation user test 2024-05-07 18:11:30 +12:00
Jake Barnby e69862bd6f Fix google issuer change 2024-05-07 18:11:15 +12:00
Jake Barnby e9bac08de0 Fix header test 2024-05-07 17:59:24 +12:00
Jake Barnby 356d155df2 Add shared tables enabled flag for quick toggle cl-shared-tables-20 2024-05-07 17:29:12 +12:00
Jake Barnby 74a147f3b2 Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsCustomServerTest.php
cl-shared-tables-19
2024-05-07 15:53:58 +12:00
Jake Barnby 0e9838d290 Remove logging and test files 2024-05-07 15:48:20 +12:00