Commit graph

3800 commits

Author SHA1 Message Date
Matej Bačo
5bd106afaf Implement better cname validation logging 2024-01-23 15:40:32 +00:00
Bradley Schofield
448b3b0cc0
Merge branch 'main' into feat-impl-queue-retry 2024-01-22 16:51:18 +00:00
Bradley Schofield
f3579b3f12 Address Christy's Comments 2024-01-22 16:50:45 +00:00
shimon
d220c2bdd7 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 14:48:25 +02:00
shimon
2b865bdf97 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 11:29:11 +02:00
shimon
19b1de283b Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into hamster-additions 2024-01-22 11:25:37 +02:00
德华 刘
d04f9f41c3 chore: refactor code 2024-01-22 08:30:48 +00:00
德华 刘
ff7523d6db chore: refactor code 2024-01-22 08:26:38 +00:00
shimon
9fc1b0b71b Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 10:09:13 +02:00
shimon
0e30f6533e Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 09:54:09 +02:00
shimon
c116de29e1 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 09:28:45 +02:00
Bradley Schofield
1e247bdde1 Address Christy's Comments and Update Lib 2024-01-19 13:18:37 +00:00
shimon
37316f97ff adding debug output to usage-worker 2024-01-18 18:52:20 +02:00
shimon
a0b38a5a7c Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-18 14:19:19 +02:00
shimon
8581df9c14 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-18 14:05:58 +02:00
shimon
6bd810cb3a hamster additions 2024-01-17 22:19:00 +02:00
shimon
0d106684ae hamster additions 2024-01-17 22:10:06 +02:00
Shimon Newman
e5245909e3
Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:09:17 +02:00
Shimon Newman
3f63b87ea6
Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:09:02 +02:00
Shimon Newman
c1ca623bab
Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:08:44 +02:00
Shimon Newman
5d164e0592
Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:08:37 +02:00
Shimon Newman
a954cea8fc
Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:08:29 +02:00
shimon
f9d6da6672 hamster additions 2024-01-17 21:58:16 +02:00
shimon
40e17ad625 hamster additions 2024-01-17 21:53:12 +02:00
Bradley Schofield
4cb48638be Rename usage_network_infinity to usage_bandwidth_infinity 2024-01-12 15:22:18 +00:00
Torsten Dittmann
78f7b1897e
fix: hotfix for redirect param in custom templates (#7437)
* fix: hotfix for redirect param in custom templates
* fix: redirect param variables
* fix: variable typo
* chore: update comments for template variables
2024-01-11 21:36:05 +01:00
shimon
4b23440c2d remove cloud related scripts 2024-01-09 15:44:56 +02:00
shimon
85950868f2 remove cloud related scripts 2024-01-09 15:30:43 +02:00
shimon
eb70990bf0 remove cloud related scripts 2024-01-09 15:22:02 +02:00
德华 刘
65c90c9475 chore: update collection name in hamster 2024-01-09 12:41:58 +00:00
shimon
880526d6d3 Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-01-09 12:11:32 +02:00
shimon
1da476e5ac remove cloud related scripts 2024-01-09 11:13:58 +02:00
Eldad A. Fux
ef72e08386
Merge pull request #7271 from appwrite/feat-7223-install-without-start
Add a flag to install and upgrade commands to not start Appwrite
2024-01-08 22:09:22 +01:00
Steven Nguyen
864703fb4e
Update the install/upgrade arguments to be kebab instead of camel case
Kebab case like --http-port is much more common in CLIs than --httpPort.
2024-01-08 20:56:51 +00:00
shimon
8163eefe4d Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-08 19:16:10 +02:00
Torsten Dittmann
9ba2eafa83
fix: escape html in email params (#7409)
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
2024-01-08 18:08:17 +01:00
shimon
03f2041913 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-07 18:09:48 +02:00
Bradley Schofield
d9c04f4fc0
Update src/Appwrite/Platform/Tasks/Retry.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2024-01-05 12:37:03 +00:00
Bradley Schofield
4199126984 Run Linter 2024-01-04 13:04:51 +00:00
Bradley Schofield
01d76a1746 Add Queue Retry Command to Appwrite 2024-01-04 13:00:25 +00:00
Ben Humphries
fbd277f6aa
executor: pass build timeout to runtimes (#7350)
open-runtimes executor (v1/runtimes) supports passing a timeout parameter that defaults to 600 seconds.

->param('timeout', 600, new Integer(), 'Commands execution time in seconds.', true)

https://github.com/open-runtimes/executor/blob/main/app/http.php#L383

This change passes the _APP_FUNCTIONS_BUILD_TIMEOUT env var.
2024-01-04 11:46:08 +01:00
shimon
f14250bf2a sync with main 2024-01-02 12:24:57 +02:00
shimon
99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
2024-01-02 11:49:23 +02:00
Damodar Lohani
a2ad870084 use compression constant from utopia/storage 2023-12-31 11:46:45 +00:00
shimon
77d423e645 refactoring infinity metric calculation cli script, adding project id and after
options.
2023-12-26 18:23:07 +02:00
shimon
9382e4cec5 refactoring infinity metric calculation cli script, adding project id and after
options.
2023-12-26 18:21:01 +02:00
shimon
4a837907d1 usageHook tweaks 2023-12-25 11:32:40 +02:00
shimon
b398338876 small fix 2023-12-25 10:17:58 +02:00
shimon
ddb7a403db refactor usage worker 2023-12-24 21:17:13 +02:00
shimon
80315a02dd refactor usage worker 2023-12-24 21:00:53 +02:00
shimon
d1751565cf refactor usage worker 2023-12-24 20:38:15 +02:00
shimon
f1e066d965 debuging usage 2023-12-24 17:06:12 +02:00
shimon
585b904b80 debuging usage 2023-12-24 16:50:20 +02:00
德华 刘
d3143b8ede chore: update hamster script 2023-12-22 14:07:05 +00:00
德华 刘
394f28146a chore: update hamster script 2023-12-22 14:03:46 +00:00
德华 刘
1857c0e04d chore: update hamster script 2023-12-22 14:03:07 +00:00
德华 刘
1eb59daed1 chore: run linter 2023-12-22 09:23:56 +00:00
德华 刘
bf92ae6841 chore: update console 2023-12-22 09:19:27 +00:00
shimon
ba44e06af6 metrics adjustments
after and projectId additions
2023-12-21 15:04:29 +02:00
shimon
24d3aa499a metrics adjustments
after and projectId additions
2023-12-21 14:32:10 +02:00
shimon
4e24e3cdc2 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into refactor-hamster-usage
 Conflicts:
	src/Appwrite/Platform/Tasks/CalcTierStats.php
2023-12-21 14:25:06 +02:00
shimon
eff578bb36 metrics adjustments
after and projectId additions
2023-12-21 14:07:24 +02:00
shimon
9a2f97b613 metrics adjustments
after and projectId additions
2023-12-21 13:45:57 +02:00
Matej Bačo
ccfd856e8e Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-20 12:31:56 +01:00
Matej Bačo
0529cffa4b Improve logging 2023-12-20 12:31:35 +01:00
Damodar Lohani
bfbcecd069 fix deletes worker 2023-12-20 11:26:57 +00:00
Matej Bačo
05f8f8fb9d Fix SMS issue 2023-12-20 12:13:22 +01:00
Damodar Lohani
caa5c4e744 making visibility private 2023-12-18 10:20:00 +00:00
Damodar Lohani
1f558442d9 linter fix 2023-12-18 10:18:40 +00:00
Damodar Lohani
5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
shimon
9f1b356a79 combining network inbound
and network outbound on
hamster script
2023-12-18 11:37:54 +02:00
Steven Nguyen
e41194ee3c
Fix import to match class name
The class is SMS rather than Sms.
2023-12-16 17:42:29 +00:00
Matej Bačo
0aaab63b8c Remove var dumps 2023-12-15 23:37:31 +01:00
Matej Bačo
8c1363529e Add Hooks 2023-12-15 23:19:43 +01:00
Christy Jacob
b36c98af66
Merge pull request #7274 from appwrite/refactor-usage-execution-trigger
Refactor usage execution trigger
2023-12-14 06:16:01 +01:00
德华 刘
dc89501012 chore: linter 2023-12-14 04:51:36 +00:00
德华 刘
1307f73c31 chore: refactor code 2023-12-14 04:49:16 +00:00
Christy Jacob
39d91aecf1
Merge pull request #7273 from appwrite/damodar/pea-15-refactor-maintenance-deletes-worker
PEA-15 Refactor Deletes and maintenance worker
2023-12-14 05:08:11 +01:00
Matej Bačo
cc67bcba28 Add group for cloud limit check 2023-12-12 21:33:02 +01:00
shimon
41ae96ea77 change execution usage trigger 2023-12-12 21:55:01 +02:00
shimon
bdf9a64771 change execution usage trigger 2023-12-12 21:21:47 +02:00
Torsten Dittmann
cf87cfab3a Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-12 18:48:26 +01:00
Torsten Dittmann
063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
Matej Bačo
fc504e3a68 Change collections priority for pricing override 2023-12-12 12:27:04 +01:00
Damodar Lohani
7891f9e74c refactor deletes worker 2023-12-12 11:26:44 +00:00
Damodar Lohani
5512123e04 loop through projects 2023-12-12 11:26:28 +00:00
Damodar Lohani
9ac57e2e7a remove unused retention 2023-12-12 08:11:01 +00:00
Damodar Lohani
104b8bb366 provide retention time as queue server resource 2023-12-12 08:07:24 +00:00
Steven Nguyen
6d357d617d Add a flag to install and upgrade commands to not start Appwrite
This can be useful for cases where the developer only wants the files
to be generated and doesn't want to start Appwrite.
2023-12-11 23:37:32 +00:00
Torsten Dittmann
3d081e1aa5 fix: allow billingPlan query on teams 2023-12-11 19:48:52 +01:00
Torsten Dittmann
ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
Torsten Dittmann
6925122791
Merge pull request #7266 from appwrite/feat-project-usage-custom-daterange
feat: project usage custom date range
2023-12-10 12:35:58 +01:00
Torsten Dittmann
95425832ae fix: tests and response models 2023-12-10 11:03:01 +01:00
Damodar Lohani
ffdc662022 fix formatting 2023-12-09 06:41:24 +00:00
Damodar Lohani
e4467521f8
Merge branch 'refactor-usage-sn' into feat-mail-template-override-ur 2023-12-09 07:36:11 +01:00
Damodar Lohani
e3bab623f1 fix redis issue by encoding content 2023-12-08 21:34:39 +00:00
Damodar Lohani
f553576d0e fix linter 2023-12-08 20:06:37 +00:00
Damodar Lohani
386cee5137 mail support string as attachment 2023-12-08 19:57:15 +00:00
Damodar Lohani
5c9199f332
fix empty body template 2023-12-06 16:16:31 +01:00
Damodar Lohani
83d4de9f73
support maile template override 2023-12-06 14:52:13 +01:00
德华 刘
b6fabf80ef Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-refactor-hamster 2023-11-30 21:20:59 +00:00
德华 刘
49bb3444bf chore: add logs 2023-11-30 21:11:31 +00:00
德华 刘
d4ff696173 chore: fix linter issues 2023-11-30 20:35:18 +00:00
德华 刘
0382b2250a chore: address review comments 2023-11-30 19:22:35 +00:00
德华 刘
f3544485e5 chore: address review comments 2023-11-30 17:41:23 +00:00
德华 刘
4b7676158e chore: address review comments 2023-11-30 16:24:11 +00:00
德华 刘
5cb818066f Merge branch 'feat-refactor-hamster' of https://github.com/appwrite/appwrite into feat-refactor-hamster 2023-11-30 16:23:05 +00:00
德华 刘
d34050a5df chore: address review comments 2023-11-30 16:22:26 +00:00
Bradley Schofield
8bec64b2a2 Update Hamster.php 2023-11-30 11:05:15 +00:00
shimon
c313e8347f Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	composer.lock
2023-11-30 10:21:59 +02:00
Bradley Schofield
dea3e74b6a Implement Job based hamster 2023-11-28 10:19:55 +00:00
Jake Barnby
1a496bbf71
Merge pull request #7180 from appwrite/chore-update-sdks
Chore update sdks
2023-11-27 15:04:48 +13:00
shimon
c9a4eb0a49 tests fix 2023-11-26 22:57:57 +02:00
shimon
1869852985 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/controllers/shared/api.php
	composer.lock
	src/Appwrite/Platform/Workers/Deletes.php
2023-11-26 16:29:18 +02:00
shimon
21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
prateek banga
1720acb2b4 lint fix 2023-11-21 12:32:30 +05:30
Prateek Banga
aa6a1a2e31
Update src/Appwrite/Migration/Version/V19.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-11-21 12:24:08 +05:30
prateek banga
022f0a663e changes array search for cursorAfter query 2023-11-21 12:23:36 +05:30
prateek banga
7e625ba653 adds queries support in documentsIterator 2023-11-21 11:48:27 +05:30
Prateek Banga
72b4c78c9f
Merge branch '1.4.x' into chore-migration-enum-attribute-size 2023-11-21 11:06:05 +05:30
Christy Jacob
39df6e443a Merge branch 'get-migration-stats' of github.com:appwrite/appwrite into get-migration-stats 2023-11-20 20:26:51 -05:00
Christy Jacob
8eb8351d5f feat: add migration counts to hamster 2023-11-20 20:26:38 -05:00
Christy Jacob
9d31d8d950
Update src/Appwrite/Platform/Tasks/GetMigrationStats.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2023-11-20 20:10:56 -05:00
Christy Jacob
f81d675609 feat: run linter 2023-11-20 20:10:24 -05:00
Christy Jacob
28c61acec6 feat: update migration task 2023-11-20 19:39:07 -05:00
Christy Jacob
9a12ab8f8a feat: add migration stats task 2023-11-20 19:36:53 -05:00
prateek banga
da3798e52f review changes 2023-11-20 23:31:34 +05:30
prateek banga
b2381798ab migrates enum attribute size to 255 2023-11-20 22:01:20 +05:30
Jake Barnby
8b14d96151
Merge remote-tracking branch 'origin/1.4.x' into chore-update-sdks 2023-11-21 00:17:36 +13:00
shimon
336afc5ca2 Merge branch 'main' of github.com:appwrite/appwrite into remove-deletes-db-leftovers 2023-11-19 15:30:36 +02:00
Steven Nguyen
a96e571258 Bump appwrite version to 1.4.13 2023-11-17 20:11:56 +00:00
Khushboo Verma
695d6f4065 Renamed variables 2023-11-18 00:04:57 +05:30
loks0n
61e2b7a787 feat: more phone validation 2023-11-17 18:09:20 +00:00
Khushboo Verma
93f58fb876 Merge branch '1.4.x' into fix-error-logging 2023-11-17 19:30:58 +05:30
Khushboo Verma
7902defe69 Addressed PR comments 2023-11-17 19:29:57 +05:30
shimon
e079d4a8b5 comparison fix 2023-11-16 23:42:03 +02:00
shimon
174449ce49 comparison fix 2023-11-16 23:14:26 +02:00
Khushboo Verma
18994d308a Merge branch '1.4.x' into fix-error-logging 2023-11-17 00:20:41 +05:30
shimon
8c9a662e14 comparison fix 2023-11-16 20:33:37 +02:00
shimon
dceb1858b0 comparison fix 2023-11-16 20:31:53 +02:00
Khushboo Verma
c34dc4dae0 Add flag to send logs to logger 2023-11-16 23:51:09 +05:30
Jake Barnby
02b6659b35
SDK releases 2023-11-16 21:50:39 +13:00
Christy Jacob
8e911dc83e
Merge pull request #7150 from appwrite/chore-update-version
chore: update versions and changelog
2023-11-15 11:02:01 -08:00
Christy Jacob
6826a9efe0
Merge pull request #7124 from appwrite/usage-auto-skip-fix
wrapping create stats query
2023-11-15 10:38:47 -08:00
德华 刘
37e1e25170 chore: update versions and changelog 2023-11-15 18:31:33 +00:00
Christy Jacob
90ea00398b
Merge pull request #7138 from appwrite/chore-update-database
Chore update database
2023-11-15 10:28:24 -08:00
Christy Jacob
e36dc817fb
Merge branch '1.4.x' into usage-auto-skip-fix 2023-11-15 10:27:44 -08:00
Christy Jacob
bc09b50c11
Merge pull request #7095 from appwrite/feat-delete-orphaned-projects
Add commit flag to delete orphaned projects task
2023-11-15 10:12:00 -08:00
shimon
6b5e734dfa indentation small fix 2023-11-15 20:09:50 +02:00
德华 刘
7efecbca8b chore: fixed indentation 2023-11-15 17:20:50 +00:00