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 |
|
|
Bradley Schofield
|
e2c6a2067a
|
Address comments
|
2024-02-13 09:39:09 +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 |
|
Christy Jacob
|
f0f34e6572
|
Merge pull request #7575 from appwrite/cache-attr-migrations
cache collection attr migration
|
2024-02-13 12:09:01 +05:30 |
|
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
|
b2f119868d
|
Add test
|
2024-02-13 17:41:07 +13:00 |
|
|
Jake Barnby
|
1f470aecd2
|
Add subscribe permission to topics
|
2024-02-13 17:24:31 +13:00 |
|
|
Jake Barnby
|
2ce85ce6ef
|
Add unknown error is delivered total is 0 but there were no delivery errors
|
2024-02-13 17:08:45 +13:00 |
|
|
Jake Barnby
|
a688929488
|
Merge pull request #7555 from appwrite/fix-catch-exception
Replace catching \Exception with \Throwable
|
2024-02-13 17:01:05 +13:00 |
|
|
Jake Barnby
|
46398f41ae
|
Merge remote-tracking branch 'origin/1.5.x-response-request-models' into cache-attr-migrations
|
2024-02-13 15:22:08 +13:00 |
|
|
Jake Barnby
|
44a45f7fcc
|
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
|
2024-02-13 15:21:57 +13:00 |
|
|
Jake Barnby
|
5826970a3c
|
Merge remote-tracking branch 'origin/1.5.x' into fix-catch-exception
|
2024-02-13 15:21:46 +13:00 |
|
|
Jake Barnby
|
13ea6787cb
|
Merge remote-tracking branch 'origin/1.5.x' into fix-smtp-provider-update
# Conflicts:
# tests/e2e/Services/Messaging/MessagingBase.php
|
2024-02-13 15:21:15 +13:00 |
|
|
Jake Barnby
|
7b791aa371
|
Fix telesign test
|
2024-02-13 15:20:10 +13:00 |
|
|
Jake Barnby
|
01e88e65d6
|
Fix swapping options/credentials on create/update smtp provider
|
2024-02-13 15:16:37 +13:00 |
|
|
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
|
0453a35620
|
Merge remote-tracking branch 'origin/1.5.x' into fix-catch-exception
|
2024-02-13 15:05:44 +13:00 |
|
|
Jake Barnby
|
94e580c259
|
Fix graphql test
|
2024-02-13 15:05:15 +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 |
|
|
Jake Barnby
|
e086101d32
|
Merge pull request #7558 from appwrite/json_syntax_error
Catch errors parseQueries
|
2024-02-13 12:36:07 +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
|
6f6b39ae20
|
stopOnFailure
|
2024-02-12 18:09:48 +02: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
|
c4b5153abd
|
composer.lock
|
2024-02-12 17:41:14 +02:00 |
|
|
shimon
|
8256c8b294
|
cache collection attr migration
|
2024-02-12 17:22:33 +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 |
|
|
Bradley Schofield
|
6fc2969e5f
|
Merge branch '1.5.x-response-request-models' of https://github.com/appwrite/appwrite into 1.5.x-response-request-models
|
2024-02-12 13:12:06 +00:00 |
|
|
fogelito
|
74f7143a18
|
remove debug
|
2024-02-12 12:04:46 +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 |
|
|
Jake Barnby
|
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
|
b9b0df9492
|
Update sleep for flaky test
|
2024-02-12 18:54:36 +13:00 |
|
|
Jake Barnby
|
ac8bddb10d
|
Update sleep for flaky test
|
2024-02-12 18:41:32 +13:00 |
|