1
0
Fork 0
mirror of synced 2024-07-07 23:46:11 +12:00
Commit graph

4133 commits

Author SHA1 Message Date
shimon b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
Matej Bačo 1502bfef74 Increase timeout 2023-09-30 17:24:09 +02:00
Matej Bačo 78dd0ca439 Merge branch 'cl-1.4.x' into patch-sync-exec-timeout 2023-09-30 16:02:33 +02:00
Christy Jacob 43de260b33
Merge pull request #6366 from appwrite/1.4.x
Update cl-1.4.x
2023-09-30 10:02:15 -04:00
Matej Bačo d9f2f1c37b Introduce execution sync timeout 2023-09-30 11:54:54 +02:00
Steven Nguyen 9d47237da9
Merge branch '1.4.x' into fix-skip-non-ascii-chars-image 2023-09-29 11:07:31 -07:00
Bradley Schofield 1136dc9e64 Add Test and don't stop on special char 2023-09-29 16:27:59 +01:00
Bradley Schofield 615d61d962 Merge branch '1.4.x' into fix-skip-non-ascii-chars-image 2023-09-29 09:21:17 +01:00
Christy Jacob a65c1c1ee5 chore: fix merge conflict 2023-09-28 22:22:44 +00:00
Christy Jacob ac844d33ef Merge branch '1.4.x' of https://github.com/appwrite/appwrite into cl-1.4.x 2023-09-27 23:25:48 +00:00
Christy Jacob 9fa93e0449 chore: review comments 2023-09-27 22:13:03 +00:00
Matej Bačo e58bf7f695 Rename audits back to logs 2023-09-27 21:24:56 +00:00
Matej Bačo 5120152369 Add all worker health endpoints 2023-09-27 21:24:41 +00:00
Christy Jacob 50600d6f2a
Merge pull request #6343 from appwrite/master
Merge master into 1.4.x
2023-09-27 17:20:32 -04:00
shimon dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge 86f0e6008c
Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Steven Nguyen 4a0c77a8df
Update avatar font and default colors 2023-09-25 15:55:15 -07:00
Christy Jacob 2273cb50b4 Merge branch '1.4.x' of github.com:appwrite/appwrite into cl-1.4.x 2023-09-26 00:02:19 +04:00
Matej Bačo c35f05f495 Increase max body size 2023-09-25 11:12:41 +02:00
Matej Bačo 725897c896 Rename audits back to logs 2023-09-24 14:36:20 +02:00
Matej Bačo 24204bce54 Add all worker health endpoints 2023-09-24 14:07:37 +02:00
Yatharth Verma 6b47999120 fix conflicts 2023-09-22 22:56:07 +05:30
Yatharth Verma f07f246f8d fix conflicts 2023-09-22 22:53:41 +05:30
Christy Jacob 9dde039adf
Merge pull request #6290 from appwrite/fix-deployment-delete
Fix deployment delete
2023-09-22 11:37:50 -04:00
Christy Jacob c7e6efc050 chore: update backups schedule 2023-09-21 10:23:55 +00:00
Steven Nguyen 9ca82b7662
Fix missing resourceInternalId on deployments 2023-09-20 19:26:23 -07:00
Matej Bačo 007d6953bf PR review changes 2023-09-19 09:21:11 +02:00
Jake Barnby 9ba609c46e
Merge pull request #6238 from appwrite/1.4.x
1.4.x
2023-09-15 18:49:55 -04:00
Christy Jacob 2ea8dbff29 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-bun-support 2023-09-14 15:21:31 +00:00
Prateek Banga 15dd6863dd removes comments 2023-09-14 01:07:30 +05:30
Prateek Banga f8c9c2f39b fixes manual internal id insertion 2023-09-14 00:48:50 +05:30
Matej Bačo 0690b00c30 Add Bun auto detection 2023-09-13 21:08:49 +02:00
Steven Nguyen 6b0c24a9d6
Update user creation from teams and users services to not set accessedAt
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
2023-09-12 12:05:11 -07:00
Binyamin Yawitz 5cb03da001 Extracting function event validator to its own class. 2023-09-11 23:24:11 -04:00
Matej Bačo 93e2a4fb8d Add v2 old vars support 2023-09-11 12:22:16 +02:00
Matej Bačo 418c8e3764 Fix redeploys 2023-09-07 11:33:42 +02:00
Christy Jacob 12b03f3fb0
Merge pull request #6162 from appwrite/fix-webhook-secret-validation
Fix webhook secret validation and executor path validation
2023-09-06 13:59:13 -04:00
Vincent (Wen Yu) Ge 3bc085ea3f
Update app/controllers/api/vcs.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-09-06 13:57:46 -04:00
Christy Jacob 4ea0541623
Merge pull request #6150 from appwrite/fix-global-vars
Fix: Global variables
2023-09-06 13:51:13 -04:00
Khushboo Verma 39a4447103 Update webhook secret check 2023-09-06 22:34:03 +05:30
Christy Jacob db763b180c
Merge pull request #6142 from appwrite/fix-v2-functions
Fix: v2 functions
2023-09-06 12:43:51 -04:00
Matej Bačo 6964477429 Increase labels maximum limit 2023-09-06 18:15:03 +02:00
Bradley Schofield 8e0e131824 Remove Special Chars from Initials 2023-09-06 09:54:59 +01:00
Khushboo Verma 0fbe9d6ce9 Revert allowing empty string in path 2023-09-06 13:46:01 +05:30
Matej Bačo 9060aa1ba7 Remove unnessessary cache clear 2023-09-06 09:53:02 +02:00
Khushboo Verma af4be4051f Skip validation if webhook secret is empty 2023-09-06 13:12:27 +05:30
Bradley Schofield 8357d20be7 Make URL optional for API and Serverside Requests 2023-09-05 19:13:47 +01:00
Matej Bačo 8e509efcec Add global env var test 2023-09-05 13:55:02 +02:00
Matej Bačo 79726dbfb6 Fix formatting 2023-09-05 13:16:20 +02:00
Matej Bačo 5538c47b3f Improve installation exception when missconfigured 2023-09-05 12:14:43 +02:00
Matej Bačo 1a6530fb57 Fix project variables 2023-09-05 10:21:36 +02:00
Matej Bačo 7588a9c4ec Make v2 functions work again 2023-09-04 19:53:25 +02:00
Christy Jacob 22745e0418
Merge pull request #6125 from appwrite/fix-functions-backwards-compatibility
Fix CLI backwards compatibility
2023-09-04 12:28:03 -04:00
Steven Nguyen 605ee2f7c5
Update create deployment default commands
Default to function commands only if commands weren't supplied.
2023-09-04 09:04:15 -07:00
Steven 62065a1c33 Fix create phone session abuse key
Create phone session doesn't have anything to do with email. The key
name should be email just for clarity (even though, technically, it
doesn't matter).
2023-09-03 21:37:02 +00:00
Steven Nguyen a609759951
Make runtime optional when updating a function
This is important for backwards compatibility since it wasn't possible
to update a function runtime in previous versions and it was never
included in the request.
2023-09-02 16:37:40 -07:00
Jake Barnby f47aa91ff1
Merge pull request #6109 from appwrite/fix-1.4-bugs
Fix events not triggering functions and path not a string bugs
2023-09-01 15:15:55 -04:00
Khushboo Verma 7013bc94a6 Fix events triggering functions and path not a string bugs 2023-09-01 21:15:53 +05:30
Steven Nguyen 9bc6011876
Fix fileSecurity check
Because of the `getAttributes()` call, `$fileSecurity` was always true
which lead to invalid permission check. This resulted in files being
deleted when a user had delete permissions on the file even though
they didn't on the bucket.
2023-08-31 20:28:13 -07:00
Jake Barnby fdb7218978
Update firebase connect scope 2023-08-30 22:48:51 -04:00
Jake Barnby 922332042e
Fix template strings 2023-08-30 20:31:11 -04:00
Christy Jacob 5dbec3d406 chore: remove redundant attribute 2023-08-30 18:43:09 -04:00
Christy Jacob 4e19c94d08 Merge branch '1.4.x' of github.com:appwrite/appwrite into fix-email-templates 2023-08-30 18:40:39 -04:00
Christy Jacob 21dc3b16b0 chore: update changelog 2023-08-30 18:36:40 -04:00
Christy Jacob 861921526e fix: remove redundant name property 2023-08-30 18:34:20 -04:00
Christy Jacob 74012158b3 fix: variable names 2023-08-30 17:54:26 -04:00
Christy Jacob 05615d1449 fix: missing variable in email templates 2023-08-30 17:52:55 -04:00
Christy Jacob 75e957ed4a fix: missing variable in email templates 2023-08-30 17:48:25 -04:00
Jake Barnby fc3ff188b1
Fix VCS + migrations scopes 2023-08-30 14:44:33 -04:00
Torsten Dittmann 3b2cb9b868
Merge pull request #6059 from appwrite/fix-smtp
Fix smtp
2023-08-30 16:09:10 +02:00
Torsten Dittmann e507fb6715 fix: hide services from server/client sdks 2023-08-30 13:28:43 +02:00
Torsten Dittmann 0427c2e4eb chore: generate 1.4.x specs 2023-08-30 11:19:55 +02:00
Eldad A. Fux 7835fa9bbc
Update app/controllers/api/proxy.php 2023-08-30 09:43:23 +03:00
Eldad A. Fux 75a9b2c1c5
Update app/controllers/api/console.php 2023-08-30 09:43:11 +03:00
Jake Barnby ff16fd7d9c
Check link after fetching page as well 2023-08-30 02:14:19 -04:00
Jake Barnby 085b50be8b
Check if host is public domain before requesting 2023-08-30 02:04:52 -04:00
Jake Barnby d3929a5bae
Fix forced username and password requirement 2023-08-30 01:31:02 -04:00
Jake Barnby 3d0ae4b9d9
Remove invites codes 2023-08-30 00:31:38 -04:00
Jake Barnby a1d0b67c6b
Fix SMTP 2023-08-30 00:30:44 -04:00
Jake Barnby 07f8e9411a
Apply suggestions from code review 2023-08-29 13:41:40 -04:00
Khushboo Verma 1293e7bc5f Optimised list repositories endpoint 2023-08-29 23:07:34 +05:30
Matej Bačo c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Matej Bačo d4acbcf4f0 Add domain_enabled var 2023-08-28 16:08:50 +02:00
Matej Bačo f130a9ebc9 linter fix 2023-08-28 14:21:35 +02:00
Matej Bačo 89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield 82f400d177 Add more HTML back 2023-08-28 09:03:55 +01:00
Bradley Schofield 88d48715c5 Run Linter 2023-08-28 06:53:26 +01:00
Bradley Schofield 11dca76a70 Update teams.php 2023-08-28 06:53:02 +01:00
Bradley Schofield 1be5f58fd9 Update account.php 2023-08-28 06:14:43 +01:00
Bradley Schofield ee0563c46f Cover other routes and cleanup code 2023-08-28 06:09:28 +01:00
Bradley Schofield 1f1e7dd397 Remove Testing Bypasses 2023-08-28 05:55:40 +01:00
Bradley Schofield 608b6b3847
Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Matej Bačo 293e44e91e Introduce SMTP ping timeout 2023-08-24 13:04:49 +02:00
Jake Barnby 55deaec8b2
Fix missing env 2023-08-23 17:53:24 -04:00
Matej Bačo 8802e318d5 Fix pools resource 2023-08-23 13:52:17 +02:00
Matej Bačo bdc9cb5bb5 QA changes 2023-08-23 10:29:01 +02:00
Matej Bačo 43b1c196e0 Merge branch 'feat-git-integration' into feat-git-integration-copy 2023-08-23 10:16:23 +02:00
Jake Barnby 3ec84986b2
Fix project imports 2023-08-22 22:04:36 -04:00
Jake Barnby 2286c7a4b7
Fix param order 2023-08-22 22:03:12 -04:00
Jake Barnby c99288229f
Add back missing route 2023-08-22 21:36:32 -04:00
Jake Barnby 537756551e
Fix missing accessedAt 2023-08-22 21:36:04 -04:00
Jake Barnby 339893f4f1
Fix param order 2023-08-22 21:35:27 -04:00
Jake Barnby 43ba14fb75
Fix console tests 2023-08-22 21:35:00 -04:00
Jake Barnby a84e669a1f
Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Jake Barnby efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
# Conflicts:
#	app/controllers/api/users.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
Vincent (Wen Yu) Ge 31b8c77b5c Fix typos, improve a few errors 2023-08-22 20:30:00 +00:00
Vincent (Wen Yu) Ge 07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00:00
Jake Barnby 87b72e4d0d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters 2023-08-22 16:01:19 -04:00
Jake Barnby 00dd77e930
Fix exception condition 2023-08-22 14:14:57 -04:00
Jake Barnby c3682362e9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby c929fe113e
Fix colliding ID overrides 2023-08-22 13:11:32 -04:00
Matej Bačo eea43e17bd Fix function request filter 2023-08-22 15:16:07 +02:00
Matej Bačo e345ef071a Allow custom deployment entrypoint 2023-08-22 11:47:10 +02:00
Matej Bačo 7c1a387a37 Improve commands quality 2023-08-22 10:16:17 +02:00
Jake Barnby b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Vincent (Wen Yu) Ge caf6bcae95 Remove mention of environment variables in docs 2023-08-22 04:16:41 +00:00
Jake Barnby 6c67172fd7
Fix missing ID 2023-08-21 23:45:32 -04:00
Jake Barnby 942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
Eldad A. Fux 8e46bdf7cb
Merge branch 'feat-git-integration' into feat-usage-rollback 2023-08-21 22:46:09 +03:00
Matej Bačo fedac9592b Fix id null schedule bug 2023-08-21 19:43:03 +02:00
Matej Bačo 7c184498bb Fix GitHub app auth and migrations 2023-08-21 15:16:02 +02:00
Bradley Schofield b7d053f60d
Update migrations.php 2023-08-21 13:42:02 +01:00
Khushboo Verma d5968f3f2a Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-21 17:03:40 +05:30
shimon 1969ea9d16 rolling back usage flow 2023-08-21 13:50:45 +03:00
shimon 722a7ce8c9 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback 2023-08-21 13:50:34 +03:00
Bradley Schofield 9d88017e1f
Add Download Deployment Function 2023-08-21 11:21:18 +01:00
shimon 7ba42b0d6c rolling back usage flow 2023-08-21 11:53:00 +03:00
shimon 3cca907465 rolling back usage flow 2023-08-21 11:10:23 +03:00
shimon 99a43dec8c rolling back usage flow 2023-08-21 10:34:34 +03:00
shimon f261ef8b70 rolling back usage flow 2023-08-21 10:31:12 +03:00
shimon e86286e7e3 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
 Conflicts:
	composer.lock
2023-08-20 18:07:57 +03:00
shimon 83ffea68d1 rolling back usage flow 2023-08-20 16:53:26 +03:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Khushboo Verma e83f0f7b56 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-20 15:13:13 +05:30
Khushboo Verma afbadf9322 Add search attribute to redeploy endpoint 2023-08-20 15:13:05 +05:30
Matej Bačo 60d24e0072 Downgrade assistant 2023-08-20 11:42:17 +02:00
Matej Bačo 20a2d3755e Add vars for Console 2023-08-20 10:10:42 +02:00
Matej Bačo efe3793679 PR review changes, fix node test 2023-08-19 20:26:47 +02:00
Khushboo Verma 78a224be14 Fix deployment creation on branch creation 2023-08-19 18:24:43 +05:30
Khushboo Verma 3305e300b1 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-19 18:21:40 +05:30
Khushboo Verma 1284449765 Fixed GitHub comments 2023-08-19 18:21:27 +05:30
Matej Bačo 5de7c24ee8 Fix more function tests 2023-08-19 13:37:45 +02:00
Jake Barnby 9b2226b243
Fix manual and VCS redeploys 2023-08-19 02:15:47 -04:00
Jake Barnby 1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks 2023-08-18 13:25:21 -04:00
Jake Barnby a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# 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
#	composer.json
#	composer.lock
2023-08-18 13:23:35 -04:00
Bradley Schofield 0ebd6d43d5
Merge branch 'feat-git-integration' into feat-git-integration-migrations 2023-08-18 11:18:58 +01:00
Khushboo Verma c1b7b6cd0d Update limits 2023-08-18 12:44:13 +05:30
Khushboo Verma 76c3eb5c65 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-18 12:26:11 +05:30
Khushboo Verma 00f6785818 Addressed PR comments 2023-08-18 12:25:44 +05:30
Jake Barnby a3895b041a
Apply suggestions from code review 2023-08-17 21:48:21 -04:00
Jake Barnby a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# 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
2023-08-17 19:54:25 -04:00
Jake Barnby a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# 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
#	composer.lock
2023-08-17 19:51:36 -04:00
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
Jake Barnby 3c3326260a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	composer.lock
2023-08-17 17:39:26 -04:00
Jake Barnby 07c985ebc3
Fix missing params from redeploy event 2023-08-17 17:37:52 -04:00
Bradley Schofield e8056834aa
Run Formatter 2023-08-17 15:55:28 +01:00
Bradley Schofield 6577fc17a9
Remove ./vendor import and add missing envvars 2023-08-17 15:54:19 +01:00
Khushboo Verma 4285d99f08 Added exception for repo creation + small fixes 2023-08-17 19:24:57 +05:30
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 414d85be8e
Update mode checks 2023-08-16 17:58:25 -04:00
Jake Barnby b6ffb385a7
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-16 15:55:19 -04:00
Bradley Schofield 47b10fa82b
Implement IAM Custom Roles 2023-08-16 18:17:20 +01:00
Bradley Schofield a0cd65b94b
Fix Migrations Stability 2023-08-16 16:01:56 +01:00
Matej Bačo 3a6f10fa62 Fix failing tests 2023-08-16 08:19:42 +02:00
Jake Barnby 8820d422be
Update app/controllers/api/databases.php 2023-08-14 20:45:05 -04:00
Jake Barnby 4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param 2023-08-14 19:37:37 -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
Damodar Lohani 9d15f70db5 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2 2023-08-13 00:45:11 +00:00
Matej Bačo ec82fec59f Re-enable assistant 2023-08-12 21:08:44 +02:00
Matej Bačo c24e2786fb Even more PR review changes 2023-08-11 18:52:13 +02:00
Matej Bačo f0125ac3bb PR review changes 2023-08-11 18:44:05 +02:00
Matej Bačo 897d299ae6 PR review changes, fixes from QA 2023-08-11 15:34:57 +02:00
prateek banga 971ebbc686 fix test cases 2023-08-11 16:17:31 +05:30
Matej Bačo 1bd96228bf Fix file responses from router 2023-08-11 11:19:05 +02:00
Matej Bačo 5032fd7d08 Fix AI endpoints 2023-08-11 09:52:08 +02:00
Jake Barnby 16cb495a41
Lint 2023-08-10 21:31:31 -04:00
Jake Barnby 6cd0e328d9
Review fixes 2023-08-10 16:44:38 -04:00
Bishwajeet Parhi d0755a587f Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-10 22:31:53 +05:30
Khushboo Verma dfd686436a Fix fetch commit details condition 2023-08-10 17:52:10 +05:30
prateek banga 8cefc54ca3 merge resolve conflicts 2023-08-10 17:22:15 +05:30
Matej Bačo 2a94dacdd1 Fix deployment issues from QA server 2023-08-10 02:31:49 +02:00
Matej Bačo b9c52d8583 QA after merge fix 2023-08-10 01:44:00 +02:00
Matej Bačo 899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02:00
Matej Bačo 75e66e675b Move oauth secret to identity 2023-08-10 01:02:13 +02:00
Bradley Schofield d001f14249
Add Service Account Role Assignment 2023-08-09 23:46:23 +01:00
Matej Bačo 3ed4a65828 Fix VCS after lib upgrade 2023-08-09 23:00:04 +02:00
Matej Bačo a2a50d066b More deployment changes 2023-08-09 20:00:25 +02:00
Khushboo Verma ced6eed6fa Add urls in deployment details 2023-08-09 23:05:23 +05:30
Bradley Schofield fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-09 18:08:40 +01:00
Bradley Schofield 0d58d20635
Update Migration Lib 2023-08-09 18:08:10 +01:00
Steven Nguyen 09254aeae0
Add description for the delete account identity's identityId param 2023-08-09 09:25:29 -07:00
Steven Nguyen 5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-09 09:01:29 -07:00
Khushboo Verma a63a668601 Add additional deployment info 2023-08-09 21:23:58 +05:30
Bradley Schofield 1135060681
Start work on identities implementation 2023-08-09 16:18:17 +01:00
Christy Jacob 7d60e4272d Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations 2023-08-09 13:59:44 +00:00
Khushboo Verma e267349a88 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-09 16:33:49 +05:30
Khushboo Verma 056b7120a6 Add additional information to deployments 2023-08-09 16:24:46 +05:30
Matej Bačo 9d0eda68d6 Upgrade after conflict 2023-08-09 12:35:04 +02:00
Matej Bačo 93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
Matej Bačo a60b54f434 Use identities table 2023-08-09 11:52:34 +02:00
Khushboo Verma c6cdc0c37c Fix broken functions flow 2023-08-09 13:16:17 +05:30
Eldad A. Fux 6ce3045f89
Merge pull request #5921 from appwrite/feat-user-identities-git-integration
Separate OAuth2 info from Sessions into Identities
2023-08-09 10:18:43 +03:00
Jake Barnby d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
prateek banga 4d03610755 resolve merge conflicts 2023-08-09 03:23:45 +05:30
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
Jake Barnby b196914638
Fix console/API key checks 2023-08-08 15:46:01 -04:00
Bradley Schofield 47ebf77ff0 Continue work on OAuth Firebase last stage 2023-08-08 20:28:38 +01:00
prateek banga 51ceb5d74a prohibit select queries in list attributes and remove static method 2023-08-09 00:12:53 +05:30
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
Steven Nguyen f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07:00
Bradley Schofield f0477a7f2b Move collections and update redirect sig 2023-08-08 14:36:44 +01:00
Matej Bačo 26aa37ccf0 Linter fix 2023-08-08 11:46:43 +02:00
Matej Bačo 2b96fb6c6f Allow editing runtime 2023-08-08 11:28:25 +02:00
Bishwajeet Parhi b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
Bishwajeet Parhi 2f3e14932a fix: Tests 2023-08-08 11:34:02 +05:30
Bishwajeet Parhi c3ebdc46e2 Merge branch 'master' into feat-add-encrypt-param 2023-08-08 11:04:28 +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
Steven Nguyen 073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration 2023-08-07 14:46:00 -07:00
prateek banga 52e800cc59 refactor according to review feedback 2023-08-08 02:56:20 +05:30
Khushboo Verma d19769415f Throw exception from createRepo 2023-08-07 21:09:51 +05:30
Matej Bačo 11068696c9 QA changes 2023-08-07 17:37:36 +02:00
Bradley Schofield 91c82f0d7d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-07 16:09:28 +01:00
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 90e89aa02e
Merge pull request #5934 from appwrite/feat-appwrite-assistant
Feat appwrite assistant
2023-08-07 17:56:22 +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
Bradley Schofield f27345fb92 Update SDK 2023-08-07 11:56:42 +01:00
Damodar Lohani a6109a0341 Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2 2023-08-07 08:42:04 +00:00
Matej Bačo d5fd3a28f9 More QA fixes 2023-08-06 15:11:30 +02:00
Matej Bačo 345df3f2ca More QA fixes 2023-08-06 12:30:38 +02:00
Matej Bačo e60456cfda QA after merge with 1.4 2023-08-06 10:51:53 +02:00
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Matej Bačo eb63ec9b10 Support failure url on vcs 2023-08-05 20:53:42 +02:00
Matej Bačo 8a9f3f1b54 Update build to use 1 logs attribute 2023-08-05 16:50:28 +02: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
Steven Nguyen d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen cb7abdb906
Remove identity status
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-04 15:07:36 -07:00
Steven Nguyen bcd44432d1
Don't set password when oauth2 creates a user
Setting a password can cause problems with other APIs that expect the
password to be null. In addition, it doesn't match the implementation
for the other APIs that create a user without a password (Create Magic
URL Session, Create Phone Session, Create Anonymous Session, etc).
2023-08-04 15:07:36 -07:00
Steven Nguyen 27e212553d
Separate OAuth2 info from Sessions into Identities
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-04 15:07:36 -07:00
Steven Nguyen aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Bradley Schofield 8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
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