CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-08-18 19:51:55 +12:00
Code Issues Projects Releases Wiki Activity
19614 commits 229 branches 397 tags 309 MiB
Commit graph

11036 commits

Author SHA1 Message Date
Jake Barnby
189406635a
Use internal ID for subquery 2024-01-15 18:25:34 +13:00
Jake Barnby
e21e2c70ea
Remove redundant index 2024-01-15 18:18:09 +13:00
Jake Barnby
44a28173e4
Merge branch '1.5.x' into feat-remove-apns-endpoint 2024-01-15 16:33:43 +13:00
loks0n
0a0479f4c5 chore: fmt 2024-01-13 10:11:25 +00:00
loks0n
521cb963a5 fix: hide oauth in specs 2024-01-13 10:09:02 +00:00
loks0n
56fe939713 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-13 09:55:44 +00:00
loks0n
d2ff3f6bb8 docs: standardise account md names 2024-01-13 09:32:03 +00:00
Khushboo Verma
088ed95f69 Force background color to white for now 2024-01-13 01:18:20 +05:30
Khushboo Verma
c2ab8a1472 Addressed PR comments 2024-01-13 01:08:18 +05:30
Khushboo Verma
77ded21d20 Merge branch '1.5.x' into feat-migrate-cloud-templates 2024-01-13 00:54:49 +05:30
loks0n
642582c283 docs: fix links to create email password session 2024-01-12 17:39:44 +00:00
loks0n
07da41bd69 docs: better descriptions for create token params 2024-01-12 17:35:16 +00:00
loks0n
c8ce360ce9 chore: remove 'universal' references 2024-01-12 17:30:36 +00:00
loks0n
02b83bf26e chore: changes to expire param create token 2024-01-12 17:28:56 +00:00
loks0n
ca511bd459 chore: use customId validators 2024-01-12 17:26:01 +00:00
loks0n
90c5d6413c feat: create new user if none create session 2024-01-12 17:14:11 +00:00
loks0n
ee96b220c3 docs: create session 2024-01-12 17:10:23 +00:00
Matej Bačo
e9de0332cc
Remove passwordAgain (#7441) 2024-01-12 14:33:10 +01:00
Torsten Dittmann
0a4c62085c chore: run linter 2024-01-12 14:06:52 +01:00
Torsten Dittmann
e2a0c2d825 sync: with 1.5.x 2024-01-12 14:04:31 +01:00
loks0n
2bbcdf61dd Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-12 12:14:28 +00:00
Matej Bačo
b8b9fe383d Fix token param 2024-01-12 13:12:28 +01:00
loks0n
487376afd6 chore: oauth token param before scopes 2024-01-12 12:08:45 +00:00
Khushboo Verma
a9ccfa1ab0 Added cloud base templates to appwrite/appwrite 2024-01-12 14:43:17 +05:30
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
Khushboo Verma
d443602cbc resolve merge conflicts 2024-01-12 01:55:32 +05:30
Khushboo Verma
377751f4a4 Remove extra text generated by GPT for la.json 2024-01-12 01:38:04 +05:30
Torsten Dittmann
99259ebf2b fix: enable mfa in console 2024-01-11 20:24:37 +01:00
Khushboo Verma
807d295303 Resolve merge conflicts 2024-01-11 22:49:33 +05:30
Khushboo Verma
74b9324001 Use strip_tags in post request too 2024-01-11 21:58:21 +05:30
Christy Jacob
6aa707fff2
Merge pull request #7424 from appwrite/feat-security-phrases 
Added security phrase to magic URL
 2024-01-11 19:13:06 +04:00
loks0n
9068941772 feat: create user with create token if not exists 2024-01-11 14:55:37 +00:00
Khushboo Verma
5f42326514 Added sms translation key for all languages 2024-01-11 20:24:07 +05:30
Khushboo Verma
d922feb4c7 Use strip_tags to remove <p> tag 2024-01-11 18:54:08 +05:30
Khushboo Verma
dc0b0c8ab7 Merge branch '1.5.x' into fix-otp-template 2024-01-11 18:24:45 +05:30
Khushboo Verma
c84af966df Make OTP template more contextual 2024-01-11 18:20:01 +05:30
loks0n
269d70e9ca chore: specs 2024-01-11 11:56:03 +00:00
loks0n
e356e42a2c chore: update console 2024-01-11 11:54:50 +00:00
loks0n
136faf9630 docs: improve exchange endpoint desc 2024-01-11 10:54:41 +00:00
Matej Bačo
34bac3dc5c
Merge branch '1.5.x' into feat-security-phrases 2024-01-11 11:54:16 +01:00
loks0n
032ce1ec0c feat: standardise token length 2024-01-11 10:51:26 +00:00
Matej Bačo
70d57b17a0 Fix copies 2024-01-11 10:36:31 +00:00
Matej Bačo
a2856f6acc Update copy & AI translations 2024-01-11 10:23:25 +00:00
Matej Bačo
ed28bb9295 Merge remote-tracking branch 'origin/1.5.x' into feat-improve-logging 2024-01-11 10:22:50 +00:00
Matej Bačo
fe88829bf1 Update specs files 2024-01-11 10:10:00 +00:00
Jake Barnby
322dae626a
Merge branch '1.5.x' into feat-message-scheduling 2024-01-11 22:29:49 +13:00
Jake Barnby
aca07a20c7
Merge branch 'main' into 1.5.x 2024-01-11 22:28:50 +13:00
Matej Bačo
539bee8850
Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2024-01-11 10:20:51 +01:00
Matej Bačo
e485953da6 AI translations 2024-01-11 08:49:52 +00:00
Matej Bačo
e0db651240 Revert "Translated security phrase copy with AI" 
This reverts commit b72dd35f45.
 2024-01-11 08:25:09 +00:00
Jake Barnby
5827c52372
Merge branch '1.5.x' into feat-search-subscribers 2024-01-11 20:04:17 +13:00
Jake Barnby
320919fef2
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 2024-01-11 19:59:59 +13:00
Jake Barnby
cb3e354cf1
Fix tests 2024-01-11 19:47:55 +13:00
Jake Barnby
38e9aefa2f
Update compose 2024-01-11 16:14:38 +13:00
Jake Barnby
a40c6fce64
Add resource collection to schedules 2024-01-11 16:00:48 +13:00
Jake Barnby
9063b4e77f
Fix controller scheduling, ensuring created when message updated and none exists 2024-01-11 15:58:24 +13:00
Jake Barnby
b9892b857a
Make const int easier to read 2024-01-11 15:54:44 +13:00
Steven Nguyen
74a7ffbf7a
Default topic description to an empty string instead of null 
Not using nulls makes things more type safe.
 2024-01-11 02:06:56 +00:00
Jake Barnby
513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp 
# Conflicts:
#	app/controllers/api/messaging.php
#	tests/e2e/Services/Messaging/MessagingBase.php
 2024-01-11 13:06:15 +13:00
Torsten Dittmann
07f44593c0 feat: delete authenticator endpoint 2024-01-10 17:22:32 +01:00
Matej Bačo
2d204d593a code formatting 2024-01-10 15:10:05 +00:00
Matej Bačo
bf14d1d97d Add random security phrases 2024-01-10 15:09:39 +00:00
Matej Bačo
b72dd35f45 Translated security phrase copy with AI 2024-01-10 15:01:42 +00:00
Matej Bačo
931efe24a9 Added security phrase to magic URL 2024-01-10 14:52:32 +00:00
Khushboo Verma
f6830f4e85 Resolve merge conflict 2024-01-10 19:38:55 +05:30
Khushboo Verma
7393bfc244 Use phtml instead of translation files for webhook email 2024-01-10 19:35:25 +05:30
Matej Bačo
4e73c76538 Add OTP email template 2024-01-10 13:28:49 +00:00
Matej Bačo
788fa04606 Improve magic URL design 2024-01-10 11:33:55 +01:00
loks0n
310d75b6be feat: update assistant 2024-01-10 10:17:52 +00:00
loks0n
94e45da5c7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-10 10:15:29 +00:00
Khushboo Verma
ef88ad6514 Updated the email 2024-01-10 15:03:36 +05:30
Khushboo Verma
b74c7671e8 Resolve merge conflicts 2024-01-10 13:13:09 +05:30
Torsten Dittmann
670b719ba9 fix: generate specs 2024-01-10 00:06:43 +01:00
Steven Nguyen
e7d3797234
Remove the endpoint param for APNS providers 
The endpoint was removed from utopia-php/messaging.
 2024-01-09 21:30:56 +00:00
Khushboo Verma
b3e87d7de8 Formatted email as per design 2024-01-10 01:55:36 +05:30
loks0n
332bd532e1 fix: specs 2024-01-09 19:04:47 +00:00
loks0n
428910a176 chore: specs 2024-01-09 16:42:25 +00:00
loks0n
9a34c92fac Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-09 16:42:00 +00:00
loks0n
ded48cb618 chore: fmt 2024-01-09 16:41:42 +00:00
loks0n
d9b25a3167 feat: add token param to oath 2024-01-09 16:38:29 +00:00
Matej Bačo
c8b544da03 Improve button design 2024-01-09 16:06:24 +00:00
loks0n
de2a4e754a feat: alias PUT token methods for backwards compat 2024-01-09 15:56:01 +00:00
Torsten Dittmann
bc384cac8d fix: response model 2024-01-09 16:47:43 +01:00
Matej Bačo
beeb643c66 Add all translations 2024-01-09 15:39:38 +00:00
Torsten Dittmann
5a97c9104c fix: collections merge conflict 2024-01-09 16:36:49 +01:00
Torsten Dittmann
cb25d5209e fix: di 2024-01-09 16:30:18 +01:00
loks0n
d4ba4bf969 chore: update specs 2024-01-09 15:04:32 +00:00
Matej Bačo
86158838a1 Magic URL improvements 2024-01-09 12:23:13 +00:00
Torsten Dittmann
d344ba46c4
feat: account delete (#7415) 
* feat: account delete

* chore: run specs

* release: console sdk

* chore: run formatter

* tests: fix project tests
 2024-01-09 12:58:36 +01:00
Jake Barnby
af019369e9
Merge branch 'main' into 1.5.x 2024-01-09 22:03:35 +13:00
Eldad A. Fux
b0a8aac0b7
Merge pull request #7348 from appwrite/fix-delete-identity-event 
Update the delete identity endpoints to set the params and payload
 2024-01-09 07:52:08 +01:00
Steven Nguyen
44182b4444
Fix incorrect response model 2024-01-09 03:10:43 +00:00
Jake Barnby
b3819186cb
Fix chunked upload file ID validation for first chunk 2024-01-09 15:38:56 +13:00
Jake Barnby
baf807d389
Merge remote-tracking branch 'origin/1.5.x' into json-parsing 
# Conflicts:
#	composer.lock
 2024-01-09 14:08:39 +13:00
Jake Barnby
51b2019ab6
Merge remote-tracking branch 'origin/1.5.x' into json-parsing 
# Conflicts:
#	composer.lock
 2024-01-09 13:56:01 +13:00
Jake Barnby
219f091925
Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 12:40:07 +13:00
Khushboo Verma
6b018d2f16 Add const for max file size 2024-01-09 01:41:48 +05:30
Khushboo Verma
5588dfca8b WIP: Send email to user when webhook is stopped 2024-01-09 01:25:24 +05:30
shimon
472712dbb7 update utopia-framework version 2024-01-08 19:30:27 +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
Torsten Dittmann
b8e6de7516 chore: generate specs 2024-01-08 13:24:52 +01:00
Torsten Dittmann
7c66481406 fix: collections for mfa 2024-01-08 13:22:33 +01:00
loks0n
5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00:00
Torsten Dittmann
bbf6480c15 fix: merge conflicts 2024-01-08 12:31:46 +01:00
Torsten Dittmann
208abe17e7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-08 12:20:08 +01:00
Matej Bačo
fae28b468c Fix password hashing bug 2024-01-07 13:40:45 +01:00
Khushboo Verma
842045874e Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-07 00:27:06 +05:30
Khushboo Verma
bbd551cf0d Reset attempts to 0 on successful request 2024-01-05 17:54:20 +05:30
Matej Bačo
e5f0e00742 Apply password validation to all places 2024-01-05 12:31:38 +01:00
Matej Bačo
0a2be34ceb Fix PHP refference bug 2024-01-05 12:07:41 +01:00
Khushboo Verma
6d8443d5cd Addressed PR comments 2024-01-05 15:13:54 +05:30
Steven Nguyen
7e9525f0f9
Update validation of topics, users, and targets 
They should be an array of UID and not just array of Text.
 2024-01-05 00:10:57 +00:00
Matej Bačo
ba32170f72 Improve password validator hook 2024-01-04 16:26:15 +01:00
Khushboo Verma
fb9e393c97 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-04 16:42:47 +05:30
Khushboo Verma
431e26c153 Allow certain domains to skip validation 2024-01-04 16:37:15 +05:30
Steven Nguyen
0c3ed13ad3
Fix _APP_CONSOLE_HOSTNAMES check 
Ensure invalid hostnames such as empty strings are not added as a
hostname.
 2024-01-03 20:39:19 +00:00
Steven Nguyen
d2d36bbfae
Add changes from previous console platforms variable PR 
See https://github.com/appwrite/appwrite/pull/4581
 2024-01-03 20:38:42 +00:00
Steven Nguyen
faf39fcc81
Fix _APP_CONSOLE_HOSTNAMES check 
Ensure invalid hostnames such as empty strings are not added as a
hostname.
 2024-01-03 19:30:49 +00:00
Steven Nguyen
06e385b346
Add changes from previous console platforms variable PR 
See https://github.com/appwrite/appwrite/pull/4581
 2024-01-03 19:30:42 +00:00
Utkarsh Ahuja
a74e5cc2c6
Merge branch '1.5.x' into feat-zoho-oauth 2024-01-03 11:24:24 +05:30
Utkarsh Ahuja
73303c374b Merge branch 'feat-zoho-oauth' of https://github.com/UtkarshAhuja2003/appwrite into feat-zoho-oauth 2024-01-03 11:22:02 +05:30
Utkarsh Ahuja
d18d187a07 fix: base changed 2024-01-03 11:20:59 +05:30
Damodar Lohani
640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Steven Nguyen
50aab32f0f
Add search param for list subscribers endpoint 2024-01-02 23:39:46 +00:00
Torsten Dittmann
0a17e2bce9
feat: add new env variable to compsoe files 2024-01-02 19:53:37 +00:00
Torsten Dittmann
a29cef2334
feat: console hostname env variable 2024-01-02 19:53:20 +00:00
Khushboo Verma
cfca9f232c Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-02 21:57:58 +05:30
Matej Bačo
92c4c52a81 QA changes 2024-01-02 13:02:11 +00:00
Matej Bačo
0ba768125d Merge remote-tracking branch 'origin/1.5.x' into feat-improve-logging 2024-01-02 11:08:47 +00:00
Matej Bačo
554e9f93b6 Implement max password length 2024-01-02 10:59:35 +00:00
Khushboo Verma
f14285b65b Update webhook endpoints 2024-01-02 16:17:02 +05:30
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
Utkarsh Ahuja
c2a76cd560
Merge branch 'main' into feat-zoho-oauth 2024-01-02 13:17:25 +05:30
Damodar Lohani
879320e23e
update comment regarding validation 2024-01-02 11:53:48 +05:45
Damodar Lohani
b2b863f09f
Merge branch 'main' into fix-chunk-upload-permission 2024-01-02 11:51:09 +05:45
Utkarsh Ahuja
ef2a943f49
Merge branch 'main' into feat-zoho-oauth 2023-12-31 19:27:57 +05:30
Damodar Lohani
a2ad870084 use compression constant from utopia/storage 2023-12-31 11:46:45 +00:00
Utkarsh Ahuja
3e0f63e499
Merge branch 'main' into feat-zoho-oauth 2023-12-31 17:11:26 +05:30
Eldad A. Fux
f5705df02c
Merge pull request #7351 from appwrite/pea-33-improve-large-files-handling 
Improve large file handling
 2023-12-31 08:48:32 +01:00
Eldad A. Fux
4f7b1748f4
Merge pull request #7276 from fanksin/patch-1 
Update tr.json
 2023-12-31 00:24:30 +01:00
Torsten Dittmann
cc1272f80b feat: add new env variable to compsoe files 2023-12-29 22:09:59 +01:00
Torsten Dittmann
9b2fbc5c52 feat: console hostname env variable 2023-12-29 21:52:50 +01:00
Steven Nguyen
3d1b61d20d
Bump console to version 3.3.15 2023-12-29 19:27:44 +00:00
Steven Nguyen
643f5e845a
Bump console to version 3.3.14 2023-12-29 19:16:57 +00:00
Damodar Lohani
1c236959ba fix algorithm attribute on file if size is above read buffer size 2023-12-29 01:49:56 +00:00
shimon
bf0f1ee12c console version update + db lib version update 2023-12-28 16:27:34 +02:00
Damodar Lohani
9cb5eb0180 use constants for compression type 2023-12-28 11:42:40 +00:00
Damodar Lohani
a28be2bf48 return when response is sent to prevent further execution 2023-12-28 11:32:04 +00:00
Damodar Lohani
5455db7c7f improve order 2023-12-28 11:26:45 +00:00
shimon
260b280e10 preview_output_fix 2023-12-28 11:54:21 +02:00
Khushboo Verma
d418a581b7 Allow only public domains in webhook url 2023-12-28 15:16:08 +05:30
Damodar Lohani
94a18ede78 fix formatting 2023-12-28 01:35:10 +00:00
Damodar Lohani
e8ff828039 fix for file extension not supported 
- the error occured with jfif extension, which is essentially a jpeg file
 2023-12-28 01:31:25 +00:00
Torsten Dittmann
0fdc28e034
Merge pull request #7280 from appwrite/fix-7190-user-identity-incorrect-user 
Fix user identity attaching to wrong user
 2023-12-28 01:59:58 +01:00
Torsten Dittmann
d9b300051a
Merge pull request #7292 from appwrite/fix-7147-user-last-activity-not-updating 
Fix user last activity not updating
 2023-12-28 01:59:23 +01:00
Steven Nguyen
f1ba7b08ab
Update the delete identity endpoints to set the params and payload 
Because no payload was set, the event params (userId and identityId)
wasn't picked up automatically. This updates the endpoints so that the
payload is set, but also makes sure to set the userId and identityId
params since the identityId param's key doesn't match the key in the
payload.
 2023-12-27 23:35:32 +00:00
Damodar Lohani
cbd3e85b38 fix formatting 2023-12-25 06:07:28 +00:00
Damodar Lohani
26ac88c32e validate create permission while updating chunk uploaded file 2023-12-25 05:54:59 +00:00
fogelito
5d41442838 getPDOAttributes 2023-12-24 11:55:51 +02:00
fogelito
91b53c2a7f remove ATTR_ERRMODE 2023-12-23 17:48:28 +02:00
Utkarsh Ahuja
d9319aa888 feat: added zoho oauth metadata 2023-12-23 17:42:34 +05:30
Matej Bačo
bb0be27007 Update specs 2023-12-22 09:58:25 +00:00
Matej Bačo
a0b2443a8b Rename email endpoint 2023-12-22 09:38:52 +00:00
Matej Bačo
3f1faa44ad Rename form exchange to create 2023-12-22 09:31:19 +00:00
德华 刘
bf92ae6841 chore: update console 2023-12-22 09:19:27 +00:00
德华 刘
9ee949104f chore: update console 2023-12-21 19:05:18 +00:00
德华 刘
fac204b34e chore: update console 2023-12-21 15:57:38 +00:00
德华 刘
6303029f8a chore: update console 2023-12-21 15:02:28 +00:00
德华 刘
a47dcac424 chore: update console 2023-12-21 12:54:35 +00:00
Matej Bačo
9c510dace8 Update console 2023-12-20 13:30:15 +01:00
Matej Bačo
56a374e0af Upgrade console 2023-12-20 12:41:07 +01:00
fogelito
dc203a494e Syntax change 2023-12-20 12:55:09 +02:00
Matej Bačo
457e47cdd7 Upgrade console 2023-12-20 11:12:16 +01:00
Eldad Fux
90e8e04e08 Fixed test 2023-12-20 00:15:45 +01:00
Eldad Fux
ed999031d0 Fixed whitespace 2023-12-19 22:46:35 +01:00
Matej Bačo
683fccc080 Update console 2023-12-19 21:28:51 +01:00
prateek banga
5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
Matej Bačo
42246c5174 Fix console 2023-12-19 18:07:07 +01:00
Matej Bačo
b3729507de Add cache to console collection 2023-12-19 18:05:39 +01:00
loks0n
1b6a833bed fix: encode session for ssr clients 2023-12-19 15:45:44 +00:00
Eldad Fux
64138d6ccf Added new endpoint 2023-12-19 16:08:09 +01:00
loks0n
2c5c799d13 fix: add account session description 2023-12-19 14:24:49 +00:00
Matej Bačo
b301a58b3e Update console 2023-12-19 14:51:03 +01: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
Prateek Banga
6de2659793 adds mock providers in project for benchmarking, fixes bug in scheduling 
removes scheduling from array in schedulemessage task
 2023-12-18 15:27:09 +05:30
Jake Barnby
23b39fee02
FIx FCM tests 2023-12-17 12:41:20 +13:00
Matej Bačo
8c1363529e Add Hooks 2023-12-15 23:19:43 +01:00
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
Jake Barnby
fc101b7c05
Update lock 2023-12-15 18:24:37 +13:00
Jake Barnby
121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing 
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/Hamster.php
 2023-12-15 18:22:08 +13:00
Jake Barnby
9c79e6bc23
Fix cache purge 2023-12-15 17:45:25 +13:00
Khushboo Verma
557565b949 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-15 01:46:47 +05:30
Khushboo Verma
d5cc9d9eea Addressed PR Comments 2023-12-15 01:45:17 +05:30
fogelito
4ce312560b Connection problem 2023-12-14 18:17:19 +02:00
Jake Barnby
4e26bdb5df
Update update route params 2023-12-15 03:45:51 +13:00
Jake Barnby
7b99fab512
Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby
2eace5a627
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic 
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
 2023-12-15 02:47:59 +13:00
Jake Barnby
91e3ea4bae
Merge pull request #7287 from appwrite/fix-list-sizes 
Fix max array size 1
 2023-12-15 02:42:45 +13:00
Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 
# Conflicts:
#	app/config/errors.php
#	composer.lock
 2023-12-15 02:41:46 +13:00
fogelito
cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Jake Barnby
944e474ec4
Fix max array size 1 2023-12-15 02:30:44 +13: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
loks0n
3d4701abf4 Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-13 10:36:57 +00:00
loks0n
78878c6ba0 chore: fmt 2023-12-13 10:36:49 +00:00
Luke B. Silver
60a0fefe56
Merge branch '1.4.x' into feat-ssr 2023-12-13 10:32:13 +00:00
loks0n
0e25d3e1df fix: scopes 2023-12-13 10:25:20 +00:00
Jake Barnby
276d671921
Add temp parsing code 2023-12-13 22:45:01 +13: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
Khushboo Verma
16addeba10 Fixed some errors 2023-12-13 03:00:16 +05:30
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
loks0n
b2f118d23b fix: specs 2023-12-12 15:42:22 +00:00
loks0n
fe0001350d feat: use x-appwrite-session header 2023-12-12 15:39:24 +00:00
Damodar Lohani
5c3bd741b4 fix resources 2023-12-12 11:26:14 +00:00
loks0n
fda9df069a feat: enable array sdk.method 2023-12-12 11:24:50 +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
loks0n
453c1928ee fix: teams tests 2023-12-11 20:56:59 +00:00
loks0n
fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
Khushboo Verma
ff7cfc6602 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-12 00:17:21 +05:30
loks0n
cb788b13bf chore: remove unused imports 2023-12-11 18:36:17 +00:00
loks0n
1e8a931751 chore: format 2023-12-11 17:13:19 +00:00
loks0n
7ee4ad5ba9 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-11 16:52:14 +00:00
loks0n
f0d7312bd3 feat: create session method 2023-12-11 16:24: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
Prateek Banga
b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
Torsten Dittmann
83c411e5fd fix: some fixes 2023-12-07 10:05:37 +01:00
fogelito
4af00914a5 changes 2023-12-06 16:15:21 +01:00
fogelito
2fe50717d1 TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE 2023-12-06 15:10:40 +01:00
Prateek Banga
194bbbb350 review changes 2023-12-05 19:24:55 +01:00
Torsten Dittmann
14e2488f98 chore: bump version 2023-12-05 18:20:47 +01:00
Prateek Banga
e7dca6b2d5 adds uniform logic for worker and extra params for email 2023-12-05 15:01:32 +01:00
Prateek Banga
54f574906c review changes 2023-12-05 12:22:32 +01:00
loks0n
7f164bdbbc chore: generate specs 2023-12-05 12:01:02 +01:00
loks0n
4471b93a3a tests: fix 2023-12-05 12:00:26 +01:00
德华 刘
f127ca651f chore: update console version 2023-12-05 00:54:52 +00:00
loks0n
54c6709a48 fix: verification scopes 2023-12-04 16:17:22 +01:00
Prateek Banga
f9dd40120e resolve update twilio provider 2023-12-04 15:48:37 +01:00
loks0n
63b2363556 feat: workaround backwards compat 2023-12-04 15:38:12 +01:00
Torsten Dittmann
d79411813a bump: version 2023-12-04 10:45:18 +01:00
loks0n
0df3ff9e8b Merge branches 'feat-ssr' and '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-03 13:35:23 +00:00
prateek banga
5ed8bdae35 fix search param in list subscribers endpoint 2023-12-01 03:55:29 +05:30
prateek banga
81ec4ff9bc fix typo in userId index in targets 2023-12-01 03:51:03 +05:30
prateek banga
6ead6f8094 misc changes 
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
 2023-12-01 03:39:43 +05:30
德华 刘
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
loks0n
5a63fef157 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-30 12:13:44 +00:00
loks0n
8ea9706174 feat: Matej renaming plan 2023-11-30 11:35:52 +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
prateek banga
739cc36fdc updated providerType wherever left to update 2023-11-29 15:22:26 +05:30
prateek banga
fa8dc133b4 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type 2023-11-29 15:01:47 +05:30
prateek banga
43b8fc2c31 review changes 2023-11-29 13:47:44 +05:30
Jake Barnby
4b58d08fd8
Add providerType to Message 2023-11-29 17:09:44 +13:00
Jake Barnby
82c86c0ae2
deliveryTime -> scheduledAt 2023-11-29 17:08:25 +13:00
Jake Barnby
4bc23afc65
Add constants for message types 2023-11-29 17:05:37 +13:00
prateek banga
ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
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
prateek banga
858175fe00 adds target object in subscriber model 2023-11-23 14:35:16 +05:30
Prateek Banga
d9826cdce8 makes provider creation fields optional and adds target info in subscriber model 2023-11-23 00:39:55 +05:30
Matej Bačo
9fb6525063 Add new tags from worker, fix queue name 2023-11-22 14:50:57 +01:00
loks0n
88aa4d726c Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-21 14:54:57 +00:00