prateek banga
5e3065c30a
merge resolve conflicts
2023-08-21 14:07:18 +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
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
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
Bradley Schofield
91c82f0d7d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-07 16:09:28 +01: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
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
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
Jake Barnby
0363993f13
Fix errors
2023-06-15 17:28:35 +12: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
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
Bhaskar Singh
8b5e0e1f1a
Updating the exception variable name for easy
...
readability
2023-03-21 20:33:42 +05:30
Bhaskar Singh
ac2085ffa8
Updated error when _APP_USAGE_STATS is disabled
...
for usage
2023-03-18 22:12:36 +05:30
Matej Bačo
c01fcb130c
Merge branch 'feat-db-pools-master' into feat-db-pools-sync
2023-03-14 12:58:54 +01:00
Torsten Dittmann
2178bfc126
Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-database-update-attribute
2023-03-10 18:39:11 +05:30
