1
0
Fork 0
mirror of synced 2024-07-06 23:21:05 +12:00
Commit graph

9294 commits

Author SHA1 Message Date
Jake Barnby 92c39470be
Merge pull request #5800 from appwrite/fix-team-update-membership
Update method name for `updateMembershipRoles`
2023-08-17 19:43:56 -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
prateek banga 27df545fb7 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into fix-5404-update-document-without-relation-permission 2023-08-17 19:15:33 +05:30
prateek banga 860e9958c7 lint fix 2023-08-17 19:04:41 +05:30
Jake Barnby 04d0e284a1
Update specs 2023-08-14 22:29:47 -04:00
Jake Barnby c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-14 19:33:56 -04:00
prateek banga 8e1ef812d3 resolve merge conflicts 2023-08-14 21:59:24 +05:30
Bishwajeet Parhi ac4701988a generate api specs 2023-08-14 17:01:42 +05:30
Bishwajeet Parhi d00af693bb fix duplicate locale code and tests passes 2023-08-11 21:29:13 +05:30
prateek banga 0304adf872 fix test cases 2023-08-11 16:19:05 +05:30
prateek banga 971ebbc686 fix test cases 2023-08-11 16:17:31 +05:30
Bishwajeet Parhi 5c8618410b chore: implement blacklist and regenerate specs 2023-08-11 13:13:46 +05:30
Jake Barnby 16cb495a41
Lint 2023-08-10 21:31:31 -04:00
Bishwajeet Parhi 528846c35e fix: missing Whitelist enums 2023-08-11 02:25:50 +05:30
Jake Barnby 6cd0e328d9
Review fixes 2023-08-10 16:44:38 -04:00
Bishwajeet Parhi cec9798126 push latest specs 2023-08-11 00:44:22 +05:30
Bishwajeet Parhi d0755a587f Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-10 22:31:53 +05:30
prateek banga 8cefc54ca3 merge resolve conflicts 2023-08-10 17:22:15 +05:30
prateek banga 4d03610755 resolve merge conflicts 2023-08-09 03:23:45 +05:30
Christy Jacob 5be55f05e8 feat: update error page 2023-08-08 21:25:48 +00: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
prateek banga 51ceb5d74a prohibit select queries in list attributes and remove static method 2023-08-09 00:12:53 +05:30
Christy Jacob 347cd4d13f feat: generte specs 2023-08-08 16:58:06 +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
Christy Jacob 5b42d2c21f feat: review comments 2023-08-08 16:47:51 +00:00
Bishwajeet Parhi b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
prateek banga 385f76d7f2 lint fix 2023-08-08 04:42:00 +05:30
prateek banga 60236b3af6 refactor according to review comments 2023-08-08 04:40:07 +05:30
prateek banga 7e185cd799 moved formatting logic to relationship attribute model 2023-08-08 03:34:13 +05:30
prateek banga 52e800cc59 refactor according to review feedback 2023-08-08 02:56:20 +05:30
prateek banga 0630f56dd5 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-query-support-attributes-indexes 2023-08-07 20:35:55 +05:30
Eldad A. Fux 88e1deefb5
Merge pull request #5929 from appwrite/feat-sync-1.4-with-master
Sync with master
2023-08-07 17:57:43 +03:00
Eldad A. Fux 90e89aa02e
Merge pull request #5934 from appwrite/feat-appwrite-assistant
Feat appwrite assistant
2023-08-07 17:56:22 +03:00
Eldad A. Fux 04b8030a27
Merge pull request #5875 from appwrite/fix-aac-file-issue
audio/aac mime type added
2023-08-07 17:33:50 +03:00
Eldad A. Fux 4b7cd5c372
Merge pull request #5715 from appwrite/fix-phone-abuse-param
fix: abuse label for creating phone session
2023-08-07 15:16:40 +03: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
Eldad A. Fux 06570a081a
Merge pull request #5928 from safwanyp/fix-5517-fix-stale-team-memberships-on-user
Fixed bug where memberships remained after a team is deleted
2023-08-05 06:34:48 +03:00
Eldad A. Fux 702424ed31
Merge pull request #5694 from Miguelii/fix-5693-portuguese-email-template-missing-word
Added missing word to portuguese email template
2023-08-05 06:32:11 +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 d1c0bccb59
Merge tag '1.3.8' into cloud-1.3.x 2023-08-04 14:12:58 -07:00
Steven Nguyen aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Bishwajeet Parhi dfc7ab97ab update spec files 2023-08-04 19:28:38 +05:30
Bishwajeet Parhi 5f1a515f00 Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-04 19:20:44 +05:30
Damodar Lohani 767a3caef8 remove unused injection 2023-08-04 13:17:23 +00:00
Damodar Lohani cd18853fed add abuse labels 2023-08-04 13:16:57 +00:00
Damodar Lohani 64321cfb0b remove authorization 2023-08-04 13:08:59 +00:00
Safwan Parkar 451f4bee19 Fixed an incorrect test for team deletion
This commit contains changes in 3 places.

- First I changed the placement of an informative comment in the DELETE TEAM controller, and moved it outside of the loop. I did this when Steven pointed out that the behaviour I describe in the comment is for the whole loop.

- The second change is the removal of my first test. I was facing quite a few issues with creating users in the test, and ended up using the CREATE TEAM MEMBERSHIP to perform 2 actions at once -> create a new user if one doesn't exist with the provided email, and create a membership for the user. Before this approach, I had quite a bit of code that didn't work, and it seems like I removed some things that weren't supposed to be removed, and didn't change variable names where necessary. Anyway, I figured that the problem has something to do with the user being created on the client side, so I moved the test to the server side.

- The new test I implemented does the same thing as my previous failed test, but in more detailed and distinct steps. The test first creates 5 new users inside of a loop, and pushes each new user's ID to an array called 'new_users' if the response is as expected. Then a new team is created. The next step is to create memberships for all 5 users. If all these steps pass, the new team that was just created, is deleted, and we check to make sure the new users have 0 team memberships each.

Formatter and linter showed no errors. Tests were successful on localhost.
2023-08-04 15:40:42 +04:00
Damodar Lohani 49085be4e4 fix formatting 2023-08-04 02:17:02 +00:00
Damodar Lohani 45afea9175 moved assistant endpoint to console, and add env support 2023-08-04 01:42:22 +00:00
Safwan Parkar d142620c5e invalidate cached document of user
- cache caused stale data in memberships
2023-08-03 22:08:27 +04:00