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
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
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
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
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
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
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
fogelito
adbe11fd50
fix Indexes
2024-02-12 11:55:45 +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
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
70effd1e99
Sync against main
2024-02-12 11:14:26 +02: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
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
Jake Barnby
809f5a019f
Merge remote-tracking branch 'origin/1.5.x' into chore-merge-main
2024-02-12 14:22:43 +13:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
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
a8718bccb5
fix rename
2024-02-11 14:42:21 +05:45
Damodar Lohani
eba03cb126
Update app/config/errors.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:32 +05:45
Damodar Lohani
622bdb7b2b
Update app/config/errors.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:25 +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
Torsten Dittmann
7f8449b54a
chore: update console
2024-02-09 15:37:13 +01: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
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
fogelito
103fec1664
parseQueries
2024-02-08 18:10:25 +02:00
fogelito
2c57f9a44a
Merge branch '1.5.x' of github.com:appwrite/appwrite into create-array-index
2024-02-08 15:04:43 +02:00
fogelito
98a6b96af9
Hardcode size and orders
2024-02-08 15:01:20 +02: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
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
Jake Barnby
4a45927af9
Fix email/sms template type enums getting the same values
2024-02-07 23:03:59 +13:00
Jake Barnby
7014b2c2cd
Fix user API mfa route auth
2024-02-07 18:08:51 +13:00
Christy Jacob
6a5defb91c
Merge pull request #7520 from appwrite/feat-sms-metric
...
Add count for messages(sms) metric
2024-02-06 22:44:06 +05:30
Bradley Schofield
559fa924c0
Merge branch '1.5.x' into 1.5.x-response-request-models
2024-02-06 17:10:43 +00:00
Christy Jacob
2f93dcc4df
Merge pull request #7547 from appwrite/feat-certificate-health-check
...
Add health certificate validity endpoint
2024-02-06 22:31:07 +05:30
Christy Jacob
4dee937e36
Update app/config/variables.php
2024-02-06 22:26:47 +05:30
Khushboo Verma
fb127270ce
Add test for empty domain
2024-02-06 16:04:58 +05:30
Khushboo Verma
11ceeff5ca
Add health certificate validity endpoint
2024-02-06 15:15:03 +05:30
Jake Barnby
987b02083c
Array instead of JSON
2024-02-06 02:22:25 +13:00
Jake Barnby
0a72b37b3e
Fix session response model
2024-02-06 02:17:04 +13:00
Jake Barnby
28ae550853
Update console to 1.5.x
2024-02-06 01:57:38 +13:00
Christy Jacob
ad9cc748a5
Merge pull request #7471 from appwrite/fix-empty-user-updates
...
Fix: Empty values in PATCH of users
2024-02-05 15:54:40 +04:00
Jake Barnby
7ce01deec3
Fix console enum specs
2024-02-06 00:39:52 +13:00
Khushboo Verma
8ed5489d9c
Added env variable to variables.php and compose.phtml
2024-02-05 16:11:37 +05:30
Matej Bačo
25f8702429
Fix formatting
2024-02-05 10:40:53 +00:00
Matej Bačo
7beb9080fa
Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates
2024-02-05 10:38:48 +00:00
Khushboo Verma
e8523e38f7
Merge branch '1.5.x' into feat-block-countries
2024-02-05 13:26:52 +05:30
Jake Barnby
15f433794f
Add missing enum cases
2024-02-05 20:25:34 +13:00
Jake Barnby
c193260335
Fix usage enums
2024-02-05 19:32:05 +13:00
shimon
6a6c3445fa
updates
2024-02-04 20:02:01 +02:00
shimon
af2b640948
updates
2024-02-04 10:33:04 +02:00
shimon
a63977455f
Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
...
Conflicts:
.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby
bb9947bfd3
Remove invalid injection
2024-02-04 04:15:16 +13:00
Jake Barnby
68931c8672
Merge pull request #7538 from appwrite/fix-spec-generation
...
Fix spec generation
2024-02-03 04:04:00 +13:00
Jake Barnby
94d82c75c0
Update specs
2024-02-03 03:41:23 +13:00
Jake Barnby
f14c0cc0aa
Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2024-02-03 03:35:14 +13:00
Khushboo Verma
d40a51b50a
Only disallow console requests
2024-02-02 20:01:54 +05:30
Jake Barnby
3816870e19
Fix duplicate routes
2024-02-03 03:26:04 +13:00
Jake Barnby
874e483fb5
Trigger delete of targets associated with sessions when sessions are deleted
2024-02-03 03:06:36 +13:00
Jake Barnby
465bc81071
Add deletes job to delete targets tied to a particular session
2024-02-03 03:06:31 +13:00
Jake Barnby
38f93a3e89
Add session ID + internal ID to targets
2024-02-03 03:06:23 +13:00
Khushboo Verma
52c9109685
Improve error message
2024-02-02 19:35:35 +05:30
