CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-01 12:40:34 +12:00
Code Issues Projects Releases Wiki Activity
21532 commits 207 branches 384 tags 327 MiB
Commit graph

881 commits

Author SHA1 Message Date
Jake Barnby baf807d389
Merge remote-tracking branch 'origin/1.5.x' into json-parsing 
# Conflicts:
#	composer.lock
 2024-01-09 14:08:39 +13:00
shimon 472712dbb7 update utopia-framework version 2024-01-08 19:30:27 +02:00
shimon deb189f44b sync with main 
and bump utopia-cache lib version
 2024-01-08 19:16:47 +02:00
Torsten Dittmann 9ba2eafa83
fix: escape html in email params (#7409) 
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
 2024-01-08 18:08:17 +01:00
Torsten Dittmann 208abe17e7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-08 12:20:08 +01:00
Bradley Schofield 01d76a1746 Add Queue Retry Command to Appwrite 2024-01-04 13:00:25 +00:00
Khushboo Verma 431e26c153 Allow certain domains to skip validation 2024-01-04 16:37:15 +05:30
shimon 99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
 2024-01-02 11:49:23 +02:00
Khushboo Verma d418a581b7 Allow only public domains in webhook url 2023-12-28 15:16:08 +05:30
Jake Barnby 8fc3f99a8e
Update messaging lib 2023-12-15 19:55:50 +13:00
Jake Barnby 121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing 
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/Hamster.php
 2023-12-15 18:22:08 +13:00
Jake Barnby 7b99fab512
Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby 2eace5a627
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic 
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
 2023-12-15 02:47:59 +13:00
fogelito 57624ac65e composer updated 2023-12-14 14:42:38 +02:00
Christy Jacob f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
fogelito 21b6b199a9 composer parsing-nested 2023-12-06 14:56:31 +01:00
Prateek Banga e7dca6b2d5 adds uniform logic for worker and extra params for email 2023-12-05 15:01:32 +01:00
shimon c313e8347f Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	composer.lock
 2023-11-30 10:21:59 +02:00
shimon 5daae1db14 tests fix 2023-11-30 10:20:14 +02:00
shimon 21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
 2023-11-26 10:28:17 +02:00
Jake Barnby 6ad4566b6b
Update CLI 2023-11-21 00:15:50 +13:00
Jake Barnby 535db05b9b
Merge remote-tracking branch 'origin/main' into feat-php-8-1 
# Conflicts:
#	app/console
#	composer.lock
 2023-11-14 14:06:43 +13:00
Jake Barnby 17919ecfbe
Update database 2023-11-10 12:11:21 +13:00
shimon f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
 2023-11-05 17:03:13 +02:00
Eldad Fux d91f961c90 Fixed errors 2023-11-01 23:09:04 -04:00
Jake Barnby 3652ab61d8
Revert "Enum tests" 
This reverts commit 74450b1178.
 2023-11-01 21:02:42 +13:00
Jake Barnby 74450b1178
Enum tests 2023-11-01 18:29:54 +13:00
Christy Jacob 21220a2051
Merge pull request #6894 from appwrite/refactor-vcs-tests 
Add VCS tests
 2023-10-27 19:04:44 +04:00
Khushboo Verma 36fcc6c293 Resolve merge conflicts 2023-10-27 18:13:50 +05:30
shimon a42577b1aa composer json 2023-10-25 17:14:10 +03:00
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Jake Barnby 5732171a2a
Merge remote-tracking branch 'origin/1.4.x' into feat-query-metadata 
# Conflicts:
#	app/init.php
#	composer.json
#	composer.lock
 2023-10-25 18:21:16 +13:00
Jake Barnby 8db372a7d3
Update dependencies 2023-10-25 13:55:32 +13:00
Khushboo Verma 2cf8639b68 Resolve merge conflicts 2023-10-23 15:06:01 +05:30
Jake Barnby 9cb2e834a6
Update db 2023-10-19 20:41:06 +13:00
Jake Barnby db3fa21468
Update database 2023-10-19 14:26:44 +13:00
Christy Jacob be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
shimon b42a9e94e2 some fixes 2023-10-17 18:12:24 +03:00
Jake Barnby 62ce68f1b5
Update packages 2023-10-17 16:48:26 +13:00
shimon 9a6d88a819 addressing some comments 2023-10-17 06:44:36 +03:00
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Khushboo Verma 66ec7f2e1d VCS tests 2023-10-13 18:50:58 +05:30
Jake Barnby 1ac3372239
Set queue name per worker 2023-10-12 17:55:30 +13:00
shimon 2cd4514086 sync with main 2023-10-11 16:03:15 +03:00
shimon 002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
shimon 24e09d3d8e queueForBuilds fix via functions controller 2023-10-09 13:16:05 +03:00
shimon 948f36a023 sync with 1.4 2023-10-05 16:15:39 +03:00
shimon a643a8c907 sync with 1.4 2023-10-04 13:43:21 +03:00
shimon 6d60b0bd8c sync with 1.4 2023-10-03 11:40:34 +03: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
Matej Bačo 1669ead4e0 Transfer for Git deploys to prevent memory issues 2023-09-18 13:55:32 +02:00
Jake Barnby 316cd4f8f8
Bump CLI, Swift, Apple SDK versions 2023-09-14 15:11:40 -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 f8c9c2f39b fixes manual internal id insertion 2023-09-14 00:48:50 +05:30
Matej Bačo 408bef06e8 Upgrade VCS lib 2023-09-13 21:08:12 +02:00
Matej Bačo 8728171728 Add Bun support 2023-09-13 19:29:58 +02:00
Christy Jacob 3d267bb4d9 chore: remove leftovers 2023-09-07 17:38:29 -04:00
Christy Jacob 1e3639bf6d Merge branch 'master' of github.com:appwrite/appwrite into chore-update-sdks 2023-09-07 17:18:42 -04:00
Christy Jacob a1aa51aa2f chore: downgrade database versiong 2023-09-06 21:14:03 +00:00
Christy Jacob bf4444b045 chore: update sdks for apwrite 1.4.1 2023-08-31 18:08:24 -04:00
Jake Barnby ebf942339a
Update migrations version 2023-08-31 00:14:34 -04:00
Christy Jacob 0a162f9c92 chore: add update framework version 2023-08-30 12:19:18 -04:00
Khushboo Verma 1293e7bc5f Optimised list repositories endpoint 2023-08-29 23:07:34 +05:30
Matej Bačo 1f82228914 Upgrade lib versions (db mainly) 2023-08-29 13:23:42 +02:00
Matej Bačo 5dc681377e Temporarly remove clone fix 2023-08-27 14:01:31 +02:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02: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
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
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
Khushboo Verma c016ad7415 Added commitHash to git clone command 2023-08-21 17:03:07 +05:30
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Matej Bačo 46c7010908 Uprade dependencies 2023-08-20 11:04:42 +02: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 00f6785818 Addressed PR comments 2023-08-18 12:25:44 +05:30
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
Bradley Schofield 616e61339c
Update composer.json 2023-08-16 18:34:22 +01:00
Bradley Schofield 47b10fa82b
Implement IAM Custom Roles 2023-08-16 18:17:20 +01:00
Damodar Lohani 7795933000 composer conflict fix 2023-08-13 00:46:23 +00:00
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 c6684ee7f8 PR review changes 2023-08-11 16:45:36 +02:00
Jake Barnby a8897e6b6f
Update libs 2023-08-10 21:33:40 -04: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 6abe8a5792 Upgrade vcs version 2023-08-09 22:55:54 +02:00
prateek banga 185d09d764 adds more queries in tests, upgrade db library 2023-08-10 00:11:18 +05:30
Bradley Schofield 0d58d20635
Update Migration Lib 2023-08-09 18:08:10 +01:00
Bradley Schofield 1135060681
Start work on identities implementation 2023-08-09 16:18:17 +01: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
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
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
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 2bbdbaebd3 Upgrade SDKs 2023-08-06 21:14:25 +02:00
Matej Bačo 3b15dccc84 More QA fixes 2023-08-06 15:42:18 +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
Steven Nguyen d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -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
prateek banga f797c2574a resolve merge conflicts with 1.4.x 2023-08-03 17:38:22 +05:30
prateek banga 1d558fa5f5 Add select queries support to list indexes and list attributes endpoint 2023-08-03 17:34:28 +05:30
Damodar Lohani 3bdd23091a update framework 2023-07-30 08:23:47 +00:00
Matej Bačo 74bafb9379 Fix RAM issues on runtime 2023-07-26 17:09:56 +02:00
Damodar Lohani 844c60f35a upgrade base image and utopia-swoole 2023-07-26 07:23:25 +00:00
Damodar Lohani bd428fc436 update composer versions 2023-07-25 09:37:05 +00:00
Damodar Lohani 8f25c5bff1 upgrade swoole ide helper 2023-07-25 09:04:11 +00:00
Damodar Lohani a8b3367d50 upgrade utopia-swoole version 2023-07-25 06:05:22 +00:00
Matej Bačo e5adc5772c Add support for all runtime start commands 2023-07-24 08:23:23 +02:00
Damodar Lohani eea593f677 upgrade dependencies 2023-07-23 06:46:23 +00:00
Steven Nguyen 2befa60350
Track a user's last activity 
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.

To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
 2023-07-19 22:22:58 -07:00
Steven Nguyen fcd1be6726
Bump audit version to get rid of userInternalId attribute 2023-07-12 10:06:12 -07:00
shimon d1d1392bb3 small adjustments 2023-07-12 11:12:56 +03:00
Damodar Lohani f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
Torsten Dittmann 1f46d03e8c feat: initial mfa implementation 2023-06-22 15:35:49 +02:00
Jake Barnby c4fc5c90f0
Update dependencies 2023-06-15 12:59:19 +12:00
Jake Barnby 031f8270ff
Merge remote-tracking branch 'origin/1.4.x' into validator-mv 
# Conflicts:
#	composer.lock
 2023-06-15 12:28:32 +12:00
Jake Barnby dd2bda0d98
Downgrade to framework patch 2023-05-30 19:52:06 +12:00
Jake Barnby 95f299779d
Update platform 2023-05-30 19:23:03 +12:00
Jake Barnby b75d3ff07c
Update to release version of framework 
(cherry picked from commit b101404eda)
 2023-05-30 19:01:53 +12:00
Jake Barnby 91c5e066ec
Update framework to fix route mismatches 
(cherry picked from commit d42f6738a9)

# Conflicts:
#	composer.lock
(cherry picked from commit c2e711b021)

# Conflicts:
#	composer.json
#	composer.lock
 2023-05-30 19:00:42 +12:00
shimon f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
shimon 5960d28428 downgraded csv writer ver 2023-05-24 20:45:40 +03:00
shimon 3545e0740f downgraded csv writer ver 2023-05-23 21:02:23 +03:00
shimon e79cb913ed calculating users per project task 2023-05-23 18:58:49 +03:00
Matej Bačo c09c8b4d25 Fix wildcard issue with OPTIONS & CORS 2023-05-22 21:27:14 +02:00
Matej Bačo 612af6edf0 Update dependencies, fix bugs 2023-05-22 13:29:35 +02:00
Matej Bačo 6e515e3cc4 Copy Khushboo's integration from feat-peach-q1-kh 2023-05-22 12:58:13 +02:00
Jake Barnby b9336bfc73
Update SDK generator 2023-05-15 19:15:01 +12:00
Matej Bačo c63505078d Fix bugs with new versions of utopia 2023-05-13 12:08:02 +02:00
Matej Bačo e571b78cff Post-merge fix 2023-05-11 22:04:09 +02:00
Matej Bačo 998c2749cb Merge branch 'feat-db-pools-master' into feat-executor-v3 2023-05-11 21:59:49 +02:00
fogelito c51d4b386b Merge branch 'master' of github.com:appwrite/appwrite into validator-mv 
 Conflicts:
	composer.json
	composer.lock
 2023-05-03 14:56:03 +03:00
fogelito cf7e6831c7 revert audit tags 2023-05-02 19:25:19 +03:00
fogelito bfd757e0fb audit chnage 2023-05-01 18:34:38 +03:00
Steven Nguyen 11d523b050
Bump utopia abuse, audit, and database 2023-04-27 10:42:55 -07:00
fogelito 9dcf4c0984 validations changes 2023-04-25 14:35:49 +03:00
Steven Nguyen 471c832a4f
Bump utopia-php/database version 2023-04-19 17:21:41 -07:00
Jake Barnby 9b7d032eda
Update SDK generator for 1.3.x support 2023-04-12 00:58:12 +12:00
Jake Barnby 9604cd1d94
Update to tagged release 2023-04-11 17:41:21 +12:00
Jake Barnby f00bd7dac7
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2 
# Conflicts:
#	composer.lock
 2023-04-11 17:25:26 +12:00
Jake Barnby 7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships 
# Conflicts:
#	composer.lock
 2023-04-11 15:57:35 +12:00
Jake Barnby af890a4e4b
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2 
# Conflicts:
#	composer.lock
 2023-04-03 15:55:17 +12:00
Jake Barnby 9010320cd9
Update abuse 2023-03-31 20:57:47 +13:00
Damodar Lohani 41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
Jake Barnby 9468c238de
Remove conflicts 2023-03-30 13:01:58 +13:00
Jake Barnby c09ab6cc9d
Remove duplicate dependency 2023-03-29 14:42:19 +13:00
Jake Barnby daa5c7e59f
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2 
# Conflicts:
#	composer.json
#	composer.lock
 2023-03-24 23:50:26 +13:00