1
0
Fork 0
mirror of synced 2024-06-03 03:14:50 +12:00
Commit graph

3243 commits

Author SHA1 Message Date
fogelito 74f7143a18 remove debug 2024-02-12 12:04:46 +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 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
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
Jake Barnby 8ed2b1f3a5
Fix tests 2024-02-12 18:35:05 +13:00
Jake Barnby 2059de5dea
Fix test 2024-02-12 15:40:11 +13:00
Jake Barnby 05884e154e
Update telesign credentials 2024-02-12 15:10:18 +13:00
Jake Barnby 18f7168160
Merge main 2024-02-12 14:18:19 +13:00
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
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 38c0f8ddab Add Query Converter 2024-02-08 11:39:01 +00:00
Jake Barnby 5e5a2fb414
Fix graphql tests 2024-02-08 00:08:05 +13:00
Bradley Schofield 559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Khushboo Verma fb127270ce Add test for empty domain 2024-02-06 16:04:58 +05:30
Khushboo Verma 11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Matej Bačo 7beb9080fa Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates 2024-02-05 10:38:48 +00:00
Khushboo Verma 0f1df4b5bb Fixed tests 2024-02-05 13:25:52 +05:30
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
Khushboo Verma 7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Torsten Dittmann e6ac3d73e8 revert: var_dump 2024-02-02 14:21:10 +01:00
Torsten Dittmann 7cbaf4e961 tests: debug 2024-02-02 14:13:52 +01:00
Torsten Dittmann 75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Khushboo Verma 0ea7b28a6b Resolve merge conflicts 2024-02-02 12:53:25 +05:30
Khushboo Verma 1f0dc6cc1e Update swoole version 2024-02-02 12:50:27 +05:30
Jake Barnby 3bb2016598
Fix tests 2024-02-02 18:48:34 +13:00
shimon a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02:00
Eldad A. Fux 321a998947
Merge pull request #7533 from appwrite/feat-rename-security-phrases
Feat: Rename security phrases
2024-02-01 15:45:15 +01:00
Matej Bačo ef3f7878dc PR review changes 2024-02-01 14:13:30 +00:00
Khushboo Verma d3b002a48e Merge branch '1.5.x' into feat-block-countries 2024-02-01 17:49:14 +05:30
Khushboo Verma 851e5c5154 Remove restrict group and add logic to auth group 2024-02-01 17:40:41 +05:30
Torsten Dittmann ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
loks0n 5e26f01ecd chore: fix account get ssr 2024-02-01 10:41:41 +00:00
Matej Bačo a47a4240ed Rename security phrases 2024-02-01 10:41:01 +00:00
shimon f477be7521 Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	composer.json
2024-01-31 20:28:03 +02:00
Jake Barnby e4194c690f
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider
# Conflicts:
#	composer.lock
2024-02-01 01:50:36 +13:00
Jake Barnby 49a753509b
Merge pull request #7067 from appwrite/feat-php-8-1
Upgrade to PHP 8.2
2024-02-01 01:47:57 +13:00
Jake Barnby d9f53cacfa
Add SMTP provider 2024-02-01 01:30:09 +13:00
Jake Barnby 39312a83ef
Merge pull request #7518 from appwrite/feat-remove-description
Feat remove description
2024-02-01 00:33:49 +13:00
Khushboo Verma dadb94c499 Merge branch '1.5.x' into feat-block-countries 2024-01-31 12:24:21 +05:30
Jake Barnby ab0fae216d
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
# Conflicts:
#	composer.lock
2024-01-30 18:44:16 +13:00
Jake Barnby d7c9f9df59
Merge remote-tracking branch 'origin/1.5.x' into feat-remove-description 2024-01-30 16:58:20 +13:00
Jake Barnby 14a279eb57
Merge remote-tracking branch 'origin/1.5.x' into feat-delete-message 2024-01-30 16:58:04 +13:00
Khushboo Verma f4426d553c Throw 451 exception 2024-01-29 16:49:13 +05:30
Khushboo Verma 4cd5999bb3 Merge branch '1.5.x' into feat-block-countries 2024-01-29 16:25:31 +05:30
fogelito 9c8c017618 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
 Conflicts:
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2024-01-29 08:50:53 +02:00
Jake Barnby afbbada22a
Fix tests 2024-01-29 19:36:05 +13:00
Jake Barnby d94962f086
Add message delete route 2024-01-29 17:20:45 +13:00
Damodar Lohani 359b3326d9 remove unused import 2024-01-28 03:03:20 +00:00
Damodar Lohani 7a94bd143c update account delete test 2024-01-28 03:02:44 +00:00
fogelito 789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +02:00
fogelito 981ba852c5 lint 2024-01-25 19:01:48 +02:00
Jake Barnby 7a5c226110 Fix tests 2024-01-25 17:59:26 +01:00
Jake Barnby 874e3dd8d8 Add test ensuring 400 if trying to enable with missing credentials 2024-01-25 17:59:26 +01:00
fogelito 998c4d282d Fix failing tests 2024-01-25 18:53:51 +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
Bradley Schofield c8d75fadf9 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-25 12:27:00 +00:00
Bradley Schofield 2b31c76918 Update DatabasesBase.php 2024-01-25 10:04:41 +00:00
Torsten Dittmann 9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann 80193175f1 test: fix database validator descriptions 2024-01-24 15:56:43 +01:00
Torsten Dittmann 88cf7ea9e8 fix: race condition with creating a user with targets 2024-01-24 15:31:58 +01:00
Khushboo Verma 51d1a38f0f Added test case 2024-01-24 18:24:48 +05:30
Torsten Dittmann d13023f23c fix: deletes worker 2024-01-24 11:42:04 +01: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
Bradley Schofield 4ce5256c1e Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-23 16:17:56 +00:00
fogelito 8dd387cfbe Parsing and Throw Error 2024-01-23 17:14:14 +02:00
fogelito e8a390bff6 DSN changes check 2024-01-23 13:07:08 +02:00
Matej Bačo 187165f397 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-23 09:12:22 +00:00
Torsten Dittmann f1293d2636 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 18:32:22 +01:00
Torsten Dittmann a9f1e4d78d
feat: delete account (#7392)
* feat: delete account

* fix: new endpoint only for console sdk

* fix: hide endpoint from public sdks

* fix: account delete scope
2024-01-22 18:29:10 +01:00
Matej Bačo 0c7a69e665 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 16:05:38 +00:00
fogelito 52c3863589 Comment failing tests 2024-01-22 17:55:20 +02:00
Christy Jacob cfc25288b5
Merge pull request #7422 from appwrite/feat-email-otp
Feat: Email OTP
2024-01-22 19:18:39 +04:00
fogelito d0de6b57e9 jfif error 2024-01-22 17:12:12 +02:00
Matej Bačo 1ac7fae9f8 Fix more tests 2024-01-22 14:46:53 +00:00
Matej Bačo d637efb27c Fix failing tests 2024-01-22 14:41:23 +00:00
Matej Bačo cba974805d PR review changes 2024-01-22 14:30:11 +00:00
Torsten Dittmann 185e4258df Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 14:45:07 +01:00
Matej Bačo 3bf89a931d PR review changes 2024-01-22 13:20:48 +00:00
Bradley Schofield b88ff90c22 Update V17Test.php 2024-01-22 11:23:23 +00:00
fogelito a614152d78 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
 Conflicts:
	composer.lock
2024-01-22 13:05:42 +02:00
Jake Barnby 8cfd194cc0
Fix user tests 2024-01-22 23:29:41 +13:00
Matej Bačo 724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +00:00
Matej Bačo 32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00: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
Matej Bačo 311e9a75dd Allow empty values in PATH user service 2024-01-20 09:43:31 +00:00
Matej Bačo 1528eb548a Add failre tests 2024-01-19 14:42:06 +00:00
Matej Bačo df9bc6df56 Implement OTP email endpoint + tests 2024-01-19 13:42:26 +00:00
Bradley Schofield 18f3f35cad Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-19 13:29:04 +00:00
Khushboo Verma a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30
Steven Nguyen 3938c53256
Add endpoint to list a message's targets
This endpoint is needed so that the Console can fetch the associated
targets to display when viewing the details of a message or going in
to edit a message.
2024-01-19 06:03:23 +00:00
Jake Barnby 59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling
Feat message scheduling
2024-01-19 16:55:49 +13:00
Jake Barnby c5c832eff6
Merge pull request #7382 from appwrite/feat-search-subscribers
Add search param for list subscribers endpoint
2024-01-19 16:31:48 +13:00
Jake Barnby a3096bc209
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	app/controllers/api/messaging.php
2024-01-19 15:54:21 +13:00
Torsten Dittmann e7c40d1cb1 fix: teams session 2024-01-18 14:19:30 +01:00
Khushboo Verma 7efdc7556d Fix formatting and remove flaky test 2024-01-18 18:12:58 +05:30
Khushboo Verma e3f83b1335 Assert that webhook is disabled 2024-01-18 17:58:18 +05:30
Khushboo Verma e9aab8d9ee Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-18 15:21:55 +05:30
Khushboo Verma 3a1fe3b2a7 Add webhook tests 2024-01-18 15:19:57 +05:30
Steven Nguyen 96de1617ed
Update the content in the subscriber's search attribute 2024-01-18 02:32:32 +00:00
Matej Bačo 52f7c4a099 Improve tests 2024-01-17 16:47:26 +00:00
loks0n 3112a82dce test: fix authTest 2024-01-17 12:18:35 +00:00
loks0n 498ddbf14c test: add create email session test for server 2024-01-17 11:58:40 +00:00
Matej Bačo f64989dd13 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-17 11:26:16 +00:00
loks0n 39a351adc1 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-17 11:22:45 +00:00
Matej Bačo 20322589dd Improve SMTP test email design 2024-01-17 11:22:08 +00:00
loks0n 0092af7ac6 chore: rename new scopes 2024-01-17 11:17:03 +00:00
loks0n bc1858c516 chore: do not auto create accounts in users endpoints 2024-01-17 11:03:04 +00:00
Jake Barnby 2f786c03a2
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	tests/e2e/Services/GraphQL/Base.php
2024-01-17 19:07:40 +13:00
Jake Barnby bc37984cdb
Merge pull request #7430 from appwrite/fix-default-topic-description
Default topic description to an empty string instead of null
2024-01-17 19:05:55 +13:00
Bradley Schofield 198f68b807 Implement Response and Request filters as well as migrations 2024-01-16 11:10:07 +00:00
Matej Bačo 12a0596c6e Implement session renewal test 2024-01-15 20:04:36 +00:00
Matej Bačo 98d84a6887 Fix unit tests 2024-01-15 14:53:37 +00:00
Matej Bačo 39997c817f Fix failing tests 2024-01-15 14:37:47 +00:00
loks0n 6bf82c3dc5 test: fix user token test 2024-01-15 11:30:54 +00:00
Matej Bačo ffa4ad09ec Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-15 11:07:32 +00:00
Matej Bačo 8668f15835 Linter fix 2024-01-15 11:02:05 +00:00
Matej Bačo e6c8eadc8c Improve test smtp mail E2E test 2024-01-15 11:00:33 +00:00
Jake Barnby 4d9fb1d687
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	src/Appwrite/Platform/Workers/Messaging.php
2024-01-15 20:07:01 +13:00
Jake Barnby 44a28173e4
Merge branch '1.5.x' into feat-remove-apns-endpoint 2024-01-15 16:33:43 +13:00
loks0n 56fe939713 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-13 09:55:44 +00:00
Matej Bačo e9de0332cc
Remove passwordAgain (#7441) 2024-01-12 14:33:10 +01:00
Khushboo Verma ce8fe76a96 Fix tests 2024-01-12 01:32:48 +05:30
Matej Bačo 34bac3dc5c
Merge branch '1.5.x' into feat-security-phrases 2024-01-11 11:54:16 +01:00
Jake Barnby 322dae626a
Merge branch '1.5.x' into feat-message-scheduling 2024-01-11 22:29:49 +13:00
Jake Barnby 320919fef2
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 2024-01-11 19:59:59 +13:00
Jake Barnby cb3e354cf1
Fix tests 2024-01-11 19:47:55 +13:00
Jake Barnby 9063b4e77f
Fix controller scheduling, ensuring created when message updated and none exists 2024-01-11 15:58:24 +13:00
Steven Nguyen 74a7ffbf7a
Default topic description to an empty string instead of null
Not using nulls makes things more type safe.
2024-01-11 02:06:56 +00:00
Jake Barnby 513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
# Conflicts:
#	app/controllers/api/messaging.php
#	tests/e2e/Services/Messaging/MessagingBase.php
2024-01-11 13:06:15 +13:00
Matej Bačo 931efe24a9 Added security phrase to magic URL 2024-01-10 14:52:32 +00:00
loks0n 5112e14d5f fix: typo 2024-01-10 10:37:27 +00:00
loks0n de977fc84c test: fix account tests 2024-01-10 10:27:38 +00:00
loks0n 94e45da5c7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-10 10:15:29 +00:00
Jake Barnby 5039592128
Bump base 2024-01-10 16:39:14 +13:00
Steven Nguyen e7d3797234
Remove the endpoint param for APNS providers
The endpoint was removed from utopia-php/messaging.
2024-01-09 21:30:56 +00:00
loks0n b1ca8177ac test: fix expose headers test 2024-01-09 18:15:08 +00:00
loks0n 154568d952 test: fix puts that should be posts 2024-01-09 18:05:21 +00:00
loks0n 24ff63bd99 test: fix general tests 2024-01-09 17:53:49 +00:00
loks0n 9a34c92fac Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-09 16:42:00 +00:00
Matej Bačo 159c610149 Fix tests 2024-01-09 13:33:02 +00:00
loks0n 0f77195f41 test: rename create session test 2024-01-09 12:44:50 +00:00
Torsten Dittmann d344ba46c4
feat: account delete (#7415)
* feat: account delete

* chore: run specs

* release: console sdk

* chore: run formatter

* tests: fix project tests
2024-01-09 12:58:36 +01:00
Jake Barnby 28c75bda1b
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1 2024-01-09 16:56:14 +13:00
Jake Barnby 78b46f975e
Fix messaging tests 2024-01-09 16:44:15 +13:00
Jake Barnby 5044c0cafa
Fix users tests 2024-01-09 16:43:39 +13:00
Steven Nguyen dea3c0416b
Fix broken usage tests 2024-01-09 03:11:00 +00:00
Jake Barnby 460ace2d0a
Fix teams test to account for newly disallowed empty keys 2024-01-09 15:54:46 +13:00
Steven Nguyen fc2a4e52e2
Update the usage test to retry since the test is flaky 2024-01-09 02:23:22 +00:00
Jake Barnby 7795301772
Fix unit tests 2024-01-09 15:21:43 +13:00
Steven Nguyen 747779b245
Fix usage test checking wrong array key 2024-01-09 02:09:40 +00:00
Jake Barnby baf807d389
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
2024-01-09 14:08:39 +13: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
Jake Barnby 745f49541e
Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 13:53:19 +13:00
Jake Barnby fc81c032b4
Clean up test values 2024-01-09 13:41:55 +13:00
Jake Barnby 219f091925
Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 12:40:07 +13:00
loks0n 5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00:00
Steven Nguyen 4cfd977bd7
Add support for querying topic total 2024-01-04 00:59:44 +00:00
Steven Nguyen d2d36bbfae
Add changes from previous console platforms variable PR
See https://github.com/appwrite/appwrite/pull/4581
2024-01-03 20:38:42 +00:00
Steven Nguyen 06e385b346
Add changes from previous console platforms variable PR
See https://github.com/appwrite/appwrite/pull/4581
2024-01-03 19:30:42 +00:00
Damodar Lohani 640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Matej Bačo 554e9f93b6 Implement max password length 2024-01-02 10:59:35 +00: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
Damodar Lohani b2b863f09f
Merge branch 'main' into fix-chunk-upload-permission 2024-01-02 11:51:09 +05:45
shimon 260b280e10 preview_output_fix 2023-12-28 11:54:21 +02:00
Damodar Lohani 83a009dcba update tests for preview 2023-12-28 02:22:05 +00:00
Damodar Lohani a6b4ade39b update large file upload test to not include update permission 2023-12-25 06:06:18 +00:00
Damodar Lohani b6b1b396b3 update chunk upload test 2023-12-25 06:00:43 +00:00
fogelito babc4f2f76 Remove var dump 2023-12-20 13:54:20 +02:00
fogelito dc203a494e Syntax change 2023-12-20 12:55:09 +02:00
Eldad Fux 2476b47047 Fixed test 2023-12-20 00:28:47 +01:00
Eldad Fux 55a50d457c Fixed test 2023-12-20 00:21:34 +01:00
Eldad Fux cac0b0b5e4 Fixed test 2023-12-19 23:31:45 +01:00
Eldad Fux d8d9976aa1 Updated tests 2023-12-19 22:39:40 +01:00
prateek banga 5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
loks0n 1b6a833bed fix: encode session for ssr clients 2023-12-19 15:45:44 +00:00
Eldad Fux 171d46b091 Added test 2023-12-19 16:19:57 +01:00
Prateek Banga 1957bc57c2 makes messaging worker compatible with new messaging lib version 2023-12-19 18:28:25 +05:30
Jake Barnby 23b39fee02
FIx FCM tests 2023-12-17 12:41:20 +13: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 2eace5a627
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
2023-12-15 02:47:59 +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
loks0n 1349093b13 chore: fmt 2023-12-13 11:42:45 +00:00
loks0n 92ccdd5144 fix: account tests 2023-12-13 11:29:30 +00:00
loks0n bdcb4c785e test: account already logged in 2023-12-13 11:01:08 +00:00
loks0n d623d4dcf9 Revert "test: fix gql tests"
This reverts commit 467f4eaa06.
2023-12-13 10:26:57 +00:00
Torsten Dittmann 063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
loks0n 467f4eaa06 test: fix gql tests 2023-12-12 11:50:30 +00:00
loks0n 453c1928ee fix: teams tests 2023-12-11 20:56:59 +00:00
loks0n fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
loks0n 7ee4ad5ba9 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-11 16:52:14 +00:00
Torsten Dittmann ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
fogelito 310baef77f $queries to String 2023-12-10 20:05:33 +01:00
Torsten Dittmann 95425832ae fix: tests and response models 2023-12-10 11:03:01 +01:00
Christy Jacob c21a063642 fix: failing tests 2023-12-09 01:02:13 +01:00
Christy Jacob 28d00668bd fix: failing tests 2023-12-09 00:48:34 +01:00
Christy Jacob aeeb7e1d55 fix: failing tests 2023-12-09 00:36:01 +01:00
Christy Jacob 75e1779921 fix: failing tests 2023-12-09 00:29:14 +01:00
Christy Jacob 72a2a043cd fix: linter 2023-12-09 00:28:10 +01:00
Christy Jacob aa7d1a87f4 fix: failing tests 2023-12-09 00:27:35 +01:00
Christy Jacob 731e7b86a7 fix: failing tests 2023-12-09 00:17:13 +01:00
Christy Jacob 8b5783d3ff fix: update setParam 2023-12-08 21:02:07 +01:00
Christy Jacob ea3b9ca0ec
Revert "Update appwrite base image" 2023-12-07 17:37:15 +01:00
Prateek Banga b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
fogelito 630debdb84 Test 2023-12-06 19:07:29 +01:00
fogelito cc81553cc5 orQueriesTest 2023-12-06 18:19:11 +01:00
Prateek Banga 194bbbb350 review changes 2023-12-05 19:24:55 +01:00
德华 刘 fa7f9be6f7 fix: update image sizes in graphQL test 2023-12-05 14:25:19 +00:00
德华 刘 1595d41490 fix: update qr code test images due to Imagemagic extension upgrade in the base image 2023-12-05 14:13:24 +00:00
loks0n 4471b93a3a tests: fix 2023-12-05 12:00:26 +01:00
loks0n 8ea9706174 feat: Matej renaming plan 2023-11-30 11:35:52 +00:00
prateek banga fa8dc133b4 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type 2023-11-29 15:01:47 +05:30
Jake Barnby 4b58d08fd8
Add providerType to Message 2023-11-29 17:09:44 +13:00
prateek banga ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
Jake Barnby c1f10b06a3
Fix index limit test 2023-11-28 01:34:29 +13:00
Jake Barnby 2c71de1d1b
Merge remote-tracking branch 'origin/1.4.x' into feat-isolation-modes
# Conflicts:
#	composer.lock
2023-11-28 00:57:17 +13:00
Jake Barnby 82dfe5ddee
Add tests 2023-11-28 00:30:02 +13: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 e3f60f4c78 fix tests 2023-11-23 23:14:02 +05:30
prateek banga 858175fe00 adds target object in subscriber model 2023-11-23 14:35:16 +05:30
Prateek Banga d9826cdce8 makes provider creation fields optional and adds target info in subscriber model 2023-11-23 00:39:55 +05:30
loks0n 88aa4d726c Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-21 14:54:57 +00:00
prateek banga 9c6cd8512f review changes 2023-11-21 15:19:19 +05:30
prateek banga 88f228c106 review changes 2023-11-21 15:11:09 +05:30
prateek banga 520d19e335 changes TextMagic to Textmagic in all places and uses email validator 2023-11-21 12:35:36 +05:30
Jake Barnby 0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
#	src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
prateek banga 5c1cf3a526 adds user name in subscriber response model 2023-11-20 12:34:50 +05:30
loks0n 33f92d9ab3 chore: fmt 2023-11-17 18:12:15 +00:00
loks0n 61e2b7a787 feat: more phone validation 2023-11-17 18:09:20 +00:00
Khushboo Verma 2a2ff34e20 Merge branch '1.4.x' into fix-error-logging 2023-11-17 20:37:36 +05:30
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
Khushboo Verma 881b92eeb8 Updated error codes in health tests 2023-11-17 00:19:43 +05:30
fogelito 04afeb4a8d tests 2023-11-16 15:56:52 +02:00
prateek banga c24664f5d9 removes internal provider 2023-11-16 01:30:47 +05:30
Torsten Dittmann 115ca23a58
Merge pull request #5174 from yatharth1706/fix-4797-verified-user-getting-email-verifications
Fix verified user getting email verifications
2023-11-15 13:35:23 +01:00
loks0n 830544e245 fix: logged in ssr cases 2023-11-15 11:57:27 +00:00
prateek banga fdca55b0de fix test cases 2023-11-15 01:24:55 +05:30
loks0n 7823b90bf3 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-14 14:01:10 +00:00
prateek banga 7ae614fe13 adds provider type in target 2023-11-14 18:14:07 +05:30
prateek banga f84a00dded adds search attribute filter 2023-11-14 14:07:52 +05:30
Jake Barnby 535db05b9b
Merge remote-tracking branch 'origin/main' into feat-php-8-1
# Conflicts:
#	app/console
#	composer.lock
2023-11-14 14:06:43 +13:00
Matej Bačo 967854d34a Fix grammar 2023-11-13 14:39:33 +01:00
Matej Bačo a029287e5a Implement health tresholds 2023-11-13 14:07:11 +01:00