Commit graph

534 commits

Author SHA1 Message Date
Damodar Lohani
c555a707e6 Merge remote-tracking branch 'origin/1.7.x' into feat-file-tokens 2024-11-17 06:00:03 +00:00
Jake Barnby
8bc37026cd
Revert "Feat adding coroutines" 2024-10-08 20:54:40 +13:00
Binyamin Yawitz
2703ca1106
chore: merge 2024-10-01 11:44:01 -04:00
Binyamin Yawitz
d14edf4207
reverting: to set coroutines as head 2024-10-01 10:30:47 -04:00
Damodar Lohani
e9a5299547 Merge remote-tracking branch 'origin/1.6.x' into feat-console-roles-dl 2024-09-29 02:01:42 +00:00
Damodar Lohani
abe145dae2 fix formatting 2024-09-24 02:40:01 +00:00
Damodar Lohani
f2eb1c3b3e
Update api.php 2024-09-24 07:04:05 +05:45
Bradley Schofield
a309f31a33 Add tests, move hooks to API Layer 2024-09-23 18:08:48 +09:00
Damodar Lohani
c31e928def fix linter 2024-09-22 02:44:53 +00:00
Damodar Lohani
985a31ca04
Merge branch '1.6.x' into feat-console-roles-dl 2024-09-22 08:26:14 +05:45
Binyamin Yawitz
5512340cdd
Revert "Feat eldad4 coroutines" 2024-09-20 12:30:05 -04:00
Binyamin Yawitz
48d4d873de
Merge branch '1.6.x' into feat-eldad4-coroutines 2024-09-19 13:50:27 -04:00
Bradley Schofield
82687c8ca4 Merge branch 'main' into 1.5.x-db-storage-metrics
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-latest-console.json
#	app/controllers/api/project.php
#	src/Appwrite/Utopia/Response/Model/UsageProject.php
#	tests/e2e/General/UsageTest.php
2024-09-19 15:37:27 +09:00
Steven Nguyen
b8fbbf3710
Merge branch 'main' into chore-sync-main-into-1.6.x 2024-09-18 16:43:05 +00:00
Damodar Lohani
e1238d0fe9
Merge branch '1.6.x' into feat-console-roles-dl 2024-09-17 14:52:29 +05:45
Damodar Lohani
59760bf529
Update api.php 2024-09-05 08:28:47 +05:45
Jake Barnby
c58fa78962
Remove tenant in filter 2024-09-05 14:25:11 +12:00
Damodar Lohani
42b85fad54
remove dumps 2024-09-05 07:12:59 +05:45
Damodar Lohani
7c1c025f9e remove console roles test 2024-09-04 23:35:31 +00:00
Binyamin Yawitz
feb775d2c4
chore: merge, lint, stan 2024-09-04 14:52:01 -04:00
Damodar Lohani
555f3f9406
Update api.php 2024-09-04 12:29:56 +05:45
Damodar Lohani
a89cf443aa
Update api.php 2024-09-04 12:28:52 +05:45
Damodar Lohani
269efbe2f0
Update api.php 2024-09-04 12:25:51 +05:45
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
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
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
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