Khushboo Verma
278f41f0fb
Updated templates
2024-01-16 13:35:31 +05:30
Matej Bačo
4f5755e7d0
Implement session renewal
2024-01-15 13:43:21 +00:00
Khushboo Verma
5904b17b5c
Design changes
2024-01-15 17:07:12 +05:30
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
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
4cc6d4161d
Merge branch 'feat-message-scheduling' into feat-maintenance-delete-expired-targets
2024-01-15 20:33:38 +13:00
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
772617f231
Mark invalid targets on message send then delete on maintenance sweep
2024-01-15 19:52:40 +13:00
Jake Barnby
e21e2c70ea
Remove redundant index
2024-01-15 18:18:09 +13: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
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
Matej Bačo
e9de0332cc
Remove passwordAgain ( #7441 )
2024-01-12 14:33:10 +01:00
Torsten Dittmann
e2a0c2d825
sync: with 1.5.x
2024-01-12 14:04:31 +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
5f42326514
Added sms translation key for all languages
2024-01-11 20:24:07 +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
Matej Bačo
34bac3dc5c
Merge branch '1.5.x' into feat-security-phrases
2024-01-11 11:54:16 +01: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
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
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
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
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
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
Matej Bačo
4e73c76538
Add OTP email template
2024-01-10 13:28:49 +00:00
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
ef88ad6514
Updated the email
2024-01-10 15:03:36 +05:30
Torsten Dittmann
670b719ba9
fix: generate specs
2024-01-10 00:06:43 +01: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
Matej Bačo
c8b544da03
Improve button design
2024-01-09 16:06:24 +00:00
Torsten Dittmann
bc384cac8d
fix: response model
2024-01-09 16:47:43 +01:00
Matej Bačo
beeb643c66
Add all translations
2024-01-09 15:39:38 +00:00
Torsten Dittmann
5a97c9104c
fix: collections merge conflict
2024-01-09 16:36:49 +01:00
Torsten Dittmann
cb25d5209e
fix: di
2024-01-09 16:30:18 +01: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
Torsten Dittmann
d344ba46c4
feat: account delete ( #7415 )
...
* feat: account delete
* chore: run specs
* release: console sdk
* chore: run formatter
* tests: fix project tests
2024-01-09 12:58:36 +01:00
Khushboo Verma
5588dfca8b
WIP: Send email to user when webhook is stopped
2024-01-09 01:25:24 +05:30
Torsten Dittmann
b8e6de7516
chore: generate specs
2024-01-08 13:24:52 +01:00
Torsten Dittmann
7c66481406
fix: collections for mfa
2024-01-08 13:22:33 +01:00
loks0n
5c803f6eff
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-08 11:41:55 +00:00
Torsten Dittmann
bbf6480c15
fix: merge conflicts
2024-01-08 12:31:46 +01:00
Torsten Dittmann
208abe17e7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-08 12:20:08 +01: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
fb9e393c97
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2024-01-04 16:42:47 +05:30
Steven Nguyen
d2d36bbfae
Add changes from previous console platforms variable PR
...
See https://github.com/appwrite/appwrite/pull/4581
2024-01-03 20:38:42 +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
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
Torsten Dittmann
a29cef2334
feat: console hostname env variable
2024-01-02 19:53:20 +00:00
shimon
99f1543f1b
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
Dockerfile
app/console
app/init.php
composer.lock
src/Appwrite/Platform/Services/Workers.php
src/Appwrite/Platform/Tasks/Hamster.php
2024-01-02 11:49:23 +02:00
Utkarsh Ahuja
3e0f63e499
Merge branch 'main' into feat-zoho-oauth
2023-12-31 17:11:26 +05:30
Eldad A. Fux
4f7b1748f4
Merge pull request #7276 from fanksin/patch-1
...
Update tr.json
2023-12-31 00:24:30 +01:00
Torsten Dittmann
9b2fbc5c52
feat: console hostname env variable
2023-12-29 21:52:50 +01:00
Utkarsh Ahuja
d9319aa888
feat: added zoho oauth metadata
2023-12-23 17:42:34 +05:30
Matej Bačo
bb0be27007
Update specs
2023-12-22 09:58:25 +00:00
Matej Bačo
b3729507de
Add cache to console collection
2023-12-19 18:05:39 +01:00
loks0n
2c5c799d13
fix: add account session description
2023-12-19 14:24:49 +00:00
Damodar Lohani
5e59d73f78
rename stats collection
2023-12-18 10:11:10 +00:00
Khushboo Verma
557565b949
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-12-15 01:46:47 +05:30
Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
2023-12-15 02:41:46 +13:00
Torsten Dittmann
9bc52e8900
fix: commatation in email html
2023-12-13 18:08:36 +01:00
Torsten Dittmann
7645d6c34a
fix: email templates
2023-12-13 17:46:14 +01:00
loks0n
0e25d3e1df
fix: scopes
2023-12-13 10:25:20 +00:00
Serhat Aksakal
e56b30e6a6
Update tr.json
2023-12-13 12:10:44 +03:00
Torsten Dittmann
063db1e2bf
feat: add execution aggregation to project usage
2023-12-12 18:48:21 +01:00
loks0n
b2f118d23b
fix: specs
2023-12-12 15:42:22 +00:00
loks0n
453c1928ee
fix: teams tests
2023-12-11 20:56:59 +00:00
Khushboo Verma
ff7cfc6602
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-12-12 00:17:21 +05:30
loks0n
f0d7312bd3
feat: create session method
2023-12-11 16:24:24 +00:00
Torsten Dittmann
3485373cd7
chore: generate specs
2023-12-11 16:40:19 +01:00
Torsten Dittmann
2657247b50
bump: console version
2023-12-11 16:37:14 +01:00
Torsten Dittmann
b87231153e
chore: bump console version number
2023-12-10 21:38:34 +01:00
Torsten Dittmann
f8878ac039
chore: generate specs
2023-12-10 21:29:32 +01:00
Prateek Banga
b8aa2faa7b
adds scheduling commit, still need to resolve pools error
2023-12-07 11:25:19 +01:00
Torsten Dittmann
83c411e5fd
fix: some fixes
2023-12-07 10:05:37 +01:00
Prateek Banga
54f574906c
review changes
2023-12-05 12:22:32 +01:00
loks0n
7f164bdbbc
chore: generate specs
2023-12-05 12:01:02 +01:00
prateek banga
81ec4ff9bc
fix typo in userId index in targets
2023-12-01 03:51:03 +05:30
prateek banga
6ead6f8094
misc changes
...
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
2023-12-01 03:39:43 +05:30
loks0n
5a63fef157
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-30 12:13:44 +00:00
shimon
c313e8347f
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
composer.lock
2023-11-30 10:21:59 +02:00
Jake Barnby
4b58d08fd8
Add providerType to Message
2023-11-29 17:09:44 +13:00
Jake Barnby
82c86c0ae2
deliveryTime -> scheduledAt
2023-11-29 17:08:25 +13:00
shimon
21895e3ac0
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
CHANGES.md
Dockerfile
app/controllers/api/storage.php
app/init.php
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Services/Tasks.php
src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
prateek banga
858175fe00
adds target object in subscriber model
2023-11-23 14:35:16 +05:30
loks0n
88aa4d726c
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-21 14:54:57 +00:00
prateek banga
3394218cb0
adds validation for phone and email identifier
2023-11-21 15:00:02 +05:30
prateek banga
520d19e335
changes TextMagic to Textmagic in all places and uses email validator
2023-11-21 12:35:36 +05:30
Khushboo Verma
2c04c98801
Renamed webhook variables
2023-11-20 19:49:15 +05:30
Khushboo Verma
2bcb6c18fb
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-11-20 17:40:32 +05:30
Jake Barnby
0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
# src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
Jake Barnby
8b14d96151
Merge remote-tracking branch 'origin/1.4.x' into chore-update-sdks
2023-11-21 00:17:36 +13:00
Jake Barnby
6ad4566b6b
Update CLI
2023-11-21 00:15:50 +13:00
prateek banga
5c1cf3a526
adds user name in subscriber response model
2023-11-20 12:34:50 +05:30
Khushboo Verma
695d6f4065
Renamed variables
2023-11-18 00:04:57 +05:30
Khushboo Verma
7902defe69
Addressed PR comments
2023-11-17 19:29:57 +05:30
Khushboo Verma
c34dc4dae0
Add flag to send logs to logger
2023-11-16 23:51:09 +05:30
Prateek Banga
f0247930da
Update app/config/collections.php
...
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-11-16 17:15:08 +05:30
prateek banga
7536d8eb0f
review changes
2023-11-16 17:09:08 +05:30
Jake Barnby
02b6659b35
SDK releases
2023-11-16 21:50:39 +13:00
prateek banga
a282ab38a6
adds target endpoint in account controller for push tokensl
2023-11-16 02:12:06 +05:30
prateek banga
c24664f5d9
removes internal provider
2023-11-16 01:30:47 +05:30
Torsten Dittmann
115ca23a58
Merge pull request #5174 from yatharth1706/fix-4797-verified-user-getting-email-verifications
...
Fix verified user getting email verifications
2023-11-15 13:35:23 +01:00
loks0n
830544e245
fix: logged in ssr cases
2023-11-15 11:57:27 +00:00
prateek banga
fdca55b0de
fix test cases
2023-11-15 01:24:55 +05:30
prateek banga
adc76c5797
adds target when account is created or email or phone is updated
2023-11-14 22:46:20 +05:30
loks0n
7823b90bf3
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-14 14:01:10 +00:00
prateek banga
7ae614fe13
adds provider type in target
2023-11-14 18:14:07 +05:30
Khushboo Verma
22f02243c6
Resolved merge conflicts
2023-11-14 14:29:46 +05:30
Khushboo Verma
3f584b85be
Limit webhook failure attempts to 10
2023-11-14 14:20:26 +05:30
prateek banga
f84a00dded
adds search attribute filter
2023-11-14 14:07:52 +05:30
Jake Barnby
458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main
2023-11-13 16:46:05 +13:00
Prateek Banga
1b99f47f21
lint fix
2023-11-10 13:28:39 +05:30
Prateek Banga
3ade88897c
Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x
2023-11-10 12:49:05 +05:30
Christy Jacob
d33b8c2ce1
Merge branch '1.4.x' into fix-null-password-history
2023-11-09 07:44:44 -08:00
Steven Nguyen
0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications
2023-11-08 17:37:43 -08:00
德华 刘
9acc23049c
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.4.x-main
2023-11-07 18:12:58 +00:00
Bradley Schofield
d5d7440a68
Merge branch 'main' into feat-improve-migration-validations
2023-11-07 16:21:35 +00:00
Jake Barnby
1429c82aa0
Make VCS, proxy and migrations services non-optional so they aren't toggled with enable/disable all service routes
2023-11-06 12:04:56 +13:00
shimon
f64d0ab8a8
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
CHANGES.md
Dockerfile
composer.lock
src/Appwrite/Migration/Migration.php
2023-11-05 17:03:13 +02:00
Bradley Schofield
23631f8282
Update specs
2023-11-02 17:12:08 +00:00
Bradley Schofield
b15dac16c8
Revert "Remove Mock API"
...
This reverts commit 2d045335ff
2023-11-02 17:05:51 +00:00
Bradley Schofield
2d045335ff
Remove Mock API
2023-11-02 17:05:31 +00:00
loks0n
aeb152c5de
chore: update specs
2023-11-02 12:29:05 +00:00
