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
Binyamin Yawitz
5cdb8388a1
chore: versions update
2024-08-23 13:02:54 -04: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
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
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
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
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
7d248f29f0
feat: Coroutine graphql wip
2024-06-11 18:08:40 -04: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
