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 and GitHub
37522ea66f
Merge branch '1.5.x' into fix-catch-exception
2024-02-13 12:47:36 +13:00
Jake Barnby and GitHub
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 and GitHub
ff1f7e4819
Merge pull request #7569 from appwrite/fix-telesign-params
...
Fix telesign params
2024-02-13 12:38:49 +13:00
Jake Barnby and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
Jake Barnby
f237e863de
Throw on updating sent, processing, failed message
2024-02-12 16:55:00 +13:00
Jake Barnby
dd8fd2e394
Allow querying on labels attribute
2024-02-12 16:10:28 +13:00
Jake Barnby
05884e154e
Update telesign credentials
2024-02-12 15:10:18 +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
Damodar Lohani
869d3c9809
fix url
2024-02-12 01:27:20 +00:00
Damodar Lohani
545a5ee126
set default endpoint and host name for specs.
2024-02-12 01:21:28 +00:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
Eldad A. Fux and GitHub
eb75b527ad
Merge pull request #7560 from appwrite/update-x-example-format
...
Update place holders from [PARAM_NAME] to <PARAM_NAME>
2024-02-11 23:04:42 +01: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
e462d73f65
prevent user with active team, from deletion
2024-02-11 09:31:09 +00:00
Christy Jacob and GitHub
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 and GitHub
4ffde8e827
fix indentation
2024-02-11 14:55:14 +05:45
Damodar Lohani and GitHub
57a695367b
fix typo
2024-02-11 14:54:32 +05:45
Damodar Lohani and GitHub
681688e252
fix rename
2024-02-11 14:52:54 +05:45
shimon
b09386727b
Usage logs text update
2024-02-10 10:34:44 +02:00
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
Bradley Schofield
0f3a1c3762
Merge branch 'main' into 1.5.x-response-request-models
2024-02-09 12:36:02 +00:00
shimon
d0985db27d
interval update
2024-02-09 13:22:48 +02:00
shimon
3788d5bceb
interval update
2024-02-09 12:56:37 +02:00
Vincent (Wen Yu) Ge
f785ffbd71
Update place holders from [PARAM_NAME] to <PARAM_NAME>
2024-02-09 03:06:38 +00:00
shimon
c1fb4ecf39
interval update
2024-02-08 21:41:23 +02:00
shimon
a1539395c6
interval update
2024-02-08 21:08:29 +02:00
shimon
72ee7d7f34
interval update
2024-02-08 20:51:54 +02:00
Christy Jacob
5842f1950a
chore: linter
2024-02-08 18:02:35 +00:00
ba4f708137
Apply suggestions from code review
...
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com >
2024-02-08 23:26:43 +05:30
Bradley Schofield
5a1fef9ec6
Update V17.php
2024-02-08 11:52:51 +00:00
Christy Jacob
2fdd0656d0
Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn
2024-02-08 11:48:53 +00:00
Bradley Schofield
d9faa7b9d3
Run Linter
2024-02-08 11:39:33 +00:00
Bradley Schofield
38c0f8ddab
Add Query Converter
2024-02-08 11:39:01 +00:00
shimon
790cdc297b
composer update
2024-02-08 10:26:45 +02:00
shimon
632f78140f
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
...
Conflicts:
composer.json
composer.lock
2024-02-08 09:29:12 +02:00
Christy Jacob and GitHub
243ddd4b33
Merge pull request #7519 from appwrite/update-param-name
...
Update param name
2024-02-08 12:55:19 +05:30
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
Steven Nguyen
4ace8ed027
Replace catching \Exception with \Throwable
...
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:
} catch (\Exception $e) {
$deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {
As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00: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