Commit Graph

25060 Commits

Author SHA1 Message Date
Torsten Dittmann c6c8e7a092 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into 1.5.x 2024-02-14 17:58:48 +00:00
Torsten Dittmann 62fd796167 chore: update console 2024-02-14 17:54:18 +00:00
Christy Jacob abad778a1e chore: linter 2024-02-14 17:22:43 +00:00
Christy Jacob 48e87cdc7c Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers 2024-02-14 21:24:53 +05:30
fogelito 84acf990ec Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 2024-02-14 16:53:58 +02:00
Christy Jacob 28a16173ab feat: add tests 2024-02-14 12:10:19 +05:30
shimon 459db9b43e usage updates 2024-02-14 07:34:12 +02:00
Jake Barnby e0fa3a4139 Revert console update 2024-02-14 13:14:01 +13:00
Jake Barnby 0246fb254a Merge pull request #7578 from appwrite/fix-smtp-provider-update
Fix smtp provider update
2024-02-14 12:48:38 +13:00
shimon 207811a224 usage updates cl-migration-1 cl-migration-2 2024-02-13 19:26:23 +02:00
shimon 84e4748625 usage updates cl-migration-0 2024-02-13 17:58:27 +02:00
shimon 7d38860d16 usage updates 2024-02-13 17:04:16 +02:00
shimon e1e5f5d96b usage updates 2024-02-13 16:27:01 +02:00
shimon 219b28e9bf usage updates 2024-02-13 16:08:40 +02:00
Torsten Dittmann 3476ab2627 dev: introduce redis insights 2024-02-13 12:26:02 +00:00
Torsten Dittmann 756993eea2 fix: new console 2024-02-13 12:10:30 +00:00
Torsten Dittmann 1be56bf118 feat: new console 2024-02-13 12:09:52 +00:00
fogelito b9000e6d2f Changes message like Utopia 2024-02-13 12:29:36 +02:00
Jake Barnby cbf1085850 Merge pull request #7135 from appwrite/remove-deletes-db-leftovers
Remove database methods from deletes worker
2024-02-13 23:13:24 +13:00
fogelito 99fed365db Update comment 2024-02-13 12:05:47 +02:00
fogelito 796e44a1ed Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 2024-02-13 11:46:33 +02:00
Bradley Schofield b60c591f8f Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-13 09:45:59 +00:00
Bradley Schofield e2c6a2067a Address comments 2024-02-13 09:39:09 +00:00
shimon dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02:00
shimon 96317f0acb sync with main 2024-02-13 10:46:24 +02:00
shimon a0e82ccfab sync with main 2024-02-13 10:35:33 +02:00
shimon 8c44627da1 Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts
 Conflicts:
	Dockerfile
	src/Appwrite/Platform/Services/Workers.php
2024-02-13 10:29:17 +02:00
Christy Jacob f0f34e6572 Merge pull request #7575 from appwrite/cache-attr-migrations
cache collection attr migration
2024-02-13 12:09:01 +05:30
Jake Barnby f28f9df41c Update geodb 2024-02-13 17:55:32 +13:00
Jake Barnby 014464506e Remove redundant hook 2024-02-13 17:45:03 +13:00
Jake Barnby b2f119868d Add test 2024-02-13 17:41:07 +13:00
Jake Barnby 1f470aecd2 Add subscribe permission to topics 2024-02-13 17:24:31 +13:00
Jake Barnby 2ce85ce6ef Add unknown error is delivered total is 0 but there were no delivery errors 2024-02-13 17:08:45 +13:00
Jake Barnby a688929488 Merge pull request #7555 from appwrite/fix-catch-exception
Replace catching \Exception with \Throwable
2024-02-13 17:01:05 +13:00
Jake Barnby 46398f41ae Merge remote-tracking branch 'origin/1.5.x-response-request-models' into cache-attr-migrations 2024-02-13 15:22:08 +13:00
Jake Barnby 44a45f7fcc Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models 2024-02-13 15:21:57 +13:00
Jake Barnby 5826970a3c Merge remote-tracking branch 'origin/1.5.x' into fix-catch-exception 2024-02-13 15:21:46 +13:00
Jake Barnby 13ea6787cb Merge remote-tracking branch 'origin/1.5.x' into fix-smtp-provider-update
# Conflicts:
#	tests/e2e/Services/Messaging/MessagingBase.php
2024-02-13 15:21:15 +13:00
Jake Barnby 7b791aa371 Fix telesign test 2024-02-13 15:20:10 +13:00
Jake Barnby 01e88e65d6 Fix swapping options/credentials on create/update smtp provider 2024-02-13 15:16:37 +13:00
Jake Barnby 3a77ec1920 Merge remote-tracking branch 'origin/1.5.x-response-request-models' into cache-attr-migrations 2024-02-13 15:07:45 +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 0453a35620 Merge remote-tracking branch 'origin/1.5.x' into fix-catch-exception 2024-02-13 15:05:44 +13:00
Jake Barnby 94e580c259 Fix graphql test 2024-02-13 15:05:15 +13:00
Jake Barnby 37522ea66f Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +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 ff1f7e4819 Merge pull request #7569 from appwrite/fix-telesign-params
Fix telesign params
2024-02-13 12:38:49 +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 06b15c79ff Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
Jake Barnby e086101d32 Merge pull request #7558 from appwrite/json_syntax_error
Catch errors parseQueries
2024-02-13 12:36:07 +13:00