Commit Graph

6937 Commits

Author SHA1 Message Date
Khushboo Verma f18d33a0d6 Resolved merge conflicts 2023-10-13 18:54:14 +05:30
Khushboo Verma 66ec7f2e1d VCS tests 2023-10-13 18:50:58 +05:30
Prateek Banga feac25f401 adds already sent exception in update message 2023-10-13 18:35:49 +05:30
Prateek Banga 0b1b7646d5 review changes 2023-10-13 18:26:54 +05:30
loks0n 63d3a2bc73 chore: revert abuse-key changes 2023-10-13 11:08:25 +01:00
loks0n 07286e5864 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-13 11:05:22 +01:00
loks0n 81c4a9bbd5 chore: fmt 2023-10-13 11:05:14 +01:00
Prateek Banga 4a44fb3330 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-10-13 14:52:02 +05:30
Steven Nguyen 3f2f6ab43a Ensure permissions are updated when a project moves orgs
Since the following collections also have permissions set to the team,
the team should be updated for consistency:

- installations
- repositories
- vcsComments
2023-10-12 17:34:53 -07:00
Steven Nguyen 3bb22c38cc Update teamInternalId when updating project team
This is important because when an organization is deleted, projects are
fetched by the teamInternalId and if the teamInternalId is not updated
when the project team is updated, the project will be deleted if the
previous organization is deleted.
2023-10-12 17:03:45 -07:00
Khushboo Verma bb75036efe WIP: Mocked GitHub installation 2023-10-13 01:45:27 +05:30
loks0n 8ab429b92f feat: replace session confirmation endpoints 2023-10-12 14:38:32 +01:00
Prateek Banga cc1769ed41 review changes 2023-10-12 11:48:26 +05:30
loks0n b299ed056e chore: rename $sessionSecret 2023-10-11 17:07:02 +01: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 893b1d0ba7 Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.gitmodules
	app/controllers/api/functions.php
	app/controllers/api/health.php
	app/init.php
	app/views/install/compose.phtml
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Workers/Builds.php
	src/Appwrite/Platform/Workers/Deletes.php
	src/Appwrite/Platform/Workers/Functions.php
	src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
shimon 002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
Prateek Banga 17ba6355e0 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-10-10 19:52:19 +05:30
loks0n c343d7550f chore: fmt 2023-10-10 14:41:02 +01:00
loks0n c30c024805 test: fix magic url assertions 2023-10-10 14:36:53 +01:00
Prateek Banga bb52647366 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-10 19:06:39 +05:30
loks0n a88175fc46 fix: unhash session responses 2023-10-10 13:30:42 +01:00
Prateek Banga 1e5a2a78aa Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.5.x-with-1.4.x 2023-10-10 17:46:44 +05:30
loks0n c4e82e4191 fix: edge cases 2023-10-09 14:49:07 +01:00
Prateek Banga a77a212e2c adds scheduling for messaging worker 2023-10-09 17:29:26 +05:30
shimon e2989afda8 queueForBuilds fix via functions controller 2023-10-09 13:28:06 +03:00
shimon 24e09d3d8e queueForBuilds fix via functions controller 2023-10-09 13:16:05 +03:00
shimon 31466c44d8 update projects database 2023-10-08 16:44:14 +03:00
Bradley Schofield 9cb1cf418c Improve Error Handling and Add more Validation 2023-10-06 17:02:01 +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 8e9f270ef0 update id param 2023-10-06 03:30:47 +05:30
shimon 948f36a023 sync with 1.4 2023-10-05 16:15:39 +03:00
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
Christy Jacob 32ba34cba5 chore: add database overrides 2023-10-05 05:58:52 +00:00
Christy Jacob adbbb6dc20 chore: add database overrides 2023-10-05 05:53:49 +00:00
Prateek Banga fb98d21ae5 adds graphql test cases for provider endpoints 2023-10-05 02:12:04 +05:30
Prateek Banga 5891872fad Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-10-04 17:27:56 +05:30
Prateek Banga c9c49158a3 changes to validator length 2023-10-04 16:24:29 +05:30
Prateek Banga 61785ab35a typo fix 2023-10-04 16:19:05 +05:30
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 e3668a4d06 sync with 1.4 2023-10-03 21:56:36 +03:00
shimon 429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
Christy Jacob ff3c25d352 chore: update database 2023-10-02 22:23:35 +00:00
Christy Jacob 29ad61d461 chore: update database 2023-10-02 22:01:42 +00:00
Christy Jacob b456c9df2c chore: remove DB creates 2023-10-02 21:32:05 +00:00