CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-08-19 12:11:55 +12:00
Code Issues Projects Releases Wiki Activity
18662 commits 229 branches 398 tags 310 MiB
Commit graph

10361 commits

Author SHA1 Message Date
Steven Nguyen
6d17f8e877
Fix user last activity not updating 
Add back a section of code that was mistakenly removed.
 2023-12-15 21:37:26 +00:00
德华 刘
6b6946e39b chore: update console 2023-12-15 20:40:04 +00: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
Steven Nguyen
92a307c164
Fix user identity attaching to wrong user 
Suppose a user has 2 accounts on Appwrite:

1. joe@example.com
2. joe@gmail.com

Prior to this PR, if joe@example.com created a Google OAuth2 session
using his joe@gmail.com email, a new joe@gmail.com identity would be
created linked to joe@example.com.

This is especially problematic because if the user tried to create a
Google OAuth2 session using joe@gmail.com, Appwrite would lookup the
user via email and find the joe@gmail.com user, but then find an
identity from joe@example.com. This mismatching user ID would then
cause an error.

This PR prevents an identity from being created if the email from the
OAuth2 provider matches another user's email.
 2023-12-13 18:45:05 +00:00
Torsten Dittmann
9bc52e8900 fix: commatation in email html 2023-12-13 18:08:36 +01:00
Torsten Dittmann
7645d6c34a fix: email templates 2023-12-13 17:46:14 +01:00
Serhat Aksakal
e56b30e6a6
Update tr.json 2023-12-13 12:10:44 +03:00
德华 刘
f334168f90 fix: remove expired cookie 2023-12-13 08:45:47 +00: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
Damodar Lohani
5c3bd741b4 fix resources 2023-12-12 11:26:14 +00:00
Damodar Lohani
d8fe96e300 set project resource 2023-12-12 11:08:14 +00:00
Damodar Lohani
104b8bb366 provide retention time as queue server resource 2023-12-12 08:07:24 +00:00
Torsten Dittmann
5e74c5bbc4 fix: typo usage 2023-12-11 17:12:43 +01:00
Torsten Dittmann
3485373cd7 chore: generate specs 2023-12-11 16:40:19 +01:00
Torsten Dittmann
7d5f926d9c Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-11 16:37:27 +01:00
Torsten Dittmann
2657247b50 bump: console version 2023-12-11 16:37:14 +01:00
Torsten Dittmann
1794b1395a chore: run formatter 2023-12-11 16:33:15 +01:00
Torsten Dittmann
ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
Torsten Dittmann
b87231153e chore: bump console version number 2023-12-10 21:38:34 +01:00
Torsten Dittmann
f8878ac039 chore: generate specs 2023-12-10 21:29:32 +01:00
Torsten Dittmann
c37e31e6c3 fix: inconsistent timestamp generation 2023-12-10 20:58:38 +01:00
Torsten Dittmann
bb934080ba feat: project usage custom date range 2023-12-10 10:26:33 +01:00
Christy Jacob
4f1d8ed6f4 fix: revert files 2023-12-09 01:36:57 +01:00
Christy Jacob
951a749b50 fix: revert files 2023-12-09 01:19:36 +01:00
Christy Jacob
c21a063642 fix: failing tests 2023-12-09 01:02:13 +01:00
Christy Jacob
8b5783d3ff fix: update setParam 2023-12-08 21:02:07 +01:00
Christy Jacob
ab84fa8a4d Merge branch 'fix-cookie-issue' of github.com:appwrite/appwrite into fix-cookie-issue 2023-12-08 20:39:14 +01:00
Christy Jacob
9dca3c4300 fix: linter 2023-12-08 20:38:55 +01:00
Christy Jacob
5606402fa3
Merge branch '1.4.x' into fix-cookie-issue 2023-12-08 20:37:06 +01:00
Christy Jacob
5d121c1887 fix: reset the legacy cookie 2023-12-08 20:36:22 +01:00
Christy Jacob
eb61d5c25c chore: reset old cookie 2023-12-08 20:24:07 +01:00
Christy Jacob
f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
Torsten Dittmann
c1af9f4201 feat: upgrade console to 3.2.15 2023-12-08 18:09:06 +01:00
Torsten Dittmann
14e2488f98 chore: bump version 2023-12-05 18:20:47 +01:00
德华 刘
f127ca651f chore: update console version 2023-12-05 00:54:52 +00:00
Torsten Dittmann
d79411813a bump: version 2023-12-04 10:45:18 +01:00
德华 刘
65b1e1e948 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-refactor-hamster 2023-11-30 21:26:49 +00:00
德华 刘
8218e95f17 chore: revert console 2023-11-30 21:26:07 +00: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
德华 刘
11a9583c72 feat: update cache buster 2023-11-30 21:16:17 +00:00
德华 刘
e382a9d58b feat: update console 2023-11-30 20:37:59 +00:00
shimon
f16aa598e2 console::billing 2023-11-30 19:51:51 +02:00
德华 刘
799fe2acca chore: address review comments 2023-11-30 17:43:07 +00:00
德华 刘
f3544485e5 chore: address review comments 2023-11-30 17:41:23 +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
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
Torsten Dittmann
5179c4d08a chore: upgrade console to 3.2.9 2023-11-21 12:08:26 +01:00
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
Jake Barnby
6ad4566b6b
Update CLI 2023-11-21 00:15:50 +13:00
Steven Nguyen
a96e571258 Bump appwrite version to 1.4.13 2023-11-17 20:11:56 +00:00
Steven Nguyen
926e1f3fc8 Bump console to version 3.2.8 2023-11-17 19:34:33 +00:00
Khushboo Verma
695d6f4065 Renamed variables 2023-11-18 00:04:57 +05:30
Khushboo Verma
03e8a29e8d Merge branch '1.4.x' into fix-error-logging 2023-11-18 00:02:03 +05:30
Khushboo Verma
a76efe7d4e
Merge branch '1.4.x' into fix-rate-limit-error-on-large-uploads 2023-11-17 21:19:27 +05:30
Prateek Banga
b68be491b9 updated description 2023-11-17 20:59:09 +05:30
Prateek Banga
9183f2a875 changes enum size validation in update controller 2023-11-17 20:56:18 +05:30
Khushboo Verma
2a2ff34e20 Merge branch '1.4.x' into fix-error-logging 2023-11-17 20:37:36 +05:30
Prateek Banga
ab35b75c37 fix test message 2023-11-17 20:14:55 +05:30
Prateek Banga
228b813994 fixes test case 2023-11-17 20:06:28 +05:30
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
Prateek Banga
827ad84f53 fixes adding longer length enum 2023-11-17 19:09:31 +05:30
Khushboo Verma
cf1c914edb
Update app/controllers/general.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2023-11-17 18:36:03 +05:30
Khushboo Verma
9329287982
Update app/controllers/general.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2023-11-17 18:35:51 +05:30
Khushboo Verma
40ec98569e
Update app/controllers/general.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2023-11-17 18:35:26 +05:30
Khushboo Verma
c34dc4dae0 Add flag to send logs to logger 2023-11-16 23:51:09 +05:30
Khushboo Verma
fccbe405db Add chunkId to abuse key to prevent rate limit for SDKs 2023-11-16 23:04:38 +05:30
Jake Barnby
02b6659b35
SDK releases 2023-11-16 21:50:39 +13:00
德华 刘
37e1e25170 chore: update versions and changelog 2023-11-15 18:31:33 +00:00
Steven Nguyen
31d5b75034 Bump console to version 3.2.7 2023-11-15 17:23:35 +00:00
Torsten Dittmann
115ca23a58
Merge pull request #5174 from yatharth1706/fix-4797-verified-user-getting-email-verifications 
Fix verified user getting email verifications
 2023-11-15 13:35:23 +01:00
