Commit Graph

917 Commits

Author SHA1 Message Date
Damodar Lohani 107fc1d069 fix check 2024-09-04 02:45:05 +00:00
Damodar Lohani 1752c6be44 fix team resource 2024-09-04 02:40:53 +00:00
Damodar Lohani 1f83dab9e1 fix roles for /projects/:projectId endpoints 2024-09-04 02:16:18 +00:00
Damodar Lohani bc5ac28b84 update validator and formatting 2024-09-04 02:01:56 +00:00
Binyamin Yawitz 7d6eac4ddb Merge branch '1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/http.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Migration/Migration.php
#	src/Appwrite/Platform/Tasks/Migrate.php
#	src/Appwrite/Platform/Tasks/ScheduleExecutions.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	src/Appwrite/Utopia/Response.php
2024-09-03 19:06:48 -04:00
Damodar Lohani 7aacaad94d remove dump 2024-09-03 02:07:41 +00:00
Damodar Lohani 550a479532 Merge remote-tracking branch 'origin/1.6.x' into feat-console-roles-dl 2024-09-03 02:05:43 +00:00
Binyamin Yawitz 5cdb8388a1 chore: versions update 2024-08-23 13:02:54 -04:00
Damodar Lohani 2491f5c70c fix scope merging 2024-08-21 05:51:37 +00:00
Damodar Lohani cd70d74233 remove per project roles 2024-08-21 05:45:19 +00:00
Jake Barnby d2c7be19d0 Update database stack 2024-08-21 17:31:13 +12:00
Matej Bačo d5db9253cd Fix breaking changes in lib 2024-08-16 11:25:01 +00:00
Christy Jacob bfa253297b Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.6-main 2024-08-13 15:36:13 +00:00
Damodar Lohani b06cffac45 trigger functions event only if event is not paused 2024-08-13 14:37:06 +05:45
Damodar Lohani 0a2eee0118 detailed error logs if development key is provided 2024-08-12 05:44:52 +00:00
Damodar Lohani 61c5848be4 refactor development keys 2024-08-12 05:34:25 +00:00
Binyamin Yawitz 9ed43ebbc2 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/controllers/api/functions.php
#	app/controllers/general.php
#	app/init.php
#	composer.lock
#	dev/xdebug.ini
#	src/Appwrite/Utopia/Response.php
2024-08-06 14:57:05 -04:00
Damodar Lohani ca0c38b3c0 subquery for development keys 2024-07-29 10:12:50 +00:00
Damodar Lohani fe26c82dc1 Merge remote-tracking branch 'origin/1.6.x' into feat-development-keys 2024-07-29 09:32:58 +00:00
Christy Jacob c167201d7c feat: add role override for admins 2024-07-24 02:47:46 +04:00
Christy Jacob eea5d610ba feat: linter 2024-07-23 23:54:52 +04:00
Christy Jacob 3b7ce7691e feat: add support for console role 2024-07-23 23:49:11 +04:00
Bradley Schofield 4b585466e1 Update api.php 2024-07-22 20:03:45 +09:00
Binyamin Yawitz 916f58cd9d fixes: Logger and Abuse timelimit 2024-07-19 14:19:30 -04:00
Christy Jacob 1bbce77c92 chore: poc for new roles 2024-07-18 01:18:15 +04:00
Binyamin Yawitz b245aab9d8 fix: Adjusting to coroutine 2024-07-17 15:59:25 -04:00
Binyamin Yawitz 19119b573d chore: Merge and lint 2024-07-17 15:06:06 -04:00
Binyamin Yawitz 927dbc7e11 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/console
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/users.php
#	app/controllers/api/vcs.php
#	app/controllers/general.php
#	app/controllers/mock.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/Doctor.php
#	src/Appwrite/Platform/Tasks/ScheduleMessages.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Utopia/Response.php
2024-07-17 14:31:13 -04:00
Damodar Lohani 681e382459 Merge remote-tracking branch 'origin/1.6.x' into feat-development-keys 2024-07-16 08:34:38 +00:00
Damodar Lohani 760c552ffb support for api test keys 2024-07-16 08:28:22 +00:00
Bradley Schofield 29541617de Start implementing database metrics in usage dump worker 2024-07-16 13:14:55 +09:00
Damodar Lohani 7ed877d96a fix typo 2024-07-15 04:53:27 +00:00
Damodar Lohani f4a4ec1def Merge branch '1.6.x' into feat-project-accessed-at 2024-07-10 13:01:00 +05:45
Damodar Lohani cfb00bf271 fix typo 2024-07-08 01:03:52 +00:00
Damodar Lohani bfebf79630 update project accessedAt once every 24 hours 2024-07-08 01:02:58 +00:00
Binyamin Yawitz 664c3ad466 chore: Cleanup 2024-07-04 15:04:20 -04:00
Christy Jacob fdf44c7bab Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-20 15:26:17 +00:00
Damodar Lohani 74a293d425 Merge branch 'main' into feat-file-tokens 2024-06-20 15:43:38 +05:45
shimon 4bedb2f52a Update Expires header via cache shared api 2024-06-13 09:40:36 +03:00
shimon 3f42b03f8e Update Expires header via cache shared api 2024-06-13 09:40:03 +03:00
shimon d2a2caedbd Update Expires header via cache shared api 2024-06-12 18:42:04 +03:00
Binyamin Yawitz b5a241db8d merge: Main into Coroutines 2024-06-05 18:38:39 -04:00
Binyamin Yawitz 07582ecc5f fix: Changing auth function to instance 2024-06-05 13:38:02 -04:00
Matej Bačo 49b2bcf462 Implement JWT dynamic keys test 2024-05-29 09:33:39 +00:00
Jake Barnby 074b807d8d Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud 2024-05-24 16:56:57 +12:00
Steven Nguyen 9db92698dc fix(cache): use the same cache key when loading and saving files 2024-05-22 23:23:16 +00:00
Steven Nguyen 8d5583f0c6 fix(cache): fix invalid cache document id
The document ID should not have special characters like "*" or it will
cause problems with things like cursor based pagination which is done
in migrations.

We did have the cache buster inside the md5 call before, but when the
usage code was reverted and whatnot, the change wasn't added back
properly.

Related: https://github.com/appwrite/appwrite/issues/7887
2024-05-22 19:16:34 +00: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 2e1f67245d Fix bugs, add old api key test 2024-05-16 08:39:15 +00:00
Matej Bačo 37176e7865 Backwards compatible approach 2024-05-14 12:33:49 +00:00