1
0
Fork 0
mirror of synced 2024-07-10 17:06:17 +12:00
Commit graph

16528 commits

Author SHA1 Message Date
Bishwajeet Parhi 5c8618410b chore: implement blacklist and regenerate specs 2023-08-11 13:13:46 +05:30
Bishwajeet Parhi 528846c35e fix: missing Whitelist enums 2023-08-11 02:25:50 +05:30
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
Christy Jacob 0d7597c4e2
Merge pull request #5964 from appwrite/remove-vcs-assets
Remove VCS assets
2023-08-09 11:58:01 +04:00
Khushboo Verma 8a8dfa1605 Remove VCS assets 2023-08-09 13:24:09 +05:30
Christy Jacob fe9ed76554 chore: update dependencies 2023-08-08 22:03:18 +00:00
Christy Jacob 5be55f05e8 feat: update error page 2023-08-08 21:25:48 +00:00
Christy Jacob 4f780a6caa chore: trigger ci 2023-08-08 20:53:42 +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
Christy Jacob c1167f7dc7
Merge pull request #5371 from appwrite/disallow-personal-data
Disallow personal data
2023-08-08 23:08:10 +04:00
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
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
Damodar Lohani 72ebccfd7f update assistant 2023-08-07 07:55:24 +00:00
Eldad A. Fux a7094310d7
Merge pull request #5550 from Suven-p/feat-5542-validate-x-appwrite-id-header-for-CreateFile
Validate value of x-appwrite-id header
2023-08-05 13:23:52 +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
Safwan Parkar 4a9af13f16 run formatter and linter
Run the composer format and lint commands, which I forgot to run before.
2023-08-04 23:41:29 +04:00
Safwan Parkar 0295c6ec1b improve test by removing user creation loop
The CREATE TEAM MEMBERSHIP endpoint requires the email of the user to be added to the team. If the user does not exist in the project, a new user is created with the specified email and added to the team.

The first version of the test creates 5 users, and then adds them to the newly created team. This process is more streamlined now, by using the CREATE TEAM MEMBERSHIPS behaviour to create a user on the go and create a membership for them immediately after.

I also change the way I add user IDs to the array, by using the shorthand notation instead of the `array_push` function.
2023-08-04 23:17:41 +04: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 06e1191063 added test 2023-08-04 00:34:01 +04:00
Safwan Parkar d142620c5e invalidate cached document of user
- cache caused stale data in memberships
2023-08-03 22:08:27 +04:00
Safwan Parkar a14d89eb3c remove error-causing condition 2023-08-03 21:39:18 +04:00
Eldad A. Fux 9f7f99ba83
Merge pull request #5935 from appwrite/feat-vcs-logos
Add VCS assets
2023-08-03 14:47:54 +03:00
Khushboo Verma 717f9ca471 Add VCS assets 2023-08-03 16:56:32 +05:30
Damodar Lohani 2a7ec490af setup appwrite assistant for test 2023-08-03 10:29:36 +00:00
Eldad A. Fux 8ed4029169
Merge pull request #5867 from appwrite/feat-base-image-upgrade
test updated docker-base version
2023-08-03 10:30:04 +03:00
Safwan Parkar 2bc2061f09 fix showing of stale team memberships 2023-08-02 18:44:43 +04:00
Damodar Lohani 078f7e58d6 Merge remote-tracking branch 'origin/master' into feat-sync-1.4-with-master 2023-08-02 09:43:09 +00:00
Safwan Parkar c5233d9ece removed unnecessary code 2023-08-02 12:18:21 +04:00
Eldad A. Fux 75894987f9
Merge pull request #5917 from appwrite/doc-dsn-url-encode
Update the docs for the _APP_SMS_PROVIDER env var
2023-08-02 08:43:58 +03:00
Eldad A. Fux be67fe96f6
Merge pull request #5922 from appwrite/feat-error-page
Style Appwrite Error Page
2023-08-02 08:43:03 +03:00
Eldad A. Fux 05a316bf48
Merge pull request #5895 from appwrite/feat-2591-improve-oauth2-error-handling
Improve OAuth2 error handling
2023-08-01 22:55:58 +03:00