Matej Bačo
d091b37a15
Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x
2024-04-02 18:42:17 +02:00
Jake Barnby
22b3ea7e8d
Catch auth fixes
2024-03-11 13:03:30 +01:00
Jake Barnby
cea4e0d8b6
Wrap all db exceptions in error handler
2024-03-11 12:54:42 +01:00
Torsten Dittmann
0a1d572c72
chore: run formatter
2024-03-06 18:34:21 +01:00
Christy Jacob
03d6eb7401
Merge pull request #7669 from appwrite/main
...
Sync main
2024-02-26 17:39:33 +05:30
Jake Barnby
44ec1502f0
Merge remote-tracking branch 'origin/main' into 1.5.x
2024-02-26 18:35:25 +13:00
Jake Barnby
36ebb89a9b
Merge pull request #7667 from appwrite/1.5.x-api-descriptions
...
1.5.x api descriptions
2024-02-26 17:47:39 +13:00
Jake Barnby
19d7e533fa
Usage desc updates
2024-02-26 15:44:20 +13:00
Jake Barnby
00c3bc0f8a
Remove invalid index type
2024-02-26 15:38:58 +13:00
Vincent (Wen Yu) Ge
b32d40f3e2
Improve messages
2024-02-26 02:25:45 +00:00
fogelito
03ce64d41a
Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2
...
Conflicts:
composer.lock
2024-02-25 11:01:08 +02:00
fogelito
1474bd65b0
Rename $collectionDocument
2024-02-25 10:57:41 +02:00
fogelito
af34f195c6
Address comments
2024-02-25 10:26:02 +02:00
Utkarsh Ahuja
8c4473932f
fix: list api select query
2024-02-24 10:55:33 +00:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints"
2024-02-22 12:21:48 +05:30
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
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
06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
...
fix Indexes
2024-02-13 12:37:59 +13:00
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
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
shimon
e7ace61273
Sync against main
2024-02-12 11:10:52 +02:00
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
98a6b96af9
Hardcode size and orders
2024-02-08 15:01:20 +02: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
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
0e8e455903
Fix spec generation
2024-02-02 23:54:34 +13:00
shimon
350d72eb1f
updates
2024-02-01 12:21:50 +02:00
fogelito
a782e20315
Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
...
Conflicts:
app/controllers/api/account.php
composer.json
composer.lock
src/Appwrite/Platform/Tasks/CalcTierStats.php
tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Torsten Dittmann
9f5a0312cf
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-01-24 11:24:59 +01:00
fogelito
667abce8f5
Create indexes & query contains
2024-01-21 18:22:02 +02:00
fogelito
3689435176
Arrays tests
2024-01-21 10:10:18 +02:00
fogelito
dc203a494e
Syntax change
2023-12-20 12:55:09 +02:00
Damodar Lohani
5e59d73f78
rename stats collection
2023-12-18 10:11:10 +00:00
Jake Barnby
121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
...
# Conflicts:
# composer.lock
# src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
# src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
2023-12-15 02:41:46 +13:00
fogelito
cc5ae73f57
purgeCached changes
2023-12-14 15:32:06 +02:00
Jake Barnby
276d671921
Add temp parsing code
2023-12-13 22:45:01 +13:00
fogelito
4af00914a5
changes
2023-12-06 16:15:21 +01:00
fogelito
2fe50717d1
TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE
2023-12-06 15:10:40 +01:00
shimon
21895e3ac0
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
CHANGES.md
Dockerfile
app/controllers/api/storage.php
app/init.php
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Services/Tasks.php
src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
