1
0
Fork 0
mirror of synced 2024-09-30 17:26:48 +13:00
Commit graph

1513 commits

Author SHA1 Message Date
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
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
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
Damodar Lohani
7dc64c12a6
fix team resource 2024-09-05 08:32:50 +05:45
Damodar Lohani
b263ed7ce6 fix team res 2024-09-04 23:48:51 +00: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
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
Christy Jacob
4f8e6d7005 feat: update experimental logging provider 2024-08-26 14:42:48 +04:00
Christy Jacob
03031805a9 feat: add logs 2024-08-26 13:33:51 +04:00
fogelito
ff1a679c49 Merge branch 'main' of https://github.com/appwrite/appwrite into migrations-backups-v2
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Migrations.php
#	tests/e2e/Services/Databases/DatabasesBase.php
2024-08-20 16:36:54 +03:00
Bradley Schofield
dc149761d8 Address Jake's Comments 2024-08-20 13:23:11 +09:00
Bradley Schofield
f4bf57efcb Merge remote-tracking branch 'origin/1.6.x' into feat-runtime-controls-1.5.x
# Conflicts:
#	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-1.6.x-client.json
#	app/config/specs/swagger2-1.6.x-console.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2024-08-19 14:05:56 +09:00
Christy Jacob
fb55fb1136 chupdate cache buster 2024-08-16 21:15:48 +00:00
Bradley Schofield
4128d4f221 Merge 1.6.x into feat-runtime-controls 2024-08-16 04:39:21 +00:00
Christy Jacob
22a3508c24
Merge pull request #8217 from appwrite/feat-extract-team-deletion
Feat Sync team deletion
2024-08-15 23:51:36 +04: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
3b20e53818 Merge remote-tracking branch 'origin/1.6.x' into fix-16x-qa 2024-08-14 08:06:10 +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
Matej Bačo
1bf879f16a Merge remote-tracking branch 'origin/main' into fix-16x-qa 2024-08-13 09:05:53 +00:00
Steven Nguyen
f47af1626c
Bump appwrite version to 1.5.10 2024-08-12 19:55:22 +00:00
Steven Nguyen
0d451ec123
Bump console to version 4.3.30 2024-08-12 19:44:55 +00:00
Steven Nguyen
2b9f3c4638
Bump appwrite version to 1.5.9 2024-08-09 16:06:02 +00:00
Steven Nguyen
8eb707be2c
Bump console to version 4.3.29 2024-08-09 15:53:26 +00:00
Binyamin Yawitz
24137abd42
fix: Adding otp session email customizing 2024-08-09 09:05:35 -04:00
Binyamin Yawitz
844ec11bd3
Merge branch 'refs/heads/1.6.x' into feat-extract-team-deletion 2024-08-08 09:58:30 -04:00
Bradley Schofield
9900f998bc Merge branch '1.5.x' into feat-runtime-controls-1.5.x 2024-08-08 12:39:56 +09:00
Steven Nguyen
ab7f0b1348
Bump console to version 4.3.27 2024-08-06 16:03:53 +00:00
Bradley Schofield
e51f912ab1 Address Jake's comments and add 0.5 cpu spec 2024-08-06 18:54:46 +09:00
Binyamin Yawitz
2aa1511bbf
chore: Upgrading dbip to latest version 2024-08-02 10:19:23 -04:00
Bradley Schofield
2060d3f09c Rename everything to use specification instead of size 2024-07-31 20:27:32 +09:00
Bradley Schofield
f46e210000 Move mbSeconds into 1.5.x 2024-07-30 17:53:28 +09:00