Commit Graph

8501 Commits

Author SHA1 Message Date
Bradley Schofield 461795b6ff Update V17.php 2024-02-18 08:35:26 +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
Bradley Schofield aa05901f2f Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-17 11:30:19 +00:00
Bradley Schofield f6f8816e2b Migration Fixes 2024-02-17 11:29:49 +00:00
Torsten Dittmann de0e83f703 fix: move user and project logic from general to api hook 2024-02-16 17:58:51 +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 4d7becc459 Apply suggestions from code review 2024-02-16 20:23:31 +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
shimon 2a5f21e982 Addressed comments 2024-02-15 17:12:37 +02:00
Christy Jacob 7dbb1c6399 Merge branch 'main' into refactor-cache-poc 2024-02-15 20:33:57 +05:30
shimon ad44c7a430 Addressed comments 2024-02-15 16:43:58 +02:00
Shimon Newman 44ead217ac Update src/Appwrite/Platform/Workers/Messaging.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-15 16:28:02 +02: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
shimon 62ee10493b usage sms per country code count 2024-02-15 10:10:01 +02:00
Jake Barnby d82c7c24c4 Fix allowed query attributes 2024-02-15 19:35:47 +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 ae7a5c6c9c Merge pull request #7580 from appwrite/feat-subscribe-permission
Feat subscribe permission
2024-02-15 16:47:44 +13:00
shimon dae01f7077 usage logs updates 2024-02-14 23:07:25 +02:00
shimon 26af9b7463 usage logs updates 2024-02-14 23:05:01 +02: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
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
shimon 207811a224 usage updates 2024-02-13 19:26:23 +02:00
shimon 84e4748625 usage updates 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
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
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 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
Jake Barnby b2f119868d Add test 2024-02-13 17:41:07 +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 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 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
Christy Jacob c076dfe6f1 Merge pull request #7576 from appwrite/refactor-usage-sn
Refactor usage sn
2024-02-12 23:05:56 +05:30
shimon 8256c8b294 cache collection attr migration 2024-02-12 17:22:33 +02:00
Jake Barnby dd7ac27f11 Merge pull request #7570 from appwrite/feat-support-label-queries
Feat support label queries
2024-02-12 22:46:38 +13:00
shimon e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
Jake Barnby 862f20479d Merge pull request #7568 from appwrite/chore-merge-main
Merge main
2024-02-12 22:08:13 +13: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