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 |
|
Jake Barnby
|
957f08a3ef
|
Fix max int test
|
2024-02-24 01:55:00 +13:00 |
|
loks0n
|
b76771a8b4
|
fix: tests
|
2024-02-20 12:41:49 +00:00 |
|
|
fogelito
|
796e44a1ed
|
Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2
|
2024-02-13 11:46:33 +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
|
103fec1664
|
parseQueries
|
2024-02-08 18:10:25 +02:00 |
|
|
fogelito
|
98a6b96af9
|
Hardcode size and orders
|
2024-02-08 15:01:20 +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
|
80193175f1
|
test: fix database validator descriptions
|
2024-01-24 15:56:43 +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 |
|
|
Jake Barnby
|
51b2019ab6
|
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
# composer.lock
|
2024-01-09 13:56:01 +13:00 |
|
shimon
|
99f1543f1b
|
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
Conflicts:
.gitmodules
Dockerfile
app/console
app/init.php
composer.lock
src/Appwrite/Platform/Services/Workers.php
src/Appwrite/Platform/Tasks/Hamster.php
|
2024-01-02 11:49:23 +02:00 |
|
|
fogelito
|
dc203a494e
|
Syntax change
|
2023-12-20 12:55:09 +02: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 |
|
|
fogelito
|
310baef77f
|
$queries to String
|
2023-12-10 20:05:33 +01:00 |
|
Christy Jacob
|
28d00668bd
|
fix: failing tests
|
2023-12-09 00:48:34 +01:00 |
|
|
Christy Jacob
|
aa7d1a87f4
|
fix: failing tests
|
2023-12-09 00:27:35 +01:00 |
|
|
fogelito
|
630debdb84
|
Test
|
2023-12-06 19:07:29 +01:00 |
|
|
fogelito
|
cc81553cc5
|
orQueriesTest
|
2023-12-06 18:19:11 +01:00 |
|
|
shimon
|
c9a4eb0a49
|
tests fix
|
2023-11-26 22:57:57 +02: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 |
|
Prateek Banga
|
ab35b75c37
|
fix test message
|
2023-11-17 20:14:55 +05:30 |
|
|
Prateek Banga
|
228b813994
|
fixes test case
|
2023-11-17 20:06:28 +05:30 |
|
|
fogelito
|
04afeb4a8d
|
tests
|
2023-11-16 15:56:52 +02:00 |
|
|
shimon
|
9fad9dca88
|
usage sync
|
2023-10-25 10:39:59 +03:00 |
|
|
Jake Barnby
|
354211950f
|
Add timeout test
|
2023-10-19 17:06:57 +13:00 |
|
|
shimon
|
1036cb406d
|
some fixes
|
2023-10-17 21:32:38 +03:00 |
|
|
shimon
|
039df4abb3
|
revert changes
|
2023-10-16 18:04:27 +03:00 |
|
|
shimon
|
94178f8eaf
|
rollback to Usage
|
2023-10-15 20:41:09 +03:00 |
|
|
shimon
|
002fc19d60
|
tests fix
|
2023-10-10 21:02:24 +03:00 |
|
|
shimon
|
948f36a023
|
sync with 1.4
|
2023-10-05 16:15:39 +03:00 |
|
|
shimon
|
7f1507f810
|
sync with 1.4
|
2023-10-04 11:20:32 +03:00 |
|
|
Jake Barnby
|
efd25d6a70
|
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
# Conflicts:
# app/controllers/api/users.php
# composer.json
# composer.lock
# tests/e2e/Services/Storage/StorageBase.php
|
2023-08-22 17:58:42 -04:00 |
|
|
Jake Barnby
|
b48a64d1ad
|
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
# app/controllers/api/functions.php
# composer.json
# composer.lock
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
|
2023-08-22 00:59:36 -04:00 |
|
|
Jake Barnby
|
942705b5f3
|
Fix database upgrade
|
2023-08-21 23:25:55 -04:00 |
|
|
shimon
|
8147f3ee7d
|
rolling back usage flow
|
2023-08-20 15:29:43 +03:00 |
|
|
Jake Barnby
|
1e3fd5291e
|
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
|
2023-08-18 13:25:21 -04:00 |
|
|
Jake Barnby
|
a88f90dd90
|
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# 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
# composer.lock
|
2023-08-17 19:51:36 -04:00 |
|
|
Jake Barnby
|
b6ffb385a7
|
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
# Conflicts:
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
|
2023-08-16 15:55:19 -04:00 |
|
prateek banga
|
d6f4d76807
|
adds another scenario in test case
|
2023-08-16 14:57:50 +05:30 |
|
|
prateek banga
|
cb6760a957
|
removes unnecessary use statement
|
2023-08-14 22:02:54 +05:30 |
|
|
prateek banga
|
8e1ef812d3
|
resolve merge conflicts
|
2023-08-14 21:59:24 +05:30 |
|
Damodar Lohani
|
9d15f70db5
|
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2
|
2023-08-13 00:45:11 +00:00 |
|
|
Jake Barnby
|
7cd995ac3c
|
Apply suggestions from code review
|
2023-08-11 12:29:55 -04:00 |
|
|
prateek banga
|
29e1757364
|
lint fix
|
2023-08-11 17:28:32 +05:30 |
|
|
prateek banga
|
68736a53f9
|
Adds more complex test scenario
|
2023-08-11 17:25:34 +05:30 |
|
|
prateek banga
|
971ebbc686
|
fix test cases
|
2023-08-11 16:17:31 +05:30 |
|
|
Jake Barnby
|
6cd0e328d9
|
Review fixes
|
2023-08-10 16:44:38 -04:00 |
|
|
prateek banga
|
40047a2ed3
|
fix test cases
|
2023-08-10 20:03:02 +05:30 |
|