Commit graph

1537 commits

Author SHA1 Message Date
shimon
5451a9cd23 sync against feat-migration 2024-10-20 10:56:44 +03:00
shimon
1373d62c52 debug 2024-10-14 16:18:01 +03:00
shimon
d0481482ae debug 2024-10-14 10:36:52 +03:00
shimon
8f6151a575 updates 2024-10-06 18:56:39 +03:00
shimon
3f19fac0b4 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into multi-region-support
# Conflicts:
#	app/init.php
#	app/realtime.php
#	composer.json
#	src/Appwrite/Platform/Tasks/ScheduleBase.php
#	src/Appwrite/Platform/Tasks/ScheduleExecutions.php
#	src/Appwrite/Platform/Tasks/ScheduleFunctions.php
#	src/Appwrite/Platform/Tasks/ScheduleMessages.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Migrations.php
2024-10-04 16:26:47 +03:00
Torsten Dittmann
4f4edc48af Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups 2024-10-02 17:38:50 +02:00
Christy Jacob
4069ae7165 chore: remove db disk storage calculation 2024-10-01 21:45:34 +04:00
shimon
19912c87c9 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support 2024-09-29 17:04:34 +03: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
Torsten Dittmann
5f15c34ad5 Merge branch 'feat-console-roles-dl' of https://github.com/appwrite/appwrite into migrations-backups 2024-09-27 14:55:57 +02:00
fogelito
b1cfd1c0ff Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups
# Conflicts:
#	app/controllers/api/databases.php
#	composer.lock
2024-09-26 10:42:15 +03:00
Bradley Schofield
00acc2f73b Address Comments 2024-09-24 00:07:54 +09:00
shimon
aa0a795ec6 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support 2024-09-22 09:49:50 +03:00
Binyamin Yawitz
5512340cdd
Revert "Feat eldad4 coroutines" 2024-09-20 12:30:05 -04:00
Binyamin Yawitz
fe7f39d7a5
fix: reviews 2024-09-19 13:48:15 -04:00
fogelito
b519f5e23a Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/ScheduleBase.php
#	src/Appwrite/Specification/Format/Swagger2.php
2024-09-19 18:19:45 +03: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
Damodar Lohani
1aa99a0f3e
Merge branch '1.6.x' into feat-console-roles-dl 2024-09-18 11:58:09 +05:45
shimon
25f82895c5 adding external messages usage 2024-09-17 12:20:55 +03:00
Damodar Lohani
e1238d0fe9
Merge branch '1.6.x' into feat-console-roles-dl 2024-09-17 14:52:29 +05:45
shimon
0791b68149 adding external messages usage 2024-09-17 11:45:07 +03:00
shimon
bee844fcdb sync against 1.6x 2024-09-15 17:40:55 +02:00
Jake Barnby
31cc4350a2
Revert version 2024-09-10 15:09:57 +12:00
Christy Jacob
c7dd8574e4
Merge pull request #8648 from appwrite/phone_auth_metric_rename
Phone auth metric rename
2024-09-09 17:42:11 +04:00
shimon
36486dd3f4 sms messages rename 2024-09-09 15:05:11 +02:00
shimon
de8e82926a sms messages rename 2024-09-09 14:54:32 +02:00
Jake Barnby
7e303399c7
Update version 2024-09-09 23:00:22 +12:00
Binyamin Yawitz
b200e66bd1
fix: adding getConsoleDB injection 2024-09-06 15:52:04 -04:00
Binyamin Yawitz
0d41b084ea
chore: formatting and packages updates 2024-09-05 18:17:16 -04:00
Binyamin Yawitz
9e525366cb
Merge branch '1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/controllers/api/functions.php
#	app/init.php
#	composer.lock
#	src/Appwrite/Specification/Format/Swagger2.php
2024-09-05 18:09:16 -04:00
Binyamin Yawitz
439e42e1ab
review: addressing 2024-09-05 14:49:37 -04:00
Binyamin Yawitz
8e145a9519
refactor: global to registry 2024-09-05 14:03:59 -04:00
Binyamin Yawitz
fbb23b227b
refactor: global to registry 2024-09-05 13:20:44 -04:00
Binyamin Yawitz
5d70884e6c
chore: cleaning 2024-09-05 13:11:39 -04:00
Damodar Lohani
7dc64c12a6
fix team resource 2024-09-05 08:32:50 +05:45
Jake Barnby
c58fa78962
Remove tenant in filter 2024-09-05 14:25:11 +12:00
Damodar Lohani
b263ed7ce6 fix team res 2024-09-04 23:48:51 +00:00
Binyamin Yawitz
feb775d2c4
chore: merge, lint, stan 2024-09-04 14:52:01 -04:00
Jake Barnby
72d6fb3901
Merge branch '1.6.1' into feat-string-attribute-resizing
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.lock
2024-09-04 21:06:21 +12:00
Jake Barnby
db269d8b8f
Merge remote-tracking branch 'origin/1.6.x' into migrations-backups 2024-09-04 20:23:14 +12: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
Binyamin Yawitz
cedf3cf28d
chore: format 2024-09-03 19:32:30 -04:00
Binyamin Yawitz
686b5439a2
chore: merge 2024-09-03 19:22:53 -04:00
Christy Jacob
4023613bb7 feat: update geodb file name 2024-09-03 11:42:40 +04:00
Jake Barnby
2c2e88f645
Merge remote-tracking branch 'origin/1.6.x' into migrations-backups
# Conflicts:
#	app/init.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/ScheduleBase.php
#	src/Appwrite/Specification/Format/Swagger2.php
2024-09-03 14:48:57 +12: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
Jake Barnby
c868c669ca
Move const to init to avoid redefine warnings 2024-08-28 21:35:16 +12:00
Christy Jacob
f8c281dfc0 feat: update cache buster 2024-08-27 15:58:19 +04:00
Christy Jacob
d2c9ce65e3 feat: remove var_dumps 2024-08-26 14:56:30 +04:00