Commit Graph

4011 Commits

Author SHA1 Message Date
loks0n 906ef59d95 chore: fmt 2024-09-19 21:36:19 +01:00
loks0n 410a35deb5 fix: spacing 2024-09-19 21:29:18 +01:00
loks0n cb0416be7b chore: fmt 2024-09-19 21:08:04 +01:00
loks0n 65c0db3285 fix: package function 2024-09-19 20:58:09 +01:00
loks0n 504711845a fix: stdout 2024-09-19 20:46:05 +01:00
loks0n 32657e22cc fix: conflicts 2024-09-19 20:34:38 +01:00
loks0n cb66c9073c Merge branch '1.6.x' of https://github.com/appwrite/appwrite into fix-flaky-tests 2024-09-19 20:31:00 +01:00
loks0n 964b616e05 fix: refactor custom server test 2024-09-19 20:21:00 +01:00
loks0n af509f3479 fix: flakyness 2024-09-19 14:17:38 +01:00
loks0n 979fcacd6c fix: abstract requests 2024-09-19 12:35:52 +01:00
Bradley Schofield 82687c8ca4 Merge branch 'main' into 1.5.x-db-storage-metrics
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-latest-console.json
#	app/controllers/api/project.php
#	src/Appwrite/Utopia/Response/Model/UsageProject.php
#	tests/e2e/General/UsageTest.php
2024-09-19 15:37:27 +09:00
Damodar Lohani 8c46f73f69 Merge branch 'main' into lohanidamodar-patch-3 2024-09-19 10:10:24 +05:45
loks0n 121b9f32b8 fix: allowFailure 2024-09-18 14:50:36 +01:00
loks0n 20fa8b3017 fix: flaky functions shot 1 2024-09-18 14:29:44 +01:00
Binyamin Yawitz 1581a8c654 chore: merge 2024-09-18 09:28:55 -04:00
Damodar Lohani 1aa99a0f3e Merge branch '1.6.x' into feat-console-roles-dl 2024-09-18 11:58:09 +05:45
Christy Jacob af126a28ae Merge pull request #8639 from appwrite/fix-scheduled-executions
Fix: scheduled executions data
2024-09-18 01:40:31 +04:00
Damodar Lohani e1238d0fe9 Merge branch '1.6.x' into feat-console-roles-dl 2024-09-17 14:52:29 +05:45
Binyamin Yawitz e246005c51 chore: merge 2024-09-16 11:17:40 -04:00
Torsten Dittmann c5dae9f018 fix: backwards compatibility 2024-09-16 13:49:13 +02:00
Torsten Dittmann 4112880330 chore: run formatter 2024-09-16 12:03:18 +02:00
Torsten Dittmann 7c4a954166 chore: generate specs 2024-09-16 12:00:17 +02:00
Torsten Dittmann 8ac2f64353 fix: function storage metrics 2024-09-16 11:58:08 +02:00
Matej Bačo c4991b9941 Merge remote-tracking branch 'origin/1.6.x' into fix-scheduled-executions 2024-09-14 10:28:30 +00:00
Matej Bačo 056a646c26 Fix failing tests 2024-09-14 10:28:14 +00:00
Christy Jacob ca9af0510a Merge pull request #8627 from appwrite/fix-functions-logging
Fix: logging behaviour for Functions
2024-09-10 14:49:06 +04:00
Matej Bačo 8a2083feb5 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into fix-scheduled-executions 2024-09-10 10:38:01 +00:00
Binyamin Yawitz 1861ae3f68 fix: mock phone tests 2024-09-09 17:48:26 +02:00
Binyamin Yawitz ef1380bf61 chore: merge 2024-09-09 14:52:47 +02:00
Matej Bačo b1769ed5ca Fix scheduled executions data 2024-09-07 12:20:23 +02:00
Jake Barnby e73053d5b2 Merge remote-tracking branch 'origin/1.6.x' into 1.6.1 2024-09-06 22:26:01 +12:00
Binyamin Yawitz 9e525366cb Merge branch '1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/controllers/api/functions.php
#	app/init.php
#	composer.lock
#	src/Appwrite/Specification/Format/Swagger2.php
2024-09-05 18:09:16 -04:00
Binyamin Yawitz 439e42e1ab review: addressing 2024-09-05 14:49:37 -04:00
Binyamin Yawitz 0ecc61fe9e refactor: import instead of FQDN 2024-09-05 13:26:26 -04:00
Binyamin Yawitz fbb23b227b refactor: global to registry 2024-09-05 13:20:44 -04:00
Binyamin Yawitz 5d70884e6c chore: cleaning 2024-09-05 13:11:39 -04:00
Matej Bačo 4ae5e82d6f Fix logging behaviour; new tests 2024-09-05 13:23:24 +00:00
Matej Bačo 30a69641cb Merge branch '1.6.x' into fix-function-template-async-test 2024-09-05 10:40:04 +02:00
Damodar Lohani b30e5d4cda fix test 2024-09-05 03:52:00 +00:00
Damodar Lohani cd40df8388 fix tests and membership update 2024-09-05 03:43:02 +00:00
Jake Barnby 24746de9ba Merge remote-tracking branch 'origin/1.6.1' into feat-renaming-attributes
# 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
#	app/controllers/api/databases.php
2024-09-05 15:31:04 +12:00
Damodar Lohani 59453873b7 fix team test 2024-09-05 03:29:41 +00:00
Damodar Lohani d335aee549 fix 2024-09-05 03:24:57 +00:00
Damodar Lohani b2359786e6 fix test 2024-09-05 03:22:10 +00:00
Damodar Lohani 72d720f83e remove projects.write from user scope 2024-09-05 03:20:19 +00:00
Jake Barnby 501e7c2fa0 Add assertion 2024-09-05 14:28:15 +12:00
Jake Barnby c58fa78962 Remove tenant in filter 2024-09-05 14:25:11 +12:00
Damodar Lohani e0a30fd25a fix memberships test 2024-09-04 23:44:26 +00:00
Damodar Lohani 7c1c025f9e remove console roles test 2024-09-04 23:35:31 +00:00
Binyamin Yawitz 74a8c7da12 fix: fixes 2024-09-04 16:41:45 -04:00