Commit graph

817 commits

Author SHA1 Message Date
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
Torsten Dittmann
c5dae9f018 fix: backwards compatibility 2024-09-16 13:49:13 +02:00
Torsten Dittmann
8ac2f64353 fix: function storage metrics 2024-09-16 11:58:08 +02:00
Jake Barnby
c58fa78962
Remove tenant in filter 2024-09-05 14:25:11 +12:00
Bradley Schofield
a02a092faf Merge branch '1.6.x' into feat-1.5.x-impl-deployment-storage-projects-usage
# Conflicts:
#	app/controllers/api/project.php
#	src/Appwrite/Utopia/Response/Model/UsageProject.php
2024-08-27 15:49:21 +09:00
Matej Bačo
695844faa1 Merge remote-tracking branch 'origin/1.6.x' into feat-separate-function-sizes 2024-08-21 07:17:46 +00:00
Bradley Schofield
6d230e7c03
Update src/Appwrite/Utopia/Response/Model/Specification.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-08-20 18:35:55 +09:00
Bradley Schofield
dc149761d8 Address Jake's Comments 2024-08-20 13:23:11 +09:00
Matej Bačo
12b6351060 Separate deployment and build sizes 2024-08-19 11:06:58 +00:00
Bradley Schofield
4128d4f221 Merge 1.6.x into feat-runtime-controls 2024-08-16 04:39:21 +00:00
Bradley Schofield
5285ef9939 Merge remote-tracking branch 'origin/1.6.x' into feat-runtime-controls-1.5.x 2024-08-14 19:36:15 +09:00
Matej Bačo
9964631bb7 Apply new terminology for template branch 2024-08-14 10:01:04 +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
loks0n
f6dec62c50 feat: add base/key runtime 2024-08-09 12:56:55 +01:00
Khushboo Verma
caa234f140 Add scopes to function template 2024-08-08 19:15:00 +05:30
Bradley Schofield
948fbc0916
Update src/Appwrite/Utopia/Response/Model/Func.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-08-08 11:27:49 +09:00
Khushboo Verma
5eacde84ae Add value to variables template 2024-08-07 00:01:54 +05:30
Bradley Schofield
e51f912ab1 Address Jake's comments and add 0.5 cpu spec 2024-08-06 18:54:46 +09:00
Bradley Schofield
facb1ad174 Cleanup leftovers and use hook for determining billing stuff 2024-08-01 15:30:24 +09:00
Bradley Schofield
2060d3f09c Rename everything to use specification instead of size 2024-07-31 20:27:32 +09:00
Bradley Schofield
198a7973c7 Implement Eldad's Suggestions 2024-07-31 15:21:07 +09:00
Khushboo Verma
c9f8671af1 Small fixes 2024-07-30 15:13:38 +05:30
Bradley Schofield
f46e210000 Move mbSeconds into 1.5.x 2024-07-30 17:53:28 +09:00
Bradley Schofield
16cd971682 Merge deployments and build storage metrics together 2024-07-29 12:03:41 +09:00
Khushboo Verma
de114e61cd Merge branch '1.6.x' into feat-move-functions-marketplace-to-appwrite 2024-07-26 17:48:48 +05:30
Khushboo Verma
03de578293 Rename as per convensions 2024-07-26 17:47:03 +05:30
Matej Bačo
304910e303 Add schedule date to response format 2024-07-22 10:36:18 +00:00
Bradley Schofield
7d2a65f87e Run linter and address more comments 2024-07-22 18:17:38 +09:00
Khushboo Verma
1b5d815532 Add get function templates endpoint 2024-07-19 17:39:18 +05:30
Bradley Schofield
6768406422 Merge branch '1.5.x' into 1.5.x-db-storage-metrics 2024-07-18 16:21:56 +09:00
Bradley Schofield
f39d654725 Implement Trickle Down calculations 2024-07-18 13:58:02 +09:00
Bradley Schofield
667b69e146 Merge branch '1.5.x' into feat-runtime-controls-1.5.x 2024-07-17 17:04:04 +09:00
Bradley Schofield
e3b123d559 Implement Runtime Sizes instead of individual memory and cpu 2024-07-16 14:26:53 +09:00
Bradley Schofield
fce118ff34 Move GBHours to 1.5.x 2024-07-12 19:02:32 +09:00
Bradley Schofield
824a70f936 Move Runtime Controls PR to 1.5.x 2024-07-12 18:25:57 +09: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
Matej Bačo
88aefe230c QA changes with Console 2024-07-03 11:36:56 +00:00
Matej Bačo
2262d516f1 Merge remote-tracking branch 'origin/1.6.x' into mock-numbers 2024-07-03 09:30:11 +00:00
Damodar Lohani
75cd558670
Merge pull request #8323 from appwrite/feat-opr-v4-support
OPR v4 support
2024-07-03 15:11:54 +05:45
Matej Bačo
3a570b1f73 PR review changes 2024-07-03 08:27:54 +00:00
Khushboo Verma
ead0b93900 Resolve merge conflict 2024-07-02 14:59:15 +05:30
Khushboo Verma
f8427155f9 Merge branch '1.6.x' into mock-numbers 2024-07-01 17:02:41 +05:30
Luke B. Silver
ecf761beab
Merge branch '1.6.x' into feat-new-session-alert 2024-06-26 12:44:49 +01:00
Matej Bačo
d7d5fb0bd7 Improve VCS tests 2024-06-26 10:27:24 +00:00
Matej Bačo
186cef458b Implemented vcs.getRepositoryContents() 2024-06-26 10:03:27 +00:00
Khushboo Verma
0edbec4f44 OPR v4 support 2024-06-25 15:03:07 +05:30
loks0n
0d987045bf chore: revert fmt 2024-06-25 08:46:51 +01:00
loks0n
0ea2438069 fix: implementation 2024-06-24 14:12:09 +01:00
loks0n
f3f233eb14 feat: new session alert 2024-06-21 19:21:05 +01:00