Commit graph

247 commits

Author SHA1 Message Date
Torsten Dittmann
14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
Jake Barnby
18f7168160
Merge main 2024-02-12 14:18:19 +13:00
Torsten Dittmann
9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann
9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Torsten Dittmann
7c66481406 fix: collections for mfa 2024-01-08 13:22:33 +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
Torsten Dittmann
ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
Prateek Banga
11a458f1df change providers to authProviders in remaining places 2023-09-13 00:06:18 +05:30
Prateek Banga
a59cfb6461 review changes 2023-09-11 20:30:21 +05:30
prateek banga
8d14dcb839 Merge branch 'feat-add-messaging-providers' into feat-add-messaging-response-models 2023-08-31 18:18:59 +05:30
prateek banga
e104e6d0f2 Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers 2023-08-31 18:16:48 +05:30
Jake Barnby
0a1ab4ae60
Add back codes env var 2023-08-28 22:24:52 -04:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Matej Bačo
efe3793679 PR review changes, fix node test 2023-08-19 20:26:47 +02:00
prateek banga
45e03d3973 Merge branch 'feat-add-messaging-providers' into feat-add-messaging-response-models 2023-08-16 15:17:53 +05:30
prateek banga
92e587769a resolve merge conflicts 2023-08-16 15:16:45 +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
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
prateek banga
d7f806e671 fix lint issuesl 2023-08-07 21:01:25 +05:30
prateek banga
3e70a19e4f add response models required for messaging service 2023-08-07 20:56:03 +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
prateek banga
be1afc61b0 rename provider model to AuthProvider 2023-08-07 16:19:55 +05:30
Matej Bačo
906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02: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
Matej Bačo
8bc933ab91 Fix template issues 2023-08-04 10:56:46 +02: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
Steven Nguyen
5c3f96289d
Prevent Response from modifying the passed in doc 2023-07-19 22:21:21 -07:00
Torsten Dittmann
1f46d03e8c feat: initial mfa implementation 2023-06-22 15:35:49 +02:00
Khushboo Verma
6604a33e46 Add createRepositoryDetection endpoint 2023-06-14 00:34:22 +05:30
Matej Bačo
f53d75205b Implement branches endpoint, rename some attributes, update response models 2023-05-26 00:29:08 +02:00
Matej Bačo
6e515e3cc4 Copy Khushboo's integration from feat-peach-q1-kh 2023-05-22 12:58:13 +02:00
Damodar Lohani
7419867078 new locale codes endpoint 2023-04-17 02:10:17 +00:00
Damodar Lohani
d394715b56 Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-13 01:35:56 +00:00
Jake Barnby
7fe14ca10b
Merge remote-tracking branch 'origin/master' into sync-master
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/console
#	app/controllers/api/storage.php
#	composer.lock
2023-04-12 00:50:31 +12:00
Damodar Lohani
b1778ff599 rename 2023-04-10 01:03:48 +00:00
Torsten Dittmann
3860602697 feat: console service 2023-03-31 17:14:59 +02:00
fogelito
00c1418246 Update response Model.php 2023-03-16 13:48:27 +02:00
fogelito
f255484fd4 Model relationship 2023-03-14 10:24:53 +02:00
Damodar Lohani
ae549a1e9a tests and fixes 2023-03-14 07:21:56 +00:00
Damodar Lohani
c649ba897f update response model 2023-03-13 09:33:11 +00:00
fogelito
ca3efdf562 create relation 2023-03-12 16:04:18 +02:00
Matej Baco
4b0d6d9826 Bug fixes after proxy QA 2023-03-10 12:20:24 +00:00
Damodar Lohani
1d3e0c19f8 error fixes 2023-03-10 11:04:11 +00:00
Damodar Lohani
83891f96eb response models 2023-03-10 06:27:30 +00:00