Commit graph

101 commits

Author SHA1 Message Date
ArnabChatterjee20k
9fa42e8084 added filters 2025-08-22 12:47:00 +05:30
Jake Barnby
557bffb350
Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	composer.lock
2025-08-22 00:35:12 +12:00
Khushboo Verma
bc47ac7caa Truncate logs and errors from beginning 2025-08-21 12:49:31 +05:30
Khushboo Verma
1bd6b6452c Fix PR changes 2025-08-20 18:53:55 +05:30
Jake Barnby
2235848262
Clear txn logs on worker 2025-08-15 00:32:03 +12:00
Cursor Agent
dffe030d16 Replace databasesBatchSize with databasesTransactionSize in database operations
Co-authored-by: jakeb994 <jakeb994@gmail.com>
2025-08-14 10:06:43 +00:00
Jake Barnby
93cc4e1df8
Merge remote-tracking branch 'origin/1.8.x' into feat-txn
# Conflicts:
#	app/config/errors.php
#	app/config/roles.php
#	app/controllers/api/databases.php
#	composer.json
#	composer.lock
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Utopia/Response.php
#	tests/e2e/Services/Databases/Legacy/DatabasesBase.php
2025-07-29 22:16:56 +12:00
Jake Barnby
cdbd89b3f3
Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	app/config/specs/open-api3-1.8.x-client.json
#	app/config/specs/open-api3-1.8.x-console.json
#	app/config/specs/open-api3-1.8.x-server.json
#	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.8.x-client.json
#	app/config/specs/swagger2-1.8.x-console.json
#	app/config/specs/swagger2-1.8.x-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/databases.php
#	composer.lock
#	tests/e2e/Services/Databases/Legacy/DatabasesBase.php
2025-07-27 16:07:04 +12:00
hmacr
9c0e6f4203 Skip deployment when commit is created by us 2025-07-22 20:39:36 +05:30
Jake Barnby
51c95347a0
Merge remote-tracking branch 'origin/main' into 1.8.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-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/databases.php
2025-07-21 20:42:16 +12:00
Jake Barnby
97a4e5f355
Bump version 2025-07-18 21:38:35 +12:00
Christy Jacob
b5c5f76acc Merge branch '1.7.x' of github.com:appwrite/appwrite into feat-apps-module 2025-06-20 17:39:28 +04:00
Jake Barnby
d13081b4f2
Use const 2025-06-17 16:45:07 -04:00
Jake Barnby
3158c15111
Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	app/controllers/api/functions.php
#	app/controllers/api/project.php
#	app/controllers/api/proxy.php
#	app/controllers/api/storage.php
#	app/controllers/api/vcs.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init/database/filters.php
#	composer.json
#	composer.lock
#	src/Appwrite/Migration/Migration.php
#	src/Appwrite/Migration/Version/V15.php
#	src/Appwrite/Migration/Version/V16.php
#	src/Appwrite/Migration/Version/V17.php
#	src/Appwrite/Migration/Version/V18.php
#	src/Appwrite/Migration/Version/V19.php
#	src/Appwrite/Migration/Version/V20.php
#	src/Appwrite/Migration/Version/V21.php
#	src/Appwrite/Platform/Tasks/Migrate.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Functions.php
#	src/Appwrite/Platform/Workers/StatsResources.php
#	src/Appwrite/Platform/Workers/StatsUsage.php
2025-05-27 13:36:23 +12:00
Jake Barnby
b7d0c127a3
Revert "Merge pull request #9878 from ArnabChatterjee20k/dat-532"
This reverts commit a366feba80, reversing
changes made to 484988fcd7.
2025-05-26 21:37:21 +12:00
Jake Barnby
c51cf2f3e4
Merge pull request #9878 from ArnabChatterjee20k/dat-532
updated errro for the string encryption
2025-05-26 17:37:57 +12:00
Torsten Dittmann
7531c64b31 Update version from 1.7.3 to 1.7.4 2025-05-25 19:44:51 +02:00
Steven Nguyen
b932db34f3
Bump appwrite version to 1.7.3 2025-05-23 16:01:00 -07:00
Jake Barnby
a366feba80
Merge pull request #9878 from ArnabChatterjee20k/dat-532
updated errro for the string encryption
2025-05-23 15:27:35 +00:00
ArnabChatterjee20k
6af9d1206d added a constant 2025-05-23 20:41:08 +05:30
Steven Nguyen
ac8105dea2
Bump appwrite version to 1.7.2 2025-05-20 17:29:32 -07:00
Jake Barnby
41668d4cd0
Update version 2025-05-19 00:41:37 +12:00
Jake Barnby
617fc6a04a
Set version to RC1 2025-05-18 03:13:36 +12:00
Chirag Aggarwal
fe767e9655 chore: accent color 2025-05-15 07:44:14 +00:00
Chirag Aggarwal
a2686b4a8d Merge branch '1.7.x' into feat-logo-url 2025-05-14 03:21:45 +00:00
Matej Bačo
af0c872999 Merge branch '1.6.x' into 1.7.x 2025-05-13 10:11:39 +02:00
Chirag Aggarwal
980afc2eaf chore: update social links 2025-05-12 13:20:59 +00:00
Chirag Aggarwal
a802a78b0b feat: plan based email logoUrl 2025-05-12 13:10:58 +00:00
Jake Barnby
a98520302d
Reduce max batch 2025-04-30 12:09:02 +12:00
Jake Barnby
6af3912eff
Remove unused value 2025-04-30 12:08:53 +12:00
Eldad Fux
fb29fe7b3c Merge remote-tracking branch 'origin/1.7.x' into feat-apps-module 2025-04-29 20:12:31 +02:00
Darshan
53e829408f update: use constants. 2025-04-28 20:01:42 +05:30
Darshan
9a7c7dee56 add: last accessed var, remove secret from model. 2025-04-24 11:08:56 +05:30
Matej Bačo
cd9a2b761c Merge branch '1.7.x' into feat-sites 2025-04-17 12:13:06 +02:00
Darshan
9d6cd8249a change: constant name. 2025-04-16 11:56:40 +05:30
Darshan
ab73a70c83 address comments. 2025-04-14 16:30:05 +05:30
Darshan
624538fcaf revert: local dockerfile change. 2025-04-09 16:35:27 +05:30
Damodar Lohani
13510ffcb5 new sites metrics 2025-04-02 05:15:33 +00:00
Damodar Lohani
0d9743c8cb separate sites network metrics 2025-04-02 05:10:12 +00:00
Damodar Lohani
1af638deef new resource type metrics 2025-04-01 02:21:52 +00:00
Damodar Lohani
ac152a76b5 Fix: usage stats changes 2025-03-31 06:28:58 +00:00
Eldad Fux
1bf1766822 Merge remote-tracking branch 'origin/feat-sites' into feat-apps-module 2025-03-28 08:20:24 +01:00
Jake Barnby
2e12ae4390
Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations
# Conflicts:
#	composer.lock
2025-03-27 18:11:03 +13:00
Matej Bačo
cb85cfc5d9 Merge branch '1.7.x' into feat-sites 2025-03-20 16:42:36 +01:00
Eldad Fux
8aa5714173 cleanups 2025-03-17 21:44:31 +01:00
Matej Bačo
2ff339dad4 Re-implement init changes 2025-03-17 11:53:09 +01:00
Jake Barnby
bc866dc717
Sync with 1.6.x 2025-03-17 21:10:30 +13:00
Damodar Lohani
4eece99768 Feat: domains count 2025-03-16 02:35:10 +00:00
Eldad Fux
195edd19ac wip 2025-03-15 13:18:34 +01:00
Eldad Fux
4f0a7de868 Fixes 2025-03-15 12:34:49 +01:00
Eldad Fux
1933e48d9c Cleanups 2025-03-15 12:00:36 +01:00