1
0
Fork 0
mirror of synced 2024-07-07 23:46:11 +12:00
Commit graph

3336 commits

Author SHA1 Message Date
Jake Barnby 2a85c7cd96
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-27 21:56:05 +13:00
Jake Barnby 5015c092b5
Update specs 2024-02-27 00:46:51 +13:00
Jake Barnby a4ff6e4eba
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
# Conflicts:
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2024-02-26 15:50:48 +13:00
Vincent (Wen Yu) Ge ab36133a8f Add descriptions 2024-02-25 22:58:33 +00:00
Jake Barnby b1200f4cbd
Merge branch '1.5.x' into refactor-disallow-new-session-with-existing 2024-02-26 01:29:14 +13:00
David 58d4def6b8
Merge branch '1.5.x' into patch-5 2024-02-25 13:12:36 +01:00
David a5779971cf
Update es.json
Added missing dots
2024-02-24 20:46:09 +01:00
David 77bb6b31a7
Fix es.json 2024-02-24 20:38:58 +01:00
loks0n 3a7236c66d fix: specs 2024-02-24 15:01:13 +00:00
loks0n b650884351 chore: fix hide in specs 2024-02-24 14:38:09 +00: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
loks0n 42e9865dff fix: hideServer & hideClient 2024-02-24 13:42:33 +00:00
loks0n e89d7f051b chore: specs 2024-02-24 13:19:14 +00: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 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
loks0n b06765d238 chore: specs 2024-02-22 13:59:27 +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 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 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 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 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 64eaf91ee7
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 03:15:23 +13:00
loks0n 1fa0f18e44 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr-dx 2024-02-20 12:43:50 +00:00
loks0n f0a981226e chore: specs 2024-02-20 12:11:33 +00:00
loks0n fa28496b32 feat: ssr dx changes 2024-02-20 11:45:11 +00:00
Jake Barnby eb4d6f8e20
Update specs 2024-02-20 23:23:07 +13:00
Jake Barnby 5747b33e38
Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
Jake Barnby 1bb75fdd63
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images
# Conflicts:
#	src/Appwrite/Extend/Exception.php
2024-02-19 20:44:11 +13:00
Torsten Dittmann de0e83f703 fix: move user and project logic from general to api hook 2024-02-16 17:58:51 +00:00
Torsten Dittmann ca650fce1b fix: status code for more factors required 2024-02-16 14:59:40 +00:00
Jake Barnby 14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Jake Barnby c192f14d01
Merge remote-tracking branch 'origin/1.5.x' into feat-topic-totals-per-type 2024-02-16 14:08:04 +13:00
Torsten Dittmann 14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
Jake Barnby d38197380e
Support adding image to push notification via storage file 2024-02-15 22:36:34 +13:00
Jake Barnby 5f59f4c5c8
Fix syntax error 2024-02-15 17:56:06 +13:00
Jake Barnby afba7f75f0
Update appropriate total count when mutating topic 2024-02-15 17:23:30 +13:00
Jake Barnby e462e916f0
Add email, sms and push totals to topic 2024-02-15 17:22:43 +13:00
Jake Barnby 1f470aecd2
Add subscribe permission to topics 2024-02-13 17:24:31 +13:00
Jake Barnby 66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby 8f525f5304
Merge pull request #7551 from appwrite/fix-template-enum-seperation
Fix email/sms template type enums getting the same values
2024-02-13 12:39:07 +13:00
Jake Barnby 0bd3fe6473
Merge pull request #7571 from appwrite/fix-updating-message-status
Fix updating message status
2024-02-13 12:38:39 +13:00
Jake Barnby e26230cc34
Disallow creating a session if one already exists 2024-02-12 22:59:49 +13:00