1
0
Fork 0
mirror of synced 2024-08-04 04:52:03 +12:00
Commit graph

19311 commits

Author SHA1 Message Date
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
479c70d0aa Fix after revert 2024-01-11 08:25:55 +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
Matej Bačo
04831a91c7
Update src/Appwrite/Platform/Tasks/DevGenerateTranslations.php 2024-01-11 09:20:00 +01: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
449e8cc06c
Fix function schedules 2024-01-11 19:32:24 +13:00
Jake Barnby
62304f817d
Fix maintenance worker 2024-01-11 16:15:11 +13:00
Jake Barnby
38e9aefa2f
Update compose 2024-01-11 16:14:38 +13:00
Jake Barnby
1301031b48
Update bin scripts 2024-01-11 16:10:20 +13:00
Jake Barnby
87a4d7db88
Update service refs 2024-01-11 16:08:40 +13:00
Jake Barnby
81f1eb3506
Abstract scheduling base 2024-01-11 16:06:59 +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
6904285560
Check provider enabled 2024-01-11 15:55:08 +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
8a8fc28cb0 Update composer.lock 2024-01-10 19:39:48 +05:30
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
Matej Bačo
4e73c76538 Add OTP email template 2024-01-10 13:28:49 +00:00
Christy Jacob
bd920ead40
Merge pull request #7421 from appwrite/feat-update-assistant
feat: update assistant
2024-01-10 15:54:11 +04:00
loks0n
5112e14d5f fix: typo 2024-01-10 10:37:27 +00:00
Matej Bačo
788fa04606 Improve magic URL design 2024-01-10 11:33:55 +01:00
loks0n
de977fc84c test: fix account tests 2024-01-10 10:27:38 +00:00
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
Christy Jacob
07b6ee58fe
Merge pull request #7416 from appwrite/feat-magicurl-improvements
Feat: Magic URL improvements
2024-01-10 13:59:20 +04:00
Khushboo Verma
e91a652feb Updated composer.lock 2024-01-10 15:05:23 +05:30
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
c7a637e4c9
Allow filtering targets by provider type 2024-01-09 14:52:35 -08:00
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
20524316bf Composer update 2024-01-10 01:57:16 +05:30
Khushboo Verma
b3e87d7de8 Formatted email as per design 2024-01-10 01:55:36 +05:30