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

10733 commits

Author SHA1 Message Date
Khushboo Verma 5904b17b5c Design changes 2024-01-15 17:07:12 +05:30
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 189406635a
Use internal ID for subquery 2024-01-15 18:25:34 +13:00
Jake Barnby e21e2c70ea
Remove redundant index 2024-01-15 18:18:09 +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
Khushboo Verma 088ed95f69 Force background color to white for now 2024-01-13 01:18:20 +05:30
Khushboo Verma c2ab8a1472 Addressed PR comments 2024-01-13 01:08:18 +05:30
Khushboo Verma 77ded21d20 Merge branch '1.5.x' into feat-migrate-cloud-templates 2024-01-13 00:54:49 +05:30
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
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
Khushboo Verma a9ccfa1ab0 Added cloud base templates to appwrite/appwrite 2024-01-12 14:43:17 +05:30
Khushboo Verma d443602cbc resolve merge conflicts 2024-01-12 01:55:32 +05:30
Khushboo Verma 377751f4a4 Remove extra text generated by GPT for la.json 2024-01-12 01:38:04 +05:30
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
Christy Jacob 6aa707fff2
Merge pull request #7424 from appwrite/feat-security-phrases
Added security phrase to magic URL
2024-01-11 19:13:06 +04:00
loks0n 9068941772 feat: create user with create token if not exists 2024-01-11 14:55:37 +00:00
Khushboo Verma 5f42326514 Added sms translation key for all languages 2024-01-11 20:24:07 +05:30
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 269d70e9ca chore: specs 2024-01-11 11:56:03 +00:00
loks0n e356e42a2c chore: update console 2024-01-11 11:54:50 +00:00
loks0n 136faf9630 docs: improve exchange endpoint desc 2024-01-11 10:54:41 +00:00
Matej Bačo 34bac3dc5c
Merge branch '1.5.x' into feat-security-phrases 2024-01-11 11:54:16 +01:00
loks0n 032ce1ec0c feat: standardise token length 2024-01-11 10:51:26 +00:00
Matej Bačo 70d57b17a0 Fix copies 2024-01-11 10:36:31 +00:00
Matej Bačo a2856f6acc Update copy & AI translations 2024-01-11 10:23:25 +00:00
Matej Bačo ed28bb9295 Merge remote-tracking branch 'origin/1.5.x' into feat-improve-logging 2024-01-11 10:22:50 +00:00
Matej Bačo fe88829bf1 Update specs files 2024-01-11 10:10:00 +00:00
Jake Barnby 322dae626a
Merge branch '1.5.x' into feat-message-scheduling 2024-01-11 22:29:49 +13:00
Jake Barnby aca07a20c7
Merge branch 'main' into 1.5.x 2024-01-11 22:28:50 +13: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
Matej Bačo e485953da6 AI translations 2024-01-11 08:49:52 +00:00
Matej Bačo e0db651240 Revert "Translated security phrase copy with AI"
This reverts commit b72dd35f45.
2024-01-11 08:25:09 +00:00
Jake Barnby 5827c52372
Merge branch '1.5.x' into feat-search-subscribers 2024-01-11 20:04:17 +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 38e9aefa2f
Update compose 2024-01-11 16:14:38 +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
Jake Barnby b9892b857a
Make const int easier to read 2024-01-11 15:54:44 +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 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 b72dd35f45 Translated security phrase copy with AI 2024-01-10 15:01:42 +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
Khushboo Verma 7393bfc244 Use phtml instead of translation files for webhook email 2024-01-10 19:35:25 +05:30
loks0n 310d75b6be feat: update assistant 2024-01-10 10:17:52 +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
Khushboo Verma ef88ad6514 Updated the email 2024-01-10 15:03:36 +05:30
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
Khushboo Verma b3e87d7de8 Formatted email as per design 2024-01-10 01:55:36 +05:30
loks0n 332bd532e1 fix: specs 2024-01-09 19:04:47 +00:00
loks0n 428910a176 chore: specs 2024-01-09 16:42:25 +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
loks0n ded48cb618 chore: fmt 2024-01-09 16:41:42 +00:00
loks0n d9b25a3167 feat: add token param to oath 2024-01-09 16:38:29 +00:00
Matej Bačo c8b544da03 Improve button design 2024-01-09 16:06:24 +00:00
loks0n de2a4e754a feat: alias PUT token methods for backwards compat 2024-01-09 15:56:01 +00:00
Matej Bačo beeb643c66 Add all translations 2024-01-09 15:39:38 +00:00
loks0n d4ba4bf969 chore: update specs 2024-01-09 15:04:32 +00:00
Matej Bačo 86158838a1 Magic URL improvements 2024-01-09 12:23:13 +00:00
Jake Barnby af019369e9
Merge branch 'main' into 1.5.x 2024-01-09 22:03:35 +13:00
Eldad A. Fux b0a8aac0b7
Merge pull request #7348 from appwrite/fix-delete-identity-event
Update the delete identity endpoints to set the params and payload
2024-01-09 07:52:08 +01:00
Jake Barnby 219f091925
Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 12:40:07 +13:00
Khushboo Verma 6b018d2f16 Add const for max file size 2024-01-09 01:41:48 +05:30
Khushboo Verma 5588dfca8b WIP: Send email to user when webhook is stopped 2024-01-09 01:25:24 +05:30
loks0n 5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00:00
Khushboo Verma 842045874e Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-07 00:27:06 +05:30
Khushboo Verma bbd551cf0d Reset attempts to 0 on successful request 2024-01-05 17:54:20 +05:30
Khushboo Verma 6d8443d5cd Addressed PR comments 2024-01-05 15:13:54 +05:30
Steven Nguyen 7e9525f0f9
Update validation of topics, users, and targets
They should be an array of UID and not just array of Text.
2024-01-05 00:10:57 +00:00
Khushboo Verma fb9e393c97 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-04 16:42:47 +05:30
Khushboo Verma 431e26c153 Allow certain domains to skip validation 2024-01-04 16:37:15 +05:30
Steven Nguyen faf39fcc81
Fix _APP_CONSOLE_HOSTNAMES check
Ensure invalid hostnames such as empty strings are not added as a
hostname.
2024-01-03 19:30:49 +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
Utkarsh Ahuja a74e5cc2c6
Merge branch '1.5.x' into feat-zoho-oauth 2024-01-03 11:24:24 +05:30
Utkarsh Ahuja 73303c374b Merge branch 'feat-zoho-oauth' of https://github.com/UtkarshAhuja2003/appwrite into feat-zoho-oauth 2024-01-03 11:22:02 +05:30
Utkarsh Ahuja d18d187a07 fix: base changed 2024-01-03 11:20:59 +05:30
Damodar Lohani 640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Steven Nguyen 50aab32f0f
Add search param for list subscribers endpoint 2024-01-02 23:39:46 +00:00
Khushboo Verma cfca9f232c Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-02 21:57:58 +05:30