Khushboo Verma
2e70ed59af Fix git installation deletion 2023-11-15 11:41:42 +05:30
Matej Bačo
7e1b618769 Fix permission issues with repositories collection 2023-11-14 16:50:59 +01:00
Khushboo Verma
141b864a56 Update permissions for create repository document 2023-11-14 19:49:23 +05:30
Matej Bačo
967854d34a Fix grammar 2023-11-13 14:39:33 +01:00
Matej Bačo
a029287e5a Implement health tresholds 2023-11-13 14:07:11 +01:00
Jake Barnby
4d54e7bb36
Update version + cache buster 2023-11-10 13:09:00 +13:00
德华 刘
f70b418c5c chore: updates for appwrite 1.4.10 2023-11-09 15:57:37 +00:00
Christy Jacob
d33b8c2ce1
Merge branch '1.4.x' into fix-null-password-history 2023-11-09 07:44:44 -08:00
Bradley Schofield
56310bc4fa
Merge branch 'main' into fix-null-password-history 2023-11-09 10:41:17 +00:00
Steven Nguyen
0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications 2023-11-08 17:37:43 -08:00
Eldad A. Fux
d64d56069f
Merge pull request #6828 from appwrite/feat-improve-migration-validations 
Improve Error Handling and Add more Validation
 2023-11-08 16:03:04 -05:00
