Commit graph

789 commits

Author SHA1 Message Date
Eldad Fux
5ce3de4933 Merge remote-tracking branch 'origin/main' into feat-eldad2-coroutines 2024-04-02 02:13:15 +02:00
Eldad Fux
b570368f10 Fixed auth error in users usage 2024-04-01 23:57:20 +02:00
Damodar Lohani
62b2dc0801 use internal ids 2024-03-18 09:22:15 +00:00
Matej Bačo
db1674811f Finish fixing code QL warnings 2024-03-08 13:57:20 +01:00
Jake Barnby
6a795f4d7a
Fix tests 2024-03-08 12:42:15 +01:00
Matej Bačo
005a239932 Auth fixes 2024-03-07 18:24:01 +01:00
Torsten Dittmann
dfef0e732c sync: main -> 1.5.x 2024-03-07 17:16:39 +01:00
Matej Bačo
efeb898be1 Import fixes 2024-03-07 15:29:42 +01:00
Torsten Dittmann
0a1d572c72 chore: run formatter 2024-03-06 18:34:21 +01:00
Torsten Dittmann
4d873eb5a2 fix: stats collection name 2024-03-05 10:36:23 +01:00
Torsten Dittmann
a53e630536 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2 2024-03-05 10:31:51 +01:00
Matej Bačo
d4e4337c57 PR review changes 2024-03-04 08:50:50 +00:00
Matej Bačo
c4bd61cdc8 QA changes 2024-03-03 18:11:55 +00:00
Matej Bačo
9bcad451f2 Add recovery codes to users API 2024-03-03 15:17:38 +00:00
Matej Bačo
7a29c79fb1 Fix bugs during QA 2024-03-01 17:04:09 +00:00
Matej Bačo
5cefca1c22 Fix MFA flows and docs 2024-03-01 16:22:51 +00:00
Torsten Dittmann
dd13d17377 feat: const for totp values 2024-03-01 03:07:58 +01:00
Torsten Dittmann
b7d3996960 feat: mfa collection restructure 2024-02-29 21:59:49 +01:00
Jake Barnby
d7a16ae7b0
Merge branch '1.5.x' into fix-password-validation 2024-02-26 17:52:41 +13:00
Jake Barnby
d3cf892001
Named params 2024-02-26 17:50:52 +13:00
Jake Barnby
19d7e533fa
Usage desc updates 2024-02-26 15:44:20 +13:00
Torsten Dittmann
3963b65f68 fix: mfa delete 2024-02-25 11:21:56 +01:00
Matej Bačo
cb7da26d53 Fix empty pass with personal data check 2024-02-25 09:19:30 +00:00
Christy Jacob
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Jake Barnby
0d62ecf90f
Merge pull request #7625 from appwrite/provider-null
Provider null
2024-02-24 01:17:58 +13:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Jake Barnby
942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.php
#	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/controllers/api/account.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
fogelito
b762a9cedd Check user false 2024-02-21 11:48:16 +02:00
fogelito
a851a5f244 providerInternalId nulls 2024-02-21 11:43:04 +02:00
Jake Barnby
14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Jake Barnby
3c727861bb
Fix target permissions 2024-02-16 17:07:16 +13:00
Torsten Dittmann
14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
shimon
dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02:00
Jake Barnby
66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby
06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
Christy Jacob
c076dfe6f1
Merge pull request #7576 from appwrite/refactor-usage-sn
Refactor usage sn
2024-02-12 23:05:56 +05:30
fogelito
ace75b0786 parseQueries 2024-02-12 18:02:04 +02:00
fogelito
e5bada0493 typo 2024-02-12 12:03:31 +02:00
fogelito
adbe11fd50 fix Indexes 2024-02-12 11:55:45 +02:00
shimon
e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
Souptik Datta
8d7be399d3
fix: Fix project user activity log's missing fields and total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:15:48 +05:30
shimon
790cdc297b composer update 2024-02-08 10:26:45 +02:00
Jake Barnby
7014b2c2cd
Fix user API mfa route auth 2024-02-07 18:08:51 +13:00
Bradley Schofield
559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Matej Bačo
25f8702429 Fix formatting 2024-02-05 10:40:53 +00:00
Matej Bačo
7beb9080fa Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates 2024-02-05 10:38:48 +00:00
shimon
6a6c3445fa updates 2024-02-04 20:02:01 +02:00
shimon
a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Torsten Dittmann
75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Jake Barnby
d1bad7c3cd
Remove redundant usage labels 2024-02-02 17:16:31 +13:00
shimon
a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02:00
Torsten Dittmann
ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
shimon
350d72eb1f updates 2024-02-01 12:21:50 +02:00
loks0n
d84cfab244 feat: remove users.createSession 2024-02-01 10:21:38 +00:00
shimon
5518ca165e remarks 2024-01-30 13:24:57 +02:00
Jake Barnby
ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit
Labels limit
2024-01-30 19:43:32 +13:00
shimon
44ed6826a9 refactor usage poc 2024-01-28 15:33:04 +02:00
fogelito
974783f54a Increase labels max value 2024-01-28 12:51:05 +02:00
shimon
7a2ee683e3 refactor usage poc 2024-01-28 11:28:59 +02:00
fogelito
789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +02:00
fogelito
998c4d282d Fix failing tests 2024-01-25 18:53:51 +02:00
fogelito
a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Jake Barnby
52a9b31521
Trigger deletes worker when target is deleted 2024-01-25 20:01:15 +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
88cf7ea9e8 fix: race condition with creating a user with targets 2024-01-24 15:31:58 +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
Matej Bačo
eb597b2bd2 Try to fix targets bug 2024-01-20 13:07:53 +00:00
Matej Bačo
42eb051368 QA bug fixes 2024-01-20 10:06:30 +00:00
Matej Bačo
311e9a75dd Allow empty values in PATH user service 2024-01-20 09:43:31 +00:00
Torsten Dittmann
057496dbaa feat: mfa users endpoints 2024-01-18 14:56:58 +01:00
shimon
a0b38a5a7c Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-18 14:19:19 +02:00
loks0n
bc1858c516 chore: do not auto create accounts in users endpoints 2024-01-17 11:03:04 +00:00
loks0n
a8adfe8f8a fix: users create session event 2024-01-16 11:13:42 +00:00
loks0n
77b1762514 chore: fix token event 2024-01-16 10:40:49 +00:00
loks0n
07da41bd69 docs: better descriptions for create token params 2024-01-12 17:35:16 +00:00
loks0n
c8ce360ce9 chore: remove 'universal' references 2024-01-12 17:30:36 +00:00
loks0n
02b83bf26e chore: changes to expire param create token 2024-01-12 17:28:56 +00:00
loks0n
ca511bd459 chore: use customId validators 2024-01-12 17:26:01 +00:00
loks0n
90c5d6413c feat: create new user if none create session 2024-01-12 17:14:11 +00:00
loks0n
ee96b220c3 docs: create session 2024-01-12 17:10:23 +00:00
loks0n
9068941772 feat: create user with create token if not exists 2024-01-11 14:55:37 +00:00
loks0n
332bd532e1 fix: specs 2024-01-09 19:04:47 +00:00
loks0n
9a34c92fac Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-09 16:42:00 +00:00
Jake Barnby
af019369e9
Merge branch 'main' into 1.5.x 2024-01-09 22:03:35 +13:00
Torsten Dittmann
9ba2eafa83
fix: escape html in email params (#7409)
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
2024-01-08 18:08:17 +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
Matej Bačo
fae28b468c Fix password hashing bug 2024-01-07 13:40:45 +01:00
Matej Bačo
e5f0e00742 Apply password validation to all places 2024-01-05 12:31:38 +01:00
Matej Bačo
0a2be34ceb Fix PHP refference bug 2024-01-05 12:07:41 +01:00
Matej Bačo
ba32170f72 Improve password validator hook 2024-01-04 16:26:15 +01:00
Steven Nguyen
f1ba7b08ab
Update the delete identity endpoints to set the params and payload
Because no payload was set, the event params (userId and identityId)
wasn't picked up automatically. This updates the endpoints so that the
payload is set, but also makes sure to set the userId and identityId
params since the identityId param's key doesn't match the key in the
payload.
2023-12-27 23:35:32 +00:00
Damodar Lohani
5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
fogelito
cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
loks0n
fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
loks0n
cb788b13bf chore: remove unused imports 2023-12-11 18:36:17 +00:00
loks0n
1e8a931751 chore: format 2023-12-11 17:13:19 +00:00
loks0n
f0d7312bd3 feat: create session method 2023-12-11 16:24:24 +00:00
fogelito
2fe50717d1 TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE 2023-12-06 15:10:40 +01: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
loks0n
8ea9706174 feat: Matej renaming plan 2023-11-30 11:35:52 +00:00
prateek banga
fa8dc133b4 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type 2023-11-29 15:01:47 +05:30
prateek banga
43b8fc2c31 review changes 2023-11-29 13:47:44 +05:30
Jake Barnby
4bc23afc65
Add constants for message types 2023-11-29 17:05:37 +13:00
prateek banga
ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
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
9c6cd8512f review changes 2023-11-21 15:19:19 +05:30
prateek banga
88f228c106 review changes 2023-11-21 15:11:09 +05:30
prateek banga
3394218cb0 adds validation for phone and email identifier 2023-11-21 15:00:02 +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
Jake Barnby
458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main 2023-11-13 16:46:05 +13:00
Christy Jacob
d33b8c2ce1
Merge branch '1.4.x' into fix-null-password-history 2023-11-09 07:44:44 -08:00
Bradley Schofield
54e5985940 Fix wrong operator for password history
This fixes a potential chance for nulls to be introduced into the password history array when $password is null and $passwordHistory != 0
2023-11-08 14:35:16 +00:00
shimon
ad63a377ab added inf metric 2023-11-08 11:09:32 +02:00
loks0n
dfc8c919d4 fix: missing sessionId error 2023-11-06 15:06:56 +00:00
loks0n
df0271c56a chore: rename to 'custom' sessions 2023-11-02 13:22:10 +00:00
loks0n
9206390d01 feat: custom expire paramter createTokenSession 2023-11-02 12:52:43 +00:00
Prateek Banga
f97d1fa9e3 adds log api in messaging controller 2023-11-02 18:00:17 +05:30
shimon
1c1028412a refactor users, project, functions usage display 2023-11-01 20:44:06 +02:00
prateek banga
f7529140bd adds event label to remaining messaging api 2023-10-31 23:53:46 +05:30
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
loks0n
3a9202a46b chore: christy feedback 2023-10-25 13:20:29 +01:00
shimon
4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon
9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
loks0n
a67ca55af5 fix: use queueForEvents in users 2023-10-23 11:32:09 +01:00
loks0n
1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
prateek banga
af40c63357 review changes 2023-10-20 17:02:13 +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
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
loks0n
f9d6ebd3a0 docs: add descriptions to universal token endpoints 2023-10-11 16:31:32 +01:00
loks0n
e41fab769f fix: edge cases 2023-10-11 13:20:25 +01:00
shimon
002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
loks0n
c343d7550f chore: fmt 2023-10-10 14:41:02 +01:00
loks0n
c4e82e4191 fix: edge cases 2023-10-09 14:49:07 +01:00
Prateek Banga
a92390dda2 review changes 2023-10-06 19:23:46 +05:30
Prateek Banga
d842191cc6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-06 03:53:16 +05:30
Prateek Banga
d5cc214546 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2023-10-06 03:44:36 +05:30
Prateek Banga
22d445587e review changes 2023-10-05 16:57:48 +05:30
loks0n
e94631f730 fix: token verification 2023-10-05 11:18:19 +01:00
Prateek Banga
48b91e39a8 review changes 2023-10-04 16:15:59 +05:30
shimon
7f1507f810 sync with 1.4 2023-10-04 11:20:32 +03:00
shimon
429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
loks0n
739be813e0 feat: oauth ssr token flow 2023-09-28 13:45:52 +01:00
shimon
dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Prateek Banga
35d842171c review changes 2023-09-20 23:37:10 +05:30
Prateek Banga
a2e34b5b64 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-20 16:59:07 +05:30
Prateek Banga
350549db7d Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-14 02:17:34 +05:30
Prateek Banga
d742b0c0a9 removes provider type from create user target 2023-09-13 00:53:25 +05:30
Steven Nguyen
6b0c24a9d6
Update user creation from teams and users services to not set accessedAt
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
2023-09-12 12:05:11 -07:00
Prateek Banga
6affa6b5a0 Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-13 00:07:09 +05:30
Prateek Banga
11a458f1df change providers to authProviders in remaining places 2023-09-13 00:06:18 +05:30
Matej Bačo
6964477429 Increase labels maximum limit 2023-09-06 18:15:03 +02:00
prateek banga
1762c81b8d Merge branch 'feat-messages-event-config' into feat-mailgun-provider 2023-08-31 18:32:26 +05:30
prateek banga
df77f92860 adds sub query for targets and topics, permission for user target 2023-08-25 01:22:16 +05:30
prateek banga
5ca8dc0a73 merge cl-1.4.x 2023-08-24 14:10:26 +05:30
prateek banga
e8cc60b0c2 adds audit resource in messaging controllers 2023-08-24 14:05:51 +05:30
prateek banga
82d220e158 fixes audit events 2023-08-24 13:43:30 +05:30
prateek banga
a95c29d546 lint fix 2023-08-24 01:55:08 +05:30
prateek banga
ec54000263 adds test for target controllers 2023-08-24 01:54:25 +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
Matej Bačo
8802e318d5 Fix pools resource 2023-08-23 13:52:17 +02:00
Jake Barnby
c99288229f
Add back missing route 2023-08-22 21:36:32 -04:00
Jake Barnby
a84e669a1f
Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Jake Barnby
efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
# Conflicts:
#	app/controllers/api/users.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
prateek banga
78385a59c6 adds remaining provider controllers 2023-08-22 22:15:31 +05:30
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Jake Barnby
942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
prateek banga
fe8b8d3dc6 fix lint 2023-08-21 14:14:06 +05:30
prateek banga
5e3065c30a merge resolve conflicts 2023-08-21 14:07:18 +05:30
shimon
83ffea68d1 rolling back usage flow 2023-08-20 16:53:26 +03:00
shimon
8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
prateek banga
36a5d1e245 adds remaining controllers for target in account and users 2023-08-18 23:28:12 +05:30
prateek banga
f73b3bf272 deletes user cache document 2023-08-18 01:07:42 +05:30
prateek banga
c83e4db23d lint fix 2023-08-17 19:02:07 +05:30
prateek banga
07b7a9db0f adds controller for creating a user target 2023-08-17 17:24:45 +05:30
prateek banga
e53f189b3b lint fix 2023-08-16 20:17:36 +05:30
prateek banga
c7dec3762b Adds getTarget and list targets controller to user and account 2023-08-16 20:13:38 +05:30
Damodar Lohani
9d15f70db5 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2 2023-08-13 00:45:11 +00:00
Matej Bačo
b9c52d8583 QA after merge fix 2023-08-10 01:44:00 +02:00
Matej Bačo
899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02: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
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
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
Damodar Lohani
a6109a0341 Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2 2023-08-07 08:42:04 +00:00
Matej Bačo
e60456cfda QA after merge with 1.4 2023-08-06 10:51:53 +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
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
Dakshi
12228ccef4 converted desc to sentence case 2023-08-01 20:56:48 +05:30
Steven Nguyen
eb7526601d
Delete duplicate 'Update Email Verification' endpoint 2023-07-31 11:00:30 -07:00
Damodar Lohani
fa8fab184b fix remove duplicate endpoints 2023-07-30 09:23:12 +00:00
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Steven Nguyen
9908a9021f
Update get logs by user to pass user internal id
The userId in audit is actually the userInternalId.
2023-07-19 22:49:51 -07:00
Christy Jacob
4c8608b49c chore: update naming conventions 2023-07-20 02:24:32 +04:00