Commit Graph

7006 Commits

Author SHA1 Message Date
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 d5be48a846 Finish custom SMTP feature 2024-01-15 10:18:17 +00:00
Khushboo Verma 882e049ac9 Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts 2024-01-15 13:05:05 +05:30
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 0a0479f4c5 chore: fmt 2024-01-13 10:11:25 +00:00
loks0n 521cb963a5 fix: hide oauth in specs 2024-01-13 10:09:02 +00: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
loks0n d2ff3f6bb8 docs: standardise account md names 2024-01-13 09:32:03 +00:00
loks0n 642582c283 docs: fix links to create email password session 2024-01-12 17:39:44 +00:00
loks0n 07da41bd69 docs: better descriptions for create token params 2024-01-12 17:35:16 +00:00
loks0n c8ce360ce9 chore: remove 'universal' references 2024-01-12 17:30:36 +00:00
loks0n 02b83bf26e chore: changes to expire param create token 2024-01-12 17:28:56 +00:00
loks0n ca511bd459 chore: use customId validators 2024-01-12 17:26:01 +00:00
loks0n 90c5d6413c feat: create new user if none create session 2024-01-12 17:14:11 +00:00
loks0n ee96b220c3 docs: create session 2024-01-12 17:10:23 +00:00
Matej Bačo e9de0332cc Remove passwordAgain (#7441) 2024-01-12 14:33:10 +01:00
Torsten Dittmann 0a4c62085c chore: run linter 2024-01-12 14:06:52 +01:00
Torsten Dittmann e2a0c2d825 sync: with 1.5.x 2024-01-12 14:04:31 +01:00
loks0n 2bbcdf61dd Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-12 12:14:28 +00:00
Matej Bačo b8b9fe383d Fix token param 2024-01-12 13:12:28 +01:00
loks0n 487376afd6 chore: oauth token param before scopes 2024-01-12 12:08:45 +00:00
Torsten Dittmann 78f7b1897e fix: hotfix for redirect param in custom templates (#7437)
* fix: hotfix for redirect param in custom templates
* fix: redirect param variables
* fix: variable typo
* chore: update comments for template variables
2024-01-11 21:36:05 +01:00
Khushboo Verma d443602cbc resolve merge conflicts 2024-01-12 01:55:32 +05:30
Torsten Dittmann 99259ebf2b fix: enable mfa in console 2024-01-11 20:24:37 +01:00
Khushboo Verma 807d295303 Resolve merge conflicts 2024-01-11 22:49:33 +05:30
Khushboo Verma 74b9324001 Use strip_tags in post request too 2024-01-11 21:58:21 +05:30
loks0n 9068941772 feat: create user with create token if not exists 2024-01-11 14:55:37 +00:00
Khushboo Verma d922feb4c7 Use strip_tags to remove <p> tag 2024-01-11 18:54:08 +05:30
Khushboo Verma dc0b0c8ab7 Merge branch '1.5.x' into fix-otp-template 2024-01-11 18:24:45 +05:30
Khushboo Verma c84af966df Make OTP template more contextual 2024-01-11 18:20:01 +05:30
loks0n 136faf9630 docs: improve exchange endpoint desc 2024-01-11 10:54:41 +00:00
loks0n 032ce1ec0c feat: standardise token length 2024-01-11 10:51:26 +00:00
Matej Bačo 539bee8850 Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-11 10:20:51 +01:00
Jake Barnby 5827c52372 Merge branch '1.5.x' into feat-search-subscribers 2024-01-11 20:04:17 +13:00
Jake Barnby cb3e354cf1 Fix tests 2024-01-11 19:47:55 +13:00
Jake Barnby a40c6fce64 Add resource collection to schedules 2024-01-11 16:00:48 +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
Torsten Dittmann 07f44593c0 feat: delete authenticator endpoint 2024-01-10 17:22:32 +01:00
Matej Bačo 2d204d593a code formatting 2024-01-10 15:10:05 +00:00
Matej Bačo bf14d1d97d Add random security phrases 2024-01-10 15:09:39 +00:00
Matej Bačo 931efe24a9 Added security phrase to magic URL 2024-01-10 14:52:32 +00:00
Khushboo Verma f6830f4e85 Resolve merge conflict 2024-01-10 19:38:55 +05:30
Matej Bačo 788fa04606 Improve magic URL design 2024-01-10 11:33:55 +01: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
Khushboo Verma b74c7671e8 Resolve merge conflicts 2024-01-10 13:13:09 +05:30
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