1
0
Fork 0
mirror of synced 2024-07-02 05:00:33 +12:00
Commit graph

20037 commits

Author SHA1 Message Date
Torsten Dittmann 076ffe8866 fix: missing team variable and added mfa templates to config 2024-02-23 14:59:12 +01:00
Torsten Dittmann 6a8140a80f fix: move comma from language files into templates 2024-02-23 14:59:12 +01:00
Torsten Dittmann af6091e04a fix: template name typo for mfa challenge 2024-02-23 14:59:12 +01:00
Torsten Dittmann f5cdd5e4cc fix: comma in email templates 2024-02-23 14:59:12 +01:00
Torsten Dittmann c1ae63777e revert: phpunit.xml change 2024-02-23 14:59:12 +01:00
Torsten Dittmann f577811c04 fix: formatting on emails 2024-02-23 14:59:12 +01:00
Torsten Dittmann 9ae2948d0e fix: mfa email template 2024-02-23 14:59:12 +01:00
Jake Barnby aa6778712f
Merge pull request #7640 from appwrite/fix-tests
Fix tests
2024-02-24 02:54:59 +13:00
Jake Barnby 7ab80b9288
Fix account method 2024-02-24 02:00:31 +13:00
Jake Barnby 957f08a3ef
Fix max int test 2024-02-24 01:55:00 +13:00
Jake Barnby 0d62ecf90f
Merge pull request #7625 from appwrite/provider-null
Provider null
2024-02-24 01:17:58 +13:00
Jake Barnby ce0afb61dc
Merge pull request #7621 from appwrite/feat-fix-1.5.x-migrations
Fix 1.5.x Migrations
2024-02-24 01:08:11 +13:00
Jake Barnby 40b0b637cf
Remove opcache test 2024-02-24 01:06:53 +13:00
Jake Barnby bc3e57d03b
Update base + console 2024-02-24 00:41:38 +13:00
Jake Barnby eb3aa7ee73
Merge pull request #7639 from appwrite/fix-mfa-endpoint
fix: add mfa path to console
2024-02-24 00:18:19 +13:00
Jake Barnby d744f8177d
Merge pull request #7637 from appwrite/feat-remove-opcache
Remove preloading
2024-02-24 00:17:02 +13:00
Torsten Dittmann a684f7b132 fix: add mfa path to console 2024-02-23 12:13:22 +01:00
Jake Barnby 909e0db4fd
Remove preload file 2024-02-24 00:10:57 +13:00
Jake Barnby ca2df68852
Downgrade further 2024-02-23 19:43:30 +13:00
Jake Barnby 6e4eb348c1
Remove preloading 2024-02-23 19:34:54 +13:00
Jake Barnby 0585ef803a
Test downgrade base 2024-02-23 19:30:57 +13:00
Eldad A. Fux baffda8481
Merge pull request #7619 from appwrite/feat-ssr-dx
feat: ssr dx
2024-02-22 17:42:34 +01:00
loks0n 046c11ceb2 chore: revert X-Forwarded-For 2024-02-22 15:37:51 +00:00
loks0n f1a8769ccf Merge branch 'feat-ssr-dx' of https://github.com/appwrite/appwrite into feat-ssr-dx 2024-02-22 13:59:43 +00:00
loks0n b06765d238 chore: specs 2024-02-22 13:59:27 +00:00
Luke B. Silver 1a09fdc87c
Merge branch '1.5.x' into feat-ssr-dx 2024-02-22 13:58:40 +00:00
loks0n c225d4977b fix: general 2024-02-22 13:40:41 +00:00
Jake Barnby a6e922706e
Merge pull request #7635 from appwrite/fix-swoole-crash
Use swoole process mode instead of base
2024-02-23 02:39:18 +13:00
loks0n 7985a9ed2c chore: remove forwarded for 2024-02-22 13:26:08 +00:00
Luke B. Silver f285173f4e
Merge branch '1.5.x' into feat-ssr-dx 2024-02-22 13:22:41 +00:00
Jake Barnby 21af8d3913
Revert DB 2024-02-23 01:12:48 +13:00
Jake Barnby 57309ad4db
Use swoole process mode instead of base
https://github.com/swoole/swoole-src/discussions/4856#discussioncomment-3796282
2024-02-23 00:51:19 +13:00
Jake Barnby dc3608633b
Revert "Test remove usage dump worker"
This reverts commit 8ec1f7755b.
2024-02-23 00:37:38 +13:00
Jake Barnby 8ec1f7755b
Test remove usage dump worker 2024-02-23 00:20:11 +13:00
Jake Barnby 0d4d046d1f
Revert "Revert DB update"
This reverts commit f3eda05708.
2024-02-23 00:17:25 +13:00
Jake Barnby f3eda05708
Revert DB update 2024-02-22 23:53:18 +13:00
Bradley Schofield cb110c1481 Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-22 10:28:06 +00:00
Bradley Schofield bdf044ed8c Update 'email' to 'password' in factors 2024-02-22 10:21:25 +00:00
Torsten Dittmann 18e4385ca5 fix: change emailPassword factor from email to password 2024-02-21 18:18:56 +01:00
Jake Barnby a877850707
Fix GraphQL tests 2024-02-22 02:26:17 +13:00
Jake Barnby 623c82c727
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	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-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.json
#	composer.lock
#	src/Appwrite/Auth/Validator/Phone.php
2024-02-22 01:32:26 +13:00
Jake Barnby 942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.php
#	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
#	app/controllers/api/account.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
loks0n a3b88f2015 chore: remove x-forwarded-for 2024-02-21 12:18:50 +00:00
Bradley Schofield d020730a74 Address Shimon's comments 2024-02-21 10:20:55 +00:00
fogelito b762a9cedd Check user false 2024-02-21 11:48:16 +02:00
fogelito a851a5f244 providerInternalId nulls 2024-02-21 11:43:04 +02:00
Bradley Schofield a2b9dbc208 Update V20.php 2024-02-21 09:42:04 +00:00
Bradley Schofield 370e814b8c Update Factors Session Migration 2024-02-21 09:31:52 +00:00
Jake Barnby 51745580a8
Update DB 2024-02-21 22:13:40 +13:00
Jake Barnby 9498d680fb
Add doc refs 2024-02-21 22:04:27 +13:00