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
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
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
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
Eldad Fux
c53de9fb6b
Merge branch 'main' of github.com:appwrite/appwrite into feat-eldad4-coroutines
2024-05-08 18:21:55 +01: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
Eldad Fux
d67df5feb1
Fixed formatting
2024-04-22 22:45:55 +02:00
Eldad Fux
3b70ae4d9f
Fixed formatting
2024-04-22 07:56:36 +02: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
Eldad Fux
766b2ba13e
Avatars tests are green!
2024-04-14 22:17:07 +02:00
Eldad Fux
211bcf8948
Removed proxy db
2024-04-09 21:02:02 +02:00
Jake Barnby
e224ca440b
Allow setting event parameters as sensitive
2024-04-03 16:36:21 +13:00
Eldad Fux
5ce3de4933
Merge remote-tracking branch 'origin/main' into feat-eldad2-coroutines
2024-04-02 02:13:15 +02: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
Matej Bačo
2a0a69f3ed
Fix connections pool
2024-03-09 11:59:45 +01:00
Matej Bačo
db1674811f
Finish fixing code QL warnings
2024-03-08 13:57:20 +01: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
Matej Bačo
005a239932
Auth fixes
2024-03-07 18:24:01 +01:00
Khushboo Verma
8f1aaf69d4
Merge branch 'main' into feat-disable-api
2024-03-07 18:22:34 +01:00
Torsten Dittmann
dfef0e732c
sync: main -> 1.5.x
2024-03-07 17:16:39 +01:00
Matej Bačo
efeb898be1
Import fixes
2024-03-07 15:29:42 +01:00
Matej Bačo
ee065bc64c
Merge branch '1.5.x' into feat-database-proxy
2024-03-07 10:18:49 +01:00
Torsten Dittmann
0a1d572c72
chore: run formatter
2024-03-06 18:34:21 +01:00
Matej Bačo
882d8e5a88
Fix database tests
2024-03-06 16:19:23 +01:00
Matej Bačo
a9731cd5bc
Fix account tests
2024-03-06 12:38:51 +01:00
Torsten Dittmann
a53e630536
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2
2024-03-05 10:31:51 +01:00
Khushboo Verma
d3b0b00917
Allow users to disable APIs
2024-03-04 23:12:54 +01:00
Torsten Dittmann
01e1a43106
fix: wrong namespace
2024-03-01 03:08:30 +01:00
Torsten Dittmann
b7d3996960
feat: mfa collection restructure
2024-02-29 21:59:49 +01:00
Jake Barnby
6fb1e929cd
Use group hook to block recreating sessions
2024-02-27 22:08:39 +13:00
Christy Jacob
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints""
2024-02-25 13:42:28 +05:30
Luke B. Silver
f285173f4e
Merge branch '1.5.x' into feat-ssr-dx
2024-02-22 13:22:41 +00:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints"
2024-02-22 12:21:48 +05:30
Jake Barnby
942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
...
# Conflicts:
# app/config/collections.php
# app/config/errors.php
# 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
# app/controllers/api/account.php
# app/controllers/api/teams.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/init.php
# app/worker.php
# composer.json
# composer.lock
# docker-compose.yml
# src/Appwrite/Extend/Exception.php
# src/Appwrite/Platform/Services/Tasks.php
# src/Appwrite/Platform/Tasks/Maintenance.php
# src/Appwrite/Platform/Workers/Certificates.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Messaging.php
# src/Appwrite/Platform/Workers/Usage.php
# src/Appwrite/Platform/Workers/UsageHook.php
# src/Appwrite/Specification/Format/OpenAPI3.php
# src/Appwrite/Specification/Format/Swagger2.php
# tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby
b265106af2
Fix tests
2024-02-21 02:20:09 +13:00
Jake Barnby
bbce53cda5
Auto trigger messaging events
2024-02-21 01:06:35 +13:00
loks0n
fa28496b32
feat: ssr dx changes
2024-02-20 11:45:11 +00:00
Jake Barnby
2f711c84ed
Remove callback resources from workers
2024-02-21 00:40:55 +13:00
Torsten Dittmann
b500c085e1
revert: unnecessary style changes
2024-02-16 18:00:49 +00:00
Torsten Dittmann
de0e83f703
fix: move user and project logic from general to api hook
2024-02-16 17:58:51 +00:00
Torsten Dittmann
5193a97ddb
fix: move user logic from general to api hook
2024-02-16 16:26:50 +00:00
Jake Barnby
014464506e
Remove redundant hook
2024-02-13 17:45:03 +13:00
shimon
6b6f04d2d3
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/config/collections.php
app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby
8ed2b1f3a5
Fix tests
2024-02-12 18:35:05 +13:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
Khushboo Verma
d40a51b50a
Only disallow console requests
2024-02-02 20:01:54 +05:30
Khushboo Verma
d96d84201e
Add auth group to create email token endpoint
2024-02-02 14:03:20 +05:30
Khushboo Verma
851e5c5154
Remove restrict group and add logic to auth group
2024-02-01 17:40:41 +05:30
Khushboo Verma
dadb94c499
Merge branch '1.5.x' into feat-block-countries
2024-01-31 12:24:21 +05:30
Matej Bačo
738a696ca9
Add proejct ID abuse protection
2024-01-29 20:38:01 +00:00
Matej Bačo
0a518cd47e
Fix failing tests
2024-01-29 20:03:14 +00:00
Christy Jacob
47fc6efb0d
chore: update endpoint
2024-01-29 17:48:12 +00:00
Christy Jacob
0ff6e99354
chore: update auth group
2024-01-29 17:42:14 +00:00
Khushboo Verma
2f88320d4f
Add null check
2024-01-29 18:47:14 +05:30