Commit Graph

29860 Commits

Author SHA1 Message Date
Christy Jacob 3e0323dae8 Merge branch '1.6.x' into update-usage-test 2025-04-15 17:43:10 +04:00
Christy Jacob d0181787b9 fix: usage test assertion 2025-04-15 17:38:34 +04:00
Matej Bačo 2f537d3948 Merge branch 'feat-sites' into feat-update-error-pages 2025-04-15 15:20:03 +02:00
Matej Bačo e53ec21a2c Improve copy 2025-04-15 15:17:43 +02:00
Matej Bačo 8777fdb417 Remove leftover 2025-04-15 14:16:12 +02:00
Matej Bačo dbe42beb45 Improve tests 2025-04-15 14:16:04 +02:00
Chirag Aggarwal 76c7eb14eb chore: fix sdk fallback back to unknown 2025-04-15 12:08:18 +00:00
Chirag Aggarwal 8944e1db14 chore: update null check for sdk descriptions 2025-04-15 12:04:29 +00:00
Chirag Aggarwal c365480aec chore: small changes from review devkeys 2025-04-15 12:02:55 +00:00
Chirag Aggarwal f08ea92df4 chore: update cli 2025-04-15 11:08:54 +00:00
Khushboo Verma 0fc41b27ee Dark theme for trace error page 2025-04-15 10:48:25 +00:00
Chirag Aggarwal 40c15077e2 chore: update devkey init and make tests use mock oauth 2025-04-15 10:47:04 +00:00
Khushboo Verma 60c632363f Merge branch 'feat-sites' into feat-update-error-pages 2025-04-15 10:45:39 +00:00
Jake Barnby 49ea2f6fd9 Merge remote-tracking branch 'origin/1.6.x' into feat-pool-adapter
# Conflicts:
#	app/controllers/api/projects.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Workers/Deletes.php
2025-04-15 22:21:01 +12:00
Jake Barnby b972e7a1d4 Stash 2025-04-15 22:18:48 +12:00
Matej Bačo 60fafe8feb PR review changes 2025-04-15 11:40:32 +02:00
Matej Bačo 2669e66ae2 Merge pull request #9597 from appwrite/fix-usage-sites
Fix: usage stats changes
2025-04-15 11:26:02 +02:00
Luke B. Silver d82812cc04 Merge branch '1.6.x' into feat-exp-scheme 2025-04-15 10:11:31 +01:00
Chirag Aggarwal c3120f4aaa chore: add error tag
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2025-04-15 10:30:29 +05:30
Damodar Lohani 969c58fda9 Merge branch '1.6.x' into feat-usage-dump-multi-tenant-batch 2025-04-15 10:44:47 +05:45
Damodar Lohani 49814c2a7e bring back stats usage dump 2025-04-15 04:58:16 +00:00
Damodar Lohani f9141ca564 fix param types 2025-04-15 04:48:19 +00:00
Damodar Lohani 4edec1494a fix remove comments 2025-04-15 04:45:56 +00:00
Jake Barnby 0b60898ad5 Merge pull request #9643 from appwrite/feat-bulk-callbacks
Update database
2025-04-15 04:28:18 +00:00
Damodar Lohani 82ce35029a Merge pull request #9585 from appwrite/fix-merge-stats-usage-and-dump
Fix: merge the working of StatsUsage and StatsUsageDump
2025-04-15 09:50:43 +05:45
Damodar Lohani 93f86e57ea use clone 2025-04-15 03:15:24 +00:00
Damodar Lohani a46c5d1029 Update src/Appwrite/Platform/Workers/StatsUsage.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2025-04-15 08:54:04 +05:45
Chirag Aggarwal 88b229b13e chore: fix error logging for CLI tasks 2025-04-14 21:35:26 +00:00
Chirag Aggarwal 3ed87a8ab9 chore: update endpoint descriptions to follow CRUD naming 2025-04-14 18:40:48 +00:00
Chirag Aggarwal 9bec94c976 fix: env 2025-04-14 18:02:30 +00:00
Chirag Aggarwal 6596569259 chore: make devkeys test dependence free 2025-04-14 18:01:40 +00:00
Khushboo Verma 6e86527eb6 Keep build size in MBs 2025-04-14 14:33:46 +00:00
Khushboo Verma 5d9bdd4cc7 Update app/controllers/api/functions.php
Co-authored-by: Matej Bačo <matejbacocom@gmail.com>
2025-04-14 19:53:39 +05:30
Khushboo Verma 6852ee1f0f Read buildSize from plan 2025-04-14 14:07:23 +00:00
Khushboo Verma 81c3d96629 Consistent naming 2025-04-14 14:00:44 +00:00
Khushboo Verma 1acbff316e Use 1000 instead of 1024 2025-04-14 13:46:52 +00:00
loks0n 2427f950b5 fix: realtime 2025-04-14 14:34:22 +01:00
loks0n e551e4ad5b chore: fmt 2025-04-14 14:23:01 +01:00
loks0n 67a313cef3 fix: tests 2025-04-14 13:50:48 +01:00
Matej Bačo 84ec907a47 Merge branch 'feat-sites' into feat-update-error-pages 2025-04-14 14:17:32 +02:00
Khushboo Verma f02707627f Refactor 2025-04-14 12:16:50 +00:00
loks0n 3c2b88dc86 chore: remove unused 2025-04-14 13:02:02 +01:00
loks0n 944624f13a chore: fmt 2025-04-14 12:59:39 +01:00
loks0n 4ac2571135 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-exp-scheme 2025-04-14 12:58:25 +01:00
loks0n 0a4c430ae7 feat: exp scheme 2025-04-14 12:56:42 +01:00
Khushboo Verma 0df1396d52 Add plan to worker.php 2025-04-14 11:54:40 +00:00
Matej Bačo d1d36a2372 Merge pull request #9566 from appwrite/chore-add-tests-for-empty-output-dir
Add tests for empty output directory
2025-04-14 13:39:32 +02:00
Matej Bačo 0b6a8ec2ca Update tests/e2e/Services/Sites/SitesCustomServerTest.php 2025-04-14 13:39:23 +02:00
Darshan ab73a70c83 address comments. 2025-04-14 16:30:05 +05:30
Matej Bačo ed95ac7643 Re-add test, simplify 2025-04-14 12:54:56 +02:00