shimon
d54615d376 project.php 2023-11-08 18:12:36 +02:00
Bradley Schofield
54e5985940 Fix wrong operator for password history 
This fixes a potential chance for nulls to be introduced into the password history array when $password is null and $passwordHistory != 0
 2023-11-08 14:35:16 +00:00
shimon
dd9d8010c1 db health api throws an error when ping fails 2023-11-08 15:20:50 +02:00
shimon
ad63a377ab added inf metric 2023-11-08 11:09:32 +02:00
Christy Jacob
fd7b354113
Merge pull request #7084 from appwrite/fix-proxy-create-rule-500 
fix: proxy create rule 500
 2023-11-07 10:49:52 -08:00
Christy Jacob
8feb01d857
Merge pull request #7085 from appwrite/fix-missing-sessionId-error 
fix: missing sessionId error
 2023-11-07 10:43:05 -08:00
Christy Jacob
2d2400fdff
Merge branch '1.4.x' into fix-missing-sessionId-error 2023-11-07 10:27:46 -08:00
Christy Jacob
f4cdd0accc
Merge branch '1.4.x' into fix-proxy-create-rule-500 2023-11-07 10:27:31 -08:00
德华 刘
9acc23049c Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.4.x-main 2023-11-07 18:12:58 +00:00
Christy Jacob
f53fbc19d4
Merge branch '1.4.x' into fix-missing-functionId-error 2023-11-07 10:10:03 -08:00
Bradley Schofield
d5d7440a68 Merge branch 'main' into feat-improve-migration-validations 2023-11-07 16:21:35 +00:00
Christy Jacob
cb512710f2
Merge pull request #7087 from appwrite/fix-4960-disabled-usage 
Ensure usage endpoints don't throw 500 when usage is disabled
 2023-11-07 07:34:06 -08:00
loks0n
7e37c973ce fix: missing functionId error on create execution 2023-11-07 10:25:33 +00:00
Steven Nguyen
55a73efeab Ensure usage endpoints don't throw 500 when usage is disabled 2023-11-06 21:28:45 +00:00
loks0n
dfc8c919d4 fix: missing sessionId error 2023-11-06 15:06:56 +00:00
loks0n
75669b9b2e chore: better error msg 2023-11-06 14:49:33 +00:00
loks0n
4440859c05 chore: fmt 2023-11-06 14:48:54 +00:00
loks0n
61c5f371b7 chore: use base Exception 2023-11-06 14:45:56 +00:00
loks0n
8b24c44fb9 fix: proxy create rule 500 2023-11-06 14:44:00 +00:00
Jake Barnby
1429c82aa0
Make VCS, proxy and migrations services non-optional so they aren't toggled with enable/disable all service routes 2023-11-06 12:04:56 +13:00
shimon
f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
 2023-11-05 17:03:13 +02:00
Yatharth Verma
0ecdeed329 Checkout to latest tag of console submodule 2023-11-04 13:01:05 +05:30
Steven Nguyen
9f7bbe4869 Fix the Health service's get X queue endpoints 
Before this, the endpoints called $client->sumProcessingJobs() which
only gets the currently processing jobs, but this endpoint should return
what's currently in queue, pending to be processed. This should be
retrieved using $client->getQueueSize().
 2023-11-03 16:57:30 +00:00
Christy Jacob
9fc7c1384a
Merge pull request #7071 from appwrite/fix-swoole-warning 
feat: fix swoole warning
 2023-11-03 19:46:59 +04:00
loks0n
305c781206 feat: fix swoole warning 2023-11-03 12:18:24 +00:00
Bradley Schofield
23631f8282 Update specs 2023-11-02 17:12:08 +00:00
Bradley Schofield
d921c03ee1 Update mock.php 2023-11-02 17:07:16 +00:00
Bradley Schofield
b15dac16c8 Revert "Remove Mock API" 
This reverts commit 2d045335ff.
 2023-11-02 17:05:51 +00:00
Bradley Schofield
2d045335ff Remove Mock API 2023-11-02 17:05:31 +00:00
Bradley Schofield
e158d134b0 Merge branch 'main' into feat-improve-migration-validations 2023-11-02 10:48:38 +00:00
shimon
1c1028412a refactor users, project, functions usage display 2023-11-01 20:44:06 +02:00
shimon
04290730b2 refactor storage, databases usage display 2023-11-01 17:20:12 +02:00
Christy Jacob
281b50ba4a
Merge pull request #7063 from appwrite/1.4.x 
1.4.x
 2023-11-01 12:32:11 +04:00
Steven Nguyen
755699de8a
Bump appwrite version to 1.4.9 2023-10-31 12:40:45 -07:00
Steven Nguyen
7c8a9ad4d2
Fix incorrect general_protocol_unsupported error 
$requestHeaders was being referenced before it was set. This PR reverts
code back to using $swooleRequest to extract the header.
 2023-10-31 18:31:36 +00:00
Christy Jacob
9fded16d3f
Merge pull request #7053 from appwrite/1.4.x 
Sync main with 1.4.x
 2023-10-31 12:27:08 +04:00
德华 刘
744f2fbc1c chore: update project creation database allocation 2023-10-30 14:46:54 +00:00
Steven Nguyen
c1df289df7
Bump appwrite version to 1.4.8 2023-10-27 10:31:43 -07:00
Steven Nguyen
3abb74c937
Bump console to version 3.2.5 2023-10-27 09:33:21 -07:00
Christy Jacob
106f4cfc45
Merge pull request #6487 from appwrite/fix-unique-in-errors 
Updated error message to not user magic strings
 2023-10-27 20:13:16 +04:00
Christy Jacob
bcdebee598
Merge pull request #7024 from appwrite/fix-cookie-header 
Fix: Cookie Header
 2023-10-27 19:36:05 +04:00
Matej Bačo
9a6d5f8101 Improve var name 2023-10-27 17:25:19 +02:00
Matej Bačo
71807635b3 Move cookie-header logic to request 2023-10-27 17:23:43 +02:00
Christy Jacob
e17bb94e39
Merge pull request #6495 from appwrite/fix-mails 
Fix certificate emails and add support for variables in email template subject
 2023-10-27 19:17:50 +04:00
Christy Jacob
21220a2051
Merge pull request #6894 from appwrite/refactor-vcs-tests 
Add VCS tests
 2023-10-27 19:04:44 +04:00
德华 刘
6d237853e6 chore: revert console 2023-10-27 14:38:09 +00:00
Khushboo Verma
cba20d8b96 Addressed PR comments 2023-10-27 19:38:33 +05:30
Khushboo Verma
36fcc6c293 Resolve merge conflicts 2023-10-27 18:13:50 +05:30
Christy Jacob
3700751592
Merge pull request #7016 from appwrite/main 
Sync 1.4.x with main
 2023-10-27 13:35:54 +04:00
Matej Bačo
740d9def8e Linter fix 2023-10-27 10:33:08 +02:00
Matej Bačo
94ff3baa9c Fix cookie headers 2023-10-27 10:26:46 +02:00
Jake Barnby
cb03ad1a15
Merge pull request #7003 from appwrite/feat-query-metadata 
Feat query metadata
 2023-10-27 12:52:34 +13:00
Steven Nguyen
836ce852ed
Refactor email templates 
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.

It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
 2023-10-26 16:47:14 -07:00
Steven Nguyen
3206cee36f
Leave user placeholder in default email template 
This matches up with the default template and gives the developer an
idea about the available variables and how to use them.
 2023-10-26 16:23:58 -07:00
Steven Nguyen
70a3820009
Remove unused mail vars 2023-10-26 16:23:58 -07:00
Jake Barnby
89236955fb
Fix setting metadata 2023-10-26 22:28:23 +13:00
Jake Barnby
995c404f35
Update db 2023-10-26 21:24:30 +13:00
Torsten Dittmann
404ad8653d fix: worker permissions reset 2023-10-25 19:23:55 +02:00
shimon
4c6976488c clean up 2023-10-25 15:06:54 +03:00