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
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
prateek banga
3394218cb0
adds validation for phone and email identifier
2023-11-21 15:00:02 +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
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
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
prateek banga
7ae614fe13
adds provider type in target
2023-11-14 18:14:07 +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
Steven Nguyen
0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications
2023-11-08 17:37:43 -08:00
Bradley Schofield
e158d134b0
Merge branch 'main' into feat-improve-migration-validations
2023-11-02 10:48:38 +00:00
prateek banga
06daa544e8
review changes
2023-10-30 23:37:57 +05:30
Torsten Dittmann
fbcbd0d430
feat: realtime error handling
2023-10-24 14:32:22 +02:00
prateek banga
6c260223ba
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-10-20 15:00:22 +05:30
prateek banga
161bbfb822
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-10-20 14:55:17 +05:30
prateek banga
db9e7b0199
review changes
2023-10-20 13:28:23 +05:30
Jake Barnby
389d367fca
Set hard timeouts for API dbs
2023-10-19 15:32:45 +13:00
Prateek Banga
feac25f401
adds already sent exception in update message
2023-10-13 18:35:49 +05:30
Bradley Schofield
9cb1cf418c
Improve Error Handling and Add more Validation
2023-10-06 17:02:01 +01:00
Yatharth Verma
f07f246f8d
fix conflicts
2023-09-22 22:53:41 +05:30
Prateek Banga
e00b273577
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-21 22:19:30 +05:30
Prateek Banga
3ebcfe548d
Adds get message endpoint
2023-09-21 16:26:53 +05:30
prateek banga
82e165c4c3
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-31 18:33:02 +05:30
prateek banga
1762c81b8d
Merge branch 'feat-messages-event-config' into feat-mailgun-provider
2023-08-31 18:32:26 +05:30
prateek banga
24eabf29d0
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-29 22:30:02 +05:30
prateek banga
112c7a5133
adds default attribute for providers
2023-08-29 22:29:48 +05:30
prateek banga
264f0bd5dd
adds subscriber controllers
2023-08-28 20:41:05 +05:30
Matej Bačo
89c9f8da6a
Implement proper behaviour for SMTP sender
2023-08-28 14:19:37 +02:00
Matej Bačo
596e59f2cc
response format fix, smtp QA fixes
2023-08-25 17:13:25 +02:00
prateek banga
52f6b72f23
adds topic controllers
2023-08-25 01:45:17 +05:30
prateek banga
5ca8dc0a73
merge cl-1.4.x
2023-08-24 14:10:26 +05:30
prateek banga
ac33d7828f
Revert "Pint linter ran"
...
This reverts commit bf5f0a8419
2023-08-24 01:53:52 +05:30
wess
bf5f0a8419
Pint linter ran
2023-08-23 13:12:43 -04:00
Jake Barnby
2edbb1269f
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-22 16:02:29 -04:00
Jake Barnby
6a9588c4be
Update src/Appwrite/Extend/Exception.php
2023-08-22 13:38:43 -04:00
Jake Barnby
c929fe113e
Fix colliding ID overrides
2023-08-22 13:11:32 -04:00
prateek banga
78385a59c6
adds remaining provider controllers
2023-08-22 22:15:31 +05:30
prateek banga
5e3065c30a
merge resolve conflicts
2023-08-21 14:07:18 +05:30
Matej Bačo
7bdbd51255
PR review changes
2023-08-20 14:14:05 +02:00
Jake Barnby
3c3326260a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# composer.lock
2023-08-17 17:39:26 -04:00
Khushboo Verma
4285d99f08
Added exception for repo creation + small fixes
2023-08-17 19:24:57 +05:30
prateek banga
07b7a9db0f
adds controller for creating a user target
2023-08-17 17:24:45 +05:30
prateek banga
c7dec3762b
Adds getTarget and list targets controller to user and account
2023-08-16 20:13:38 +05:30
Jake Barnby
4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param
2023-08-14 19:37:37 -04:00
Bishwajeet Parhi
d0755a587f
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-10 22:31:53 +05:30
Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02:00
Bradley Schofield
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-09 18:08:40 +01:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-09 09:01:29 -07:00
Christy Jacob
7d60e4272d
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations
2023-08-09 13:59:44 +00:00
Matej Bačo
93735ac4a7
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-09 12:30:45 +02:00
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param
2023-08-08 23:06:14 -04:00
Christy Jacob
c009a12a25
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x
2023-08-08 20:51:31 +00:00
Christy Jacob
82a206d808
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-08 08:34:01 -07:00
Bishwajeet Parhi
b3e962ba05
Merge branch 'master' into feat-whitelist-enums
2023-08-08 11:35:36 +05:30
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration
2023-08-07 14:46:00 -07:00
Bradley Schofield
91c82f0d7d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-07 16:09:28 +01:00
Matej Bačo
906f86fbb8
Merge branch 'cloud-1.4.x' into feat-git-integration
2023-08-06 09:31:32 +02:00
Eldad A. Fux
a56f91b054
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile
2023-08-05 06:36:21 +03:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
27e212553d
Separate OAuth2 info from Sessions into Identities
...
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-04 15:07:36 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2
2023-08-04 13:55:07 -07:00
Bradley Schofield
8f5d79e668
Move to new branch
2023-08-04 17:21:41 +01:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities
...
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-02 15:36:06 -07:00
Matej Bačo
ac2ca267d7
Address more PR reviews
2023-07-31 08:47:47 +02:00
Matej Bačo
6fb72db7c4
Rename exception
2023-07-29 18:03:13 +02:00
Matej Bačo
37c0cc122a
More PR review changes
2023-07-28 10:27:16 +02:00
Matej Bačo
ce98b04348
Address PR reviews
2023-07-28 09:56:07 +02:00
Steven Nguyen
3499a7028c
Create OAuth2 exception class
2023-07-27 17:19:49 -07:00
Christy Jacob
c26194e189
Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data
2023-07-20 17:19:18 +04:00
Eldad A. Fux
66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
...
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Christy Jacob
e493551f8a
Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data
2023-07-20 01:44:25 +04:00
Damodar Lohani
4fd5c72f34
Merge branch 'master' into feat-1.4.x-with-1.3.x-master
2023-07-19 07:39:37 +00:00
Damodar Lohani
8dc5c2cb4c
Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp
2023-07-19 07:24:58 +00:00
jaivix
4db919b42d
linting and wording updates based on stnguyen90 feedback
2023-07-13 00:33:38 +05:30
Christy Jacob
e0aa3db21e
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-07-11 19:36:37 +00:00
Damodar Lohani
f59d3563f4
Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync
2023-07-10 03:06:48 +00:00
jaivix
a6671a5caa
fixed team creation response if teamId already exists
2023-07-09 16:50:09 +05:30
Matej Bačo
c6e491f2ed
Support for external contributors
2023-06-28 10:48:10 +02:00
Torsten Dittmann
1f46d03e8c
feat: initial mfa implementation
2023-06-22 15:35:49 +02:00
Jake Barnby
0363993f13
Fix errors
2023-06-15 17:28:35 +12:00
Matej Bačo
5e221e285f
Update naming convention, add new VCS endpoints, support silent mode and rootDirectory
2023-06-07 17:50:32 +02:00
Jake Barnby
b7f4f57521
Add new error message to differentiate between missing data and missing data + permissions for document updates
2023-06-07 13:51:24 +12:00
Christy Jacob
f0df316b4f
fix: throw correct exception when project custom ID already exists
2023-05-23 14:38:33 +00:00
Damodar Lohani
5a9f83c43d
validate smtp configuration
2023-05-23 05:09:17 +00:00
Matej Bačo
6e515e3cc4
Copy Khushboo's integration from feat-peach-q1-kh
2023-05-22 12:58:13 +02:00
Christy Jacob
d630d8772b
Merge pull request #5460 from appwrite/fix-create-project-error
...
fix: throw correct exception when project ID already exists
2023-05-19 22:48:02 +05:30
Suven-p
582698bd03
Validate value of x-appwrite-id header
2023-05-18 00:41:07 +05:45
Christy Jacob
12afc294bd
feat: add checks for domain
2023-05-13 23:35:05 +05:30
Damodar Lohani
f70712865e
refactor
2023-05-11 06:52:27 +00:00
Christy Jacob
60f51580a7
Merge pull request #5246 from singhbhaskar/fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled
...
Fix: Updated error when _APP_USAGE_STATS is disabled
2023-05-04 20:47:50 +05:30
Christy Jacob
ac004acbc8
fix: throw correct exception when project custom ID already exists
2023-04-29 12:41:17 +05:30
Damodar Lohani
ac9f434c85
more fixes and reset endpoints
2023-04-19 08:44:22 +00:00
Christy Jacob
0fb34433b9
feat: personal data filters to enhance password protection
2023-04-14 00:20:03 +04:00
Jake Barnby
f00bd7dac7
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2
...
# Conflicts:
# composer.lock
2023-04-11 17:25:26 +12:00
Jake Barnby
7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships
...
# Conflicts:
# composer.lock
2023-04-11 15:57:35 +12:00
Jake Barnby
b252fe847f
Add custom delete restricted error
2023-04-06 00:54:44 +12:00
Damodar Lohani
41d22fb50b
Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2
2023-03-30 08:02:31 +00:00
Bhaskar Singh
700f4f33ed
Merge branch 'appwrite:master' into fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled
2023-03-24 21:33:42 +05:30
