Commit Graph

431 Commits

Author SHA1 Message Date
shimon 7340968d1f Merge branch 'master' of github.com:appwrite/appwrite into __stream
 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
2023-03-08 16:31:56 +02:00
Steven Nguyen c5ebcbab2b Add offline support labels on endpoints 2023-02-23 14:47:45 -08:00
shimon 4ac062edfe Merge branch 'master' of github.com:appwrite/appwrite into __stream
 Conflicts:
	.gitmodules
	Dockerfile
	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
	composer.lock
2023-02-19 10:51:50 +02:00
Jake Barnby f6fc9a8d8c Merge remote-tracking branch 'origin/master' into feat-technical-debt-2
# Conflicts:
#	composer.lock
2023-02-14 14:22:08 +13:00
shimon 3d1228ba13 sync with master
and renaming attr
2023-02-12 10:56:11 +02:00
Christy Jacob e5a6db6133 Merge pull request #4890 from appwrite/doc-clarify-permission
Update permission and ID param descriptions for grammar and clarity.
2023-01-28 04:15:20 +05:30
Vincent (Wen Yu) Ge b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00:00
fogelito c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
 Conflicts:
	app/init.php
	composer.json
	composer.lock
2023-01-16 10:24:37 +02:00
Vincent (Wen Yu) Ge 45aea5b941 Update branch with master 2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge 92a384e31c Fix descriptions for ID and regen 1.2.x specs 2023-01-13 14:27:08 -05:00
Bradley Schofield 31b718d829 Replace Appwrite Validators with backported Utopia ones
+ Updated Utopia Framework to 0.26.0
+ Replaced Appwrite Validators with Utopia ones
2023-01-13 15:28:04 +00:00
Damodar Lohani b7d17e82da fix: membership invite email 2022-12-16 06:15:23 +00:00
Damodar Lohani 495da1bfd4 fix: template path 2022-12-16 06:11:12 +00:00
Damodar Lohani 5d195659bd refactor: mails refactor 2022-12-15 09:22:05 +00:00
fogelito 8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
fogelito f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Matej Bačo 8b71e318c2 Fix tests bug 2022-11-24 11:55:49 +00:00
Matej Bačo efe093ce3c Fix unsaved changes in team inv 2022-11-24 12:35:26 +01:00
Bradley Schofield 0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield 66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +00:00
Bradley Schofield 4dfafd1169 Merge branch 'master' into feat-implement-session-length-api 2022-11-04 16:11:38 +00:00
Bradley Schofield e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield 4cfc3b3a7f Update authDuration fallback value 2022-11-04 10:12:02 +00:00
Bradley Schofield cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield 5dc8a2dee0 Add Tests and fix bugs 2022-11-01 11:15:45 +00:00
Bradley Schofield d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Vincent (Wen Yu) Ge 4cee87273c Merge branch 'master' into doc-unique-id 2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge ae2100244f Update unique() to be ID.unique() 2022-10-03 20:22:28 +00:00
Christy Jacob 54d14a5151 Merge pull request #3883 from appwrite/fix-get-membership-response
Fix: Get Membership response
2022-09-23 11:42:33 +05:30
Matej Bačo c42bf2d8da Fix documentation response model 2022-09-19 11:43:21 +00:00
Matej Bačo a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Christy Jacob 105e5fe71c feat: rename getMemberships to listMemberships 2022-09-14 01:44:56 +05:30
shimon 834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
 Conflicts:
	app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Eldad Fux c442a5bce2 Fix linter test 2022-09-07 14:23:57 +03:00
Eldad Fux c22c28bc67 Fixed indentation 2022-09-07 14:14:53 +03:00
Eldad Fux 01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
shimon 1362902082 audit event name reformation 2022-09-05 11:00:08 +03:00
shimon 5d16c39d5f account labels 2022-09-04 11:13:44 +03:00
Jake Barnby b9148d380b Fix only variables can passed by reference errors 2022-08-31 11:31:43 +12:00
Christy Jacob 7591f68970 Merge pull request #3702 from appwrite/feat-list-endpoints-queries
Feat: List endpoint queries
2022-08-30 14:56:09 +02:00
Matej Bačo 63c02677a0 PR review changes 2022-08-30 13:55:23 +02:00
Matej Bačo 2b3dc48bf1 PR review changes 2022-08-30 08:21:34 +00:00
Jake Barnby 44970cc628 Sync master 2022-08-28 11:01:46 +12:00
Matej Baco fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Matej Bačo 65d09705ac Simplify class name 2022-08-24 18:25:15 +00:00
Jake Barnby ea4b177b83 Fix team permissions 2022-08-24 20:26:47 +12:00
Matej Bačo 531d57feff Upgrade listMemberships queries 2022-08-23 13:16:46 +00:00
Matej Bačo 2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo 79560c13e6 Upgrade teamListLogs queries 2022-08-23 12:50:52 +00:00
Matej Bačo 6c971f6ece Upgrade listTeams queries 2022-08-23 08:56:28 +00:00