Commit Graph

6937 Commits

Author SHA1 Message Date
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
fogelito b9000e6d2f Changes message like Utopia 2024-02-13 12:29:36 +02: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
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
Jake Barnby 1f470aecd2 Add subscribe permission to topics 2024-02-13 17:24:31 +13:00
Jake Barnby 01e88e65d6 Fix swapping options/credentials on create/update smtp provider 2024-02-13 15:16:37 +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 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
Christy Jacob c076dfe6f1 Merge pull request #7576 from appwrite/refactor-usage-sn
Refactor usage sn
2024-02-12 23:05:56 +05:30
fogelito 4018224cc6 parseQueries 2024-02-12 18:06:37 +02:00
fogelito ace75b0786 parseQueries 2024-02-12 18:02:04 +02:00
fogelito 6c064430fb Merge branch '1.5.x' of github.com:appwrite/appwrite into json_syntax_error 2024-02-12 17:41:42 +02:00
fogelito 2f9cadf4c0 remove var_dump 2024-02-12 15:30:34 +02:00
fogelito 6aae8cbf64 Add cursor test 2024-02-12 15:27:19 +02:00
Jake Barnby f5aebe6673 Merge pull request #7559 from Souptik2001/fix-7109-user-activity-log
Fix missing user activity logs
2024-02-12 23:04:20 +13:00
fogelito e5bada0493 typo 2024-02-12 12:03:31 +02:00
fogelito 2ef59134a0 Merge branch '1.5.x' of github.com:appwrite/appwrite into attributes-query-fix 2024-02-12 12:00:26 +02:00
Jake Barnby e26230cc34 Disallow creating a session if one already exists 2024-02-12 22:59:49 +13:00
fogelito adbe11fd50 fix Indexes 2024-02-12 11:55:45 +02:00
Jake Barnby e2f71cbf3a Merge pull request #7557 from appwrite/create-array-index
Hardcode size and orders for Json Key Indexes
2024-02-12 22:27:15 +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 8ed2b1f3a5 Fix tests 2024-02-12 18:35:05 +13:00
Jake Barnby 3ba6652be8 Only set schedule active is status is scheduled 2024-02-12 16:55:34 +13:00
Jake Barnby f237e863de Throw on updating sent, processing, failed message 2024-02-12 16:55:00 +13:00
Jake Barnby 05884e154e Update telesign credentials 2024-02-12 15:10:18 +13:00
Jake Barnby 18f7168160 Merge main 2024-02-12 14:18:19 +13:00
Christy Jacob be92aa92e5 chore: rename files 2024-02-11 20:28:05 +05:30
Christy Jacob 89dcc34453 feat: initial commit 2024-02-11 20:21:19 +05:30
Damodar Lohani eb7e2fd23b fix injection 2024-02-11 09:46:39 +00:00
Damodar Lohani 36eabfa2dd fix check twice 2024-02-11 09:45:36 +00:00
Damodar Lohani 2634c928c7 fix format 2024-02-11 09:34:13 +00:00
Damodar Lohani e462d73f65 prevent user with active team, from deletion 2024-02-11 09:31:09 +00: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 681688e252 fix rename 2024-02-11 14:52:54 +05:45
Damodar Lohani c8720805c7 Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:19 +05:45
Christy Jacob 5abcb86fd7 fix: use atomic operations for updating team count 2024-02-09 23:18:18 +05:30
shimon 179a045399 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.lock
2024-02-09 16:29:26 +02:00
Souptik Datta e6a97bb36a Merge branch 'master' into fix-7109-user-activity-log 2024-02-09 00:40:36 +05:30
Souptik Datta 8d7be399d3 fix: Fix project user activity log's missing fields and total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:15:48 +05:30
Souptik Datta f42a78ef9c fix: Fix account activity logs total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:14:37 +05:30
Christy Jacob ba4f708137 Apply suggestions from code review
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2024-02-08 23:26:43 +05:30
fogelito bcc6564e5b typo 2024-02-08 18:18:39 +02:00
fogelito 7176d7feab Remove comment 2024-02-08 18:12:43 +02:00