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
4ffde8e827
fix indentation
2024-02-11 14:55:14 +05:45
Damodar Lohani
57a695367b
fix typo
2024-02-11 14:54:32 +05:45
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
fdb11af6bb
Merge pull request #7561 from appwrite/update-team-counts
...
Update team counts
2024-02-11 12:15:05 +05:30
shimon
b09386727b
Usage logs text update
2024-02-10 10:34:44 +02:00
Christy Jacob
f3e8994bb8
fix: use atomic operations for updating team count
2024-02-09 23:21:17 +05:30
Christy Jacob
fb68dcc89e
fix: use atomic operations for updating team count
2024-02-09 23:20:37 +05:30
Christy Jacob
5abcb86fd7
fix: use atomic operations for updating team count
2024-02-09 23:18:18 +05:30
Christy Jacob
ff93957922
Merge pull request #7503 from appwrite/usage-queue-poc
...
Usage queue poc
2024-02-09 20:12:40 +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
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
Souptik Datta
e6a97bb36a
Merge branch 'master' into fix-7109-user-activity-log
2024-02-09 00:40:36 +05:30
shimon
a1539395c6
interval update
2024-02-08 21:08:29 +02:00
Christy Jacob
94468aa28f
Merge pull request #7556 from appwrite/refactor-usage-sn
...
Sync main with refactor-usage-sn
2024-02-09 00:25:07 +05:30
shimon
72ee7d7f34
interval update
2024-02-08 20:51:54 +02:00
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
5842f1950a
chore: linter
2024-02-08 18:02:35 +00:00
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
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
Jake Barnby
7ae2a9be91
Merge pull request #7554 from appwrite/fix-password-version-enum-name
...
Fix SHA function enum name
2024-02-08 21:58:31 +13:00
shimon
790cdc297b
composer update
2024-02-08 10:26:45 +02:00
shimon
990698e423
composer update
2024-02-08 09:32:05 +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
Jake Barnby
ed80cce878
Merge pull request #7552 from appwrite/fix-message-status
...
Fix message status values and enums
2024-02-08 19:11:32 +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
1b36d3533a
Merge remote-tracking branch 'origin/1.5.x' into fix-template-enum-seperation
2024-02-08 00:31:11 +13:00
Jake Barnby
b1a2df52fd
Merge remote-tracking branch 'origin/1.5.x' into fix-message-status
2024-02-08 00:30:57 +13:00