1
0
Fork 0
mirror of synced 2024-09-30 09:18:14 +13:00
Commit graph

514 commits

Author SHA1 Message Date
Bradley Schofield
a309f31a33 Add tests, move hooks to API Layer 2024-09-23 18:08:48 +09: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
Jake Barnby
c58fa78962
Remove tenant in filter 2024-09-05 14:25:11 +12:00
Binyamin Yawitz
5cdb8388a1
chore: versions update 2024-08-23 13:02:54 -04: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
Bradley Schofield
4b585466e1 Update api.php 2024-07-22 20:03:45 +09: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
Christy Jacob
fdf44c7bab Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-20 15:26:17 +00:00
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
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
Matej Bačo
4d249c5d36 Bug fix 2024-05-14 12:27:35 +00:00
Matej Bačo
54c953d559 Add prefix of api key types 2024-05-14 11:58:31 +00:00
Matej Bačo
9252b66493 Add scope tests 2024-05-06 11:27:28 +00:00
Matej Bačo
3a3d5b61a6 PR review changes 2024-05-06 09:55:59 +00:00
Matej Bačo
448b0a5607 Re-add api token auth 2024-05-06 08:35:27 +00:00
Christy Jacob
c7bdcda593
Merge pull request #8028 from appwrite/1.5.x
Sync 1.5.x into main
2024-04-26 15:10:09 +04:00
Damodar Lohani
c8bf5f4328 simplify check 2024-04-25 01:23:01 +00:00
Damodar Lohani
4e66f8a8e2 simplify test 2024-04-25 01:01:15 +00:00
Damodar Lohani
67cdde15f5
Update api.php 2024-04-24 09:03:08 +05:45
Damodar Lohani
c163c84478
Merge branch 'main' into fix-usage-skip-main 2024-04-24 08:42:17 +05:45
Damodar Lohani
ac95a7c5eb
Update api.php 2024-04-24 06:44:14 +05:45
Damodar Lohani
dc3aa5e12f
revert 2024-04-24 06:30:32 +05:45
Steven Nguyen
b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x 2024-04-23 23:43:53 +00:00
Bradley Schofield
089af4e137
Update app/controllers/shared/api.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-23 16:34:12 +09:00
Bradley Schofield
3d17b64eac Add Null check before we access factors 2024-04-23 16:24:05 +09:00
Torsten Dittmann
9150ceadc7 fix: mfa with admin mode 2024-04-17 11:10:33 +02:00
Damodar Lohani
083c220e37
fix auth mode check 2024-04-17 06:45:15 +05:45
Matej Bačo
c87a7053b4 Fix bug in MFA protected group 2024-04-10 11:42:20 +00:00
Jake Barnby
e224ca440b
Allow setting event parameters as sensitive 2024-04-03 16:36:21 +13:00
Eldad Fux
beda5293b4 Fix format 2024-04-01 13:08:46 +02:00
Eldad Fux
8ed1da4ea8 Updated getEnv to use system lib 2024-04-01 13:02:47 +02:00
Torsten Dittmann
fc028b953e fix: formatter 2024-03-08 00:30:23 +01:00
Torsten Dittmann
f51c39cd2b Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-03-08 00:30:02 +01:00
Khushboo Verma
8f1aaf69d4 Merge branch 'main' into feat-disable-api 2024-03-07 18:22:34 +01:00