1
0
Fork 0
mirror of synced 2024-07-04 14:10:33 +12:00
Commit graph

274 commits

Author SHA1 Message Date
Jake Barnby c54bb902a2
Merge pull request #6058 from appwrite/feat-sync-1.4
master -> 1.4.x
2023-08-29 14:59:16 -04:00
Jake Barnby cc924b0984
Merge remote-tracking branch 'origin/master' into feat-sync-1.4
# Conflicts:
#	app/controllers/api/storage.php
#	app/workers/deletes.php
2023-08-29 14:48:18 -04:00
Matej Bačo bdc9cb5bb5 QA changes 2023-08-23 10:29:01 +02:00
Matej Bačo 5be66c3c11 Linter fix 2023-08-23 10:16:52 +02:00
Vincent (Wen Yu) Ge 07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00:00
Jake Barnby a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# 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
#	composer.json
#	composer.lock
2023-08-18 13:23:35 -04:00
Jake Barnby a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# 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
2023-08-17 19:54:25 -04:00
Jake Barnby 861ed521a0
Merge branch '1.4.x' into fix-team-update-membership
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	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-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2023-08-17 17:51:24 -04:00
Matej Bačo c6684ee7f8 PR review changes 2023-08-11 16:45:36 +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 4a9ac08e75
Update description for some of the account endpoints for clarity 2023-08-09 10:02:01 -07: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
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
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
Vincent (Wen Yu) Ge b8e840f42d Fix missing description for endpoint 2023-07-31 16:01:59 +00:00
Steven Nguyen 611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Eldad A. Fux 887abad190
Merge pull request #5707 from appwrite/docs-delete-session
Update delete session description to be actually correct
2023-07-26 02:10:00 +03:00
Matej Bačo 743c214a66 PR review changes 2023-07-24 15:12:36 +02:00
Damodar Lohani 8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
Damodar Lohani 94d44acbf2
Rename update-team-membership-roles.md to update-team-membership.md 2023-07-11 11:57:28 +05:45
Mendel Gordon 70cebe4460
Update create-magic-url-session.md
Fix typo
2023-06-29 10:32:03 -04:00
Vincent (Wen Yu) Ge 57621de57d Damodar's comments 2023-06-15 18:38:15 +00:00
Vincent (Wen Yu) Ge 6edea596b4 Update delete session description to be actually correct 2023-06-14 17:49:52 +00:00
Steven Nguyen 8400394857
Add an endpoint to update user labels 2023-06-09 10:18:51 -07:00
Damodar Lohani f79c41a132 fix naming and add doc 2023-04-17 02:21:24 +00:00
Vincent (Wen Yu) Ge 472ddd190c fix links for relationship attribute 2023-04-12 15:11:10 +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
Jake Barnby 2157acd63f
Merge branch '1.3.x' into doc-auth-1.3
# Conflicts:
#	composer.lock
2023-04-11 21:22:32 +12:00
Jake Barnby d58ce741f3
Apply suggestions from code review
Co-authored-by: Vincent (Wen Yu) Ge <vincent@appwrite.io>
2023-04-11 15:49:36 +12:00
fogelito acbdb06b3c Add .md files 2023-04-10 23:15:18 +03:00
Vincent (Wen Yu) Ge 5354e5ee44
Merge branch '1.3.x' into doc-auth-1.3 2023-04-10 16:03:36 -04:00
Torsten Dittmann 3860602697 feat: console service 2023-03-31 17:14:59 +02:00
Vincent (Wen Yu) Ge 7b35d3739b Update auth doc links for 1.3 2023-03-29 18:58:55 +00:00
Torsten Dittmann 10cd97e978 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-team-prefs 2023-03-23 13:03:50 +01:00
Matej Bačo 1f409b4e40 Shared variables 2023-03-11 17:06:02 +01:00
Torsten Dittmann 64244d9f8f docs: update teams get prefs 2023-03-09 02:11:10 +05:30
Torsten Dittmann 4f08d8e82a
Apply suggestions from code review
Co-authored-by: Vincent (Wen Yu) Ge <vincent@appwrite.io>
2023-03-09 02:09:03 +05:30
Matej Bačo 59f5978fa3 Implement rules 2023-03-08 19:30:01 +01:00
Torsten Dittmann 496da61cd9 feat: team preferences 2023-03-06 19:54:02 +05:30
Torsten Dittmann 7372983c9d docs: update attributes 2023-02-28 13:55:06 +05:30
Torsten Dittmann 5a2bbd0976 docs: update attributes 2023-02-26 21:13:27 +05:30
Torsten Dittmann 8ae974e6dd feat: database update attribute endpoints 2023-02-26 18:03:18 +05:30
Vincent (Wen Yu) Ge 33dab2ea46
Update create-team-membership.md 2023-01-17 10:18:50 -05:00
Vincent (Wen Yu) Ge 60bfae7e00
Update create-team-membership.md 2023-01-17 10:14:32 -05:00
Damodar Lohani 2c23f7f149
update doc 2023-01-17 07:17:08 +05:45
Damodar Lohani f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00