Jake Barnby
87b72e4d0d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters
2023-08-22 16:01:19 -04:00
Jake Barnby
c929fe113e
Fix colliding ID overrides
2023-08-22 13:11:32 -04:00
Matej Bačo
eea43e17bd
Fix function request filter
2023-08-22 15:16:07 +02:00
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
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
Matej Bačo
897d299ae6
PR review changes, fixes from QA
2023-08-11 15:34:57 +02:00
Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02:00
Bradley Schofield
c6302014f5
Run Linter
2023-08-09 23:51:36 +01: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
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
43ee8e1ed4
fix: update tests
2023-07-20 02:17:16 +04: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
Jake Barnby
0363993f13
Fix errors
2023-06-15 17:28:35 +12:00
Jake Barnby
ed2c1139a7
Update messages
2023-06-09 13:03:19 +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
075ed65a2f
Merge pull request #5572 from appwrite/feat-update-project-creation
...
Feat update project creation
2023-05-25 22:50:24 +05:30
Steven Nguyen
f774721701
Update the error message for blocked users
...
Remove the "You can unblock the user from the Appwrite console." part
as it is not relevant for the person receiving the error.
2023-05-23 10:40:05 -07:00
Christy Jacob
0839822a66
Apply suggestions from code review
2023-05-23 14:39:26 +00:00
