1
0
Fork 0
mirror of synced 2024-07-04 06:00:53 +12:00
Commit graph

11228 commits

Author SHA1 Message Date
Jake Barnby a178dbfc4b
Allow existing session when upgrading from anonymous to oauth 2024-02-25 03:04:35 +13:00
Jake Barnby 4190a09333
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-25 03:00:47 +13:00
Jake Barnby 0a37a0dd20
Merge pull request #7645 from appwrite/feat-dev-apns
Allow setting APNS to sandbox mode
2024-02-24 14:07:20 +13:00
Jake Barnby 4ce6eabf40
Merge pull request #7638 from appwrite/fix-update-topics-permissions
Fix update topics permissions
2024-02-24 13:35:23 +13:00
Jake Barnby 11e9f43982
Allow setting APNS to sandbox mode 2024-02-24 13:34:08 +13:00
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 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 0d62ecf90f
Merge pull request #7625 from appwrite/provider-null
Provider null
2024-02-24 01:17:58 +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
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 8742bfaee8
Fix missing subscribe on topic update 2024-02-23 23:56:49 +13: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 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 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
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
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
Jake Barnby 9498d680fb
Add doc refs 2024-02-21 22:04:27 +13:00
loks0n dd4809f3c8 feat: vincent error message 2024-02-21 08:57:50 +00:00
Jake Barnby 607ba5b32f
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 18:40:01 +13:00
Jake Barnby 9b251207cf
Merge branch '1.5.x' into feat-push-images 2024-02-21 18:06:58 +13:00
Jake Barnby 3aeb62377c
Fix missed update with image 2024-02-21 17:07:52 +13:00
Jake Barnby 52d4b649e4
Add missing unique index 2024-02-21 13:09:14 +13:00
Jake Barnby 41be4da5c9
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 13:01:53 +13:00
Jake Barnby a9d1aa5bca
Merge pull request #7620 from appwrite/refactor-remove-resource-collection
Refactor remove resource collection
2024-02-21 13:00:48 +13:00
Jake Barnby ad8450af32
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 03:29:00 +13:00
Jake Barnby 400b28de8a
Replace resourceCollection with switch 2024-02-21 03:25:01 +13:00
Jake Barnby 1c1a2eab2c
Format 2024-02-21 03:16:01 +13:00
Jake Barnby 64eaf91ee7
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 03:15:23 +13:00
Jake Barnby 379c79dae9
Consistent naming for device resources 2024-02-21 03:10:51 +13:00
Jake Barnby 2667d1fb07
Inject always local file device 2024-02-21 02:50:44 +13:00
Jake Barnby 35441dc542
Merge remote-tracking branch 'origin/1.5.x' into feat-email-attachments 2024-02-21 02:33:35 +13:00
Jake Barnby b9b54b808c
Merge pull request #7618 from appwrite/feat-remove-callback-resources
Remove callback resources from workers
2024-02-21 02:30:32 +13:00
Jake Barnby b265106af2
Fix tests 2024-02-21 02:20:09 +13:00
Jake Barnby 439e7b1ccf
Merge remote-tracking branch 'origin/feat-remove-callback-resources' into feat-email-attachments
# Conflicts:
#	app/worker.php
#	src/Appwrite/Platform/Workers/Messaging.php
2024-02-21 02:00:46 +13:00