Commit Graph

5023 Commits

Author SHA1 Message Date
Christy Jacob c5fa7eb7dc Merge branch '1.6.x' of github.com:appwrite/appwrite into mock-numbers 2024-06-20 20:53:06 +05:30
Christy Jacob 814b59a13a Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers 2024-06-20 20:42:29 +05:30
Christy Jacob 1b1cfc38c8 fix: undefined variable 2024-06-20 20:31:20 +05:30
Christy Jacob 392aaca681 chore: fix tests 2024-06-20 20:19:56 +05:30
Steven Nguyen e3bc1887a4 Merge pull request #8263 from appwrite/docs-clarify-optional-url
docs: update text description in request table
2024-06-19 09:45:53 -07:00
Christy Jacob c5e788c2ef Merge pull request #7888 from appwrite/feat-security-emails
New environment for certificates and security emails
2024-06-19 12:20:55 +05:30
Richard 0dc553f31d Merge branch 'main' into docs-clarify-optional-url 2024-06-18 09:12:32 -04:00
Steven Nguyen 4b24848f22 Merge pull request #8236 from 2002Bishwajeet/fix-user-model
Fix: Don't set the target field if the existing target document is false
2024-06-17 17:11:27 -07:00
Christy Jacob 9e1541d96a Merge branch 'main' of https://github.com/appwrite/appwrite into mock-numbers 2024-06-16 07:28:22 +00:00
Christy Jacob a912bbe374 chore: update variable name 2024-06-16 07:19:10 +00:00
choir27 84d9b4befe docs: fix hyperlink in storage code snippet 2024-06-13 09:59:20 -04:00
choir27 897ae1c859 docs: update text description in request table 2024-06-12 10:47:48 -04:00
loks0n 0a78d41ecb chore: remove endTime 2024-06-12 13:50:18 +01:00
loks0n 7559c9af68 chore: us spelling of canceled 2024-06-12 11:21:48 +01:00
Bishwajeet Parhi 190560b8ef chore: append attributes instead of replace 2024-06-11 21:17:25 +05:30
loks0n 1269397475 chore: fmt 2024-06-11 15:50:50 +01:00
loks0n 853ffe804e feat: improve duration calc 2024-06-11 15:48:55 +01:00
loks0n 67b32ecb05 test: cancel deployment 2024-06-11 15:41:13 +01:00
Khushboo Verma 97786a05ff Updated cancelled build duration 2024-06-07 20:29:24 +05:30
Khushboo Verma d233f1ac64 Update duration and endTime 2024-06-07 16:53:33 +05:30
Khushboo Verma c2c6d337ed Resolved merge conflict 2024-06-06 19:39:16 +05:30
Christy Jacob 3e47b43908 Merge pull request #8214 from appwrite/chore-update-create-build-endpoint
Remove build id from api endpoint
2024-06-06 17:53:05 +05:30
Bishwajeet Parhi cccda2a46c fix: Don't set target attribute if no existing Target found 2024-06-05 23:34:01 +05:30
Eldad A. Fux f91a68c8a0 Merge pull request #8207 from appwrite/feat-users-create-jwt
Feat: users.createJWT()
2024-06-04 07:00:32 -04:00
Damodar Lohani 66ac96580b Merge branch 'main' into feat-security-emails 2024-06-04 06:51:24 +05:45
Khushboo Verma d7a40e2b4d Remove the code to fetch build document 2024-06-02 23:14:41 +05:30
Khushboo Verma 0eabff5faf Refactor builds document creation 2024-05-31 01:53:29 +05:30
Khushboo Verma d3c2e9db1f Add comment for clarity 2024-05-30 22:33:37 +05:30
Khushboo Verma 94e7669b41 Remove build id from api endpoint 2024-05-29 17:48:52 +05:30
Matej Bačo b0317fb19d Implement project dynamic (JWT) keys 2024-05-29 08:57:25 +00:00
Matej Bačo 3b8799353d PR review changes 2024-05-29 07:51:51 +00:00
Matej Bačo 2dac8bc7ed Update app/controllers/api/users.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-05-29 09:31:08 +02:00
Matej Bačo 711e26c605 Relay on lib to verify JWT expiry 2024-05-28 10:59:53 +00:00
Matej Bačo b1ff989c3f Implement tests, fix JWT maxAge 2024-05-28 09:25:54 +00:00
Matej Bačo 613677e9f7 Implement users.createJWT 2024-05-27 20:04:50 +00:00
Khushboo Verma b880a0a7b2 Remove :buildId from endpoint as discussed 2024-05-27 18:21:28 +05:30
Khushboo Verma 4e8855fad3 Merge branch '1.6.x' into feat-cancel-build-deployment 2024-05-27 18:03:59 +05:30
Matej Bačo 8dd883a312 Add comments 2024-05-24 13:04:30 +02:00
Khushboo Verma f0de4c6eac Resolved merge conflict 2024-05-23 18:34:48 +05:30
Jake Barnby 9bb9f1eee7 Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-05-23 15:37:13 +12:00
Christy Jacob aa76862692 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x 2024-05-22 19:43:31 +00:00
Jake Barnby 680cd5194d Fix returning hashed secrets 2024-05-22 14:11:06 +12:00
Jake Barnby c7106b9147 Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets 2024-05-22 12:50:58 +12:00
Matej Bačo a115f878b3 Merge remote-tracking branch 'origin/1.6.x' into feat-function-tokens 2024-05-21 10:28:21 +00:00
loks0n ff1cabdbf7 chore: refactor finally clause 2024-05-20 22:35:40 +01:00
Steven Nguyen 47ed708293 Merge branch 'main' into chore-sync-with-main 2024-05-20 19:03:54 +00:00
Steven Nguyen 91748b1bd5 Merge branch 'main' into fix-5516-in-team-membership-allow-adding-user-over-limit-from-console-or-apikey 2024-05-20 11:40:58 -07:00
Steven Nguyen 722f3291fa Merge branch 'main' into chore-sync-with-main 2024-05-20 18:33:52 +00:00
loks0n 6bd407eae9 chore: refactor finally block 2024-05-20 18:55:15 +01:00
Christy Jacob d258240f08 Merge pull request #8152 from appwrite/fix-improve-cold-start-error
fix: improve cold start error
2024-05-20 17:26:58 +01:00