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
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
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
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
Torsten Dittmann
5179c4d08a
chore: upgrade console to 3.2.9
2023-11-21 12:08:26 +01:00
prateek banga
9c6cd8512f
review changes
2023-11-21 15:19:19 +05:30
prateek banga
88f228c106
review changes
2023-11-21 15:11:09 +05:30
prateek banga
3394218cb0
adds validation for phone and email identifier
2023-11-21 15:00:02 +05:30
prateek banga
520d19e335
changes TextMagic to Textmagic in all places and uses email validator
2023-11-21 12:35:36 +05:30
prateek banga
b2381798ab
migrates enum attribute size to 255
2023-11-20 22:01:20 +05:30
Khushboo Verma
2c04c98801
Renamed webhook variables
2023-11-20 19:49:15 +05:30
Khushboo Verma
2bcb6c18fb
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-11-20 17:40:32 +05:30
Jake Barnby
0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
# src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
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
prateek banga
b1eaf97806
review changes
2023-11-20 16:21:06 +05:30
prateek banga
5c1cf3a526
adds user name in subscriber response model
2023-11-20 12:34:50 +05:30
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
Prateek Banga
f0247930da
Update app/config/collections.php
...
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-11-16 17:15:08 +05:30
prateek banga
7536d8eb0f
review changes
2023-11-16 17:09:08 +05:30
prateek banga
bf95736da0
review changes
2023-11-16 16:47:36 +05:30
prateek banga
f854622705
review changes
2023-11-16 16:26:36 +05:30
Jake Barnby
02b6659b35
SDK releases
2023-11-16 21:50:39 +13:00
prateek banga
a282ab38a6
adds target endpoint in account controller for push tokensl
2023-11-16 02:12:06 +05:30
prateek banga
c24664f5d9
removes internal provider
2023-11-16 01:30:47 +05:30
德华 刘
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
loks0n
830544e245
fix: logged in ssr cases
2023-11-15 11:57:27 +00:00
prateek banga
2aa8391c5e
review fixes
2023-11-15 12:52:27 +05:30
Khushboo Verma
2e70ed59af
Fix git installation deletion
2023-11-15 11:41:42 +05:30
prateek banga
fdca55b0de
fix test cases
2023-11-15 01:24:55 +05:30
prateek banga
adc76c5797
adds target when account is created or email or phone is updated
2023-11-14 22:46:20 +05:30
prateek banga
1870524be5
fixes error name
2023-11-14 21:34:17 +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
loks0n
7823b90bf3
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-14 14:01:10 +00:00
prateek banga
7ae614fe13
adds provider type in target
2023-11-14 18:14:07 +05:30
prateek banga
c5aaa670a9
adds provider details in message search attribute
2023-11-14 15:20:21 +05:30
Khushboo Verma
22f02243c6
Resolved merge conflicts
2023-11-14 14:29:46 +05:30
Khushboo Verma
3f584b85be
Limit webhook failure attempts to 10
2023-11-14 14:20:26 +05:30
prateek banga
f84a00dded
adds search attribute filter
2023-11-14 14:07:52 +05:30
prateek banga
8f53301209
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into more_review_changes
2023-11-14 12:26:35 +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
458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main
2023-11-13 16:46:05 +13:00
Prateek Banga
4f681cfe10
Merge branch '1.5.x' into chore-sync-main-1.5.x
2023-11-10 23:12:40 +05:30
Prateek Banga
1b99f47f21
lint fix
2023-11-10 13:28:39 +05:30
Prateek Banga
3ade88897c
Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x
2023-11-10 12:49:05 +05:30
Jake Barnby
4d54e7bb36
Update version + cache buster
2023-11-10 13:09:00 +13:00
Prateek Banga
76ed15f2a1
adds more assertion in logs tests
2023-11-10 02:20:55 +05:30
德华 刘
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
Prateek Banga
3654799cc7
links ISO 8601, move params in messaging controllers
2023-11-09 14:53:42 +05:30
Prateek Banga
4c970cbc46
Merge branch '1.5.x' into feat-logs-messaging-api
2023-11-09 13:42:51 +05:30
Prateek Banga
8d5bfdabc6
revert wrong aduits.event label
2023-11-09 12:29:16 +05:30
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
prateek banga
b9de4a0169
added tests for logs endpoint
2023-11-08 23:26:46 +05:30
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
loks0n
df0271c56a
chore: rename to 'custom' sessions
2023-11-02 13:22:10 +00:00
loks0n
9206390d01
feat: custom expire paramter createTokenSession
2023-11-02 12:52:43 +00:00
Prateek Banga
f97d1fa9e3
adds log api in messaging controller
2023-11-02 18:00:17 +05:30
loks0n
aeb152c5de
chore: update specs
2023-11-02 12:29:05 +00:00
Prateek Banga
61d46bee5c
Merge branch '1.5.x_review_changes' of https://github.com/appwrite/appwrite into event-label-messaging
2023-11-02 16:53:55 +05:30
Prateek Banga
270e6e7c15
review changes
2023-11-02 16:43:24 +05:30
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
loks0n
efe05cd292
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-01 11:03:21 +00:00
prateek banga
fda4e6a8bd
fixes typo in event label
2023-11-01 14:33:13 +05:30
Christy Jacob
281b50ba4a
Merge pull request #7063 from appwrite/1.4.x
...
1.4.x
2023-11-01 12:32:11 +04:00
Prateek Banga
2aa5c5742b
remove unnecessary injection
2023-11-01 12:09:00 +05:30
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
prateek banga
f7529140bd
adds event label to remaining messaging api
2023-10-31 23:53:46 +05:30
Prateek Banga
a719c3f46b
adds event label to create providers endpoint
2023-10-31 23:17:58 +05:30
loks0n
af0d689aff
feat: sessions
scope
2023-10-31 15:05:02 +00:00
loks0n
4559cf77e9
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-31 12:08:48 +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
prateek banga
a01d361886
review changes
2023-10-31 01:12:31 +05:30
prateek banga
06daa544e8
review changes
2023-10-30 23:37:57 +05:30
德华 刘
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
loks0n
169e57d12d
Merge branches 'feat-ssr' and 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-27 14:36:08 +01:00
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
Prateek Banga
bc6df4bab7
add recipients array check in API instead of worker
2023-10-27 13:42:27 +05:30
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
loks0n
91825afaf9
chore: refactor public scope
2023-10-26 15:23:38 +01:00
Prateek Banga
5a9b1f0c24
removes provider from topics
2023-10-26 19:44:06 +05:30
loks0n
2743ac6934
feat: public scope for api key
2023-10-26 15:07:51 +01:00
loks0n
49425fb8fc
test: fix
2023-10-26 15:04:47 +01:00
Jake Barnby
89236955fb
Fix setting metadata
2023-10-26 22:28:23 +13:00
loks0n
406f772632
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-26 09:53:47 +01:00
Jake Barnby
995c404f35
Update db
2023-10-26 21:24:30 +13:00
prateek banga
c2cd544948
review changes
2023-10-26 13:46:45 +05:30
Prateek Banga
34b3ed68ee
adds total count for subscribers in topics model
2023-10-26 12:37:39 +05:30
prateek banga
f6f4397aab
Merge branch 'providers-from-attribute' of https://github.com/appwrite/appwrite into review-changes-1.5.x
2023-10-25 23:55:45 +05:30
prateek banga
887eeef585
review changes
2023-10-25 23:09:38 +05:30
prateek banga
fd4a81c4fc
made review changes
2023-10-25 23:03:23 +05:30
Torsten Dittmann
404ad8653d
fix: worker permissions reset
2023-10-25 19:23:55 +02:00
loks0n
b833f29d56
chore: fmt
2023-10-25 14:29:27 +01:00
loks0n
b4773a7fbd
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-25 13:20:42 +01:00
loks0n
3a9202a46b
chore: christy feedback
2023-10-25 13:20:29 +01:00
shimon
4c6976488c
clean up
2023-10-25 15:06:54 +03:00
Torsten Dittmann
f9a3ae1421
chore: bump console version
2023-10-25 13:35:14 +02:00
Khushboo Verma
17de0d1ea7
Updated the error code for unsupported protocol
2023-10-25 15:55:46 +05:30
shimon
b775c53666
clean up
2023-10-25 13:16:25 +03:00
shimon
c11b3ff522
workers start hook
2023-10-25 12:46:45 +03:00
shimon
14ac780180
workers start hook
2023-10-25 12:10:30 +03:00
shimon
b7675df9b9
usage workers
2023-10-25 11:38:44 +03:00
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
Jake Barnby
5732171a2a
Merge remote-tracking branch 'origin/1.4.x' into feat-query-metadata
...
# Conflicts:
# app/init.php
# composer.json
# composer.lock
2023-10-25 18:21:16 +13:00
Torsten Dittmann
fbcbd0d430
feat: realtime error handling
2023-10-24 14:32:22 +02:00
Jake Barnby
d5b6421285
Merge remote-tracking branch 'origin/1.4.x' into sync-1.4.x-to-1.5.x
...
# Conflicts:
# composer.lock
2023-10-24 19:46:57 +13:00
Steven Nguyen
3addf76a2a
Bump appwrite version to 1.4.7
2023-10-23 13:36:29 -07:00
prateek banga
b60cbcada5
adds from field in remaining providers
2023-10-24 01:05:46 +05:30
loks0n
a67ca55af5
fix: use queueForEvents in users
2023-10-23 11:32:09 +01:00
Khushboo Verma
2cf8639b68
Resolve merge conflicts
2023-10-23 15:06:01 +05:30
Khushboo Verma
97c1099961
Refactor code and add more assertions
2023-10-23 15:03:24 +05:30
德华 刘
3dee8d6ecd
fix: update incorrect method call
2023-10-23 08:34:57 +00:00
Shimon Newman
808f682fa7
Update app/controllers/api/projects.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-23 11:25:31 +03:00
shimon
2ef8490691
fix mod condition
2023-10-23 11:22:28 +03:00
loks0n
1343d4851a
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-23 09:10:57 +01:00
shimon
b09a254d3c
fix mod condition
2023-10-23 10:46:15 +03:00
shimon
a841734d50
fix mod condition
2023-10-23 01:05:10 +03:00
shimon
ac231914d4
fix mod condition
2023-10-23 00:55:57 +03:00
shimon
0d5127d90b
fix mod condition
2023-10-23 00:08:55 +03:00
德华 刘
00d2a5ffcd
chore: update create projects endpoints
2023-10-22 18:33:15 +00:00
德华 刘
79612bd80f
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-sm-db
2023-10-22 18:30:14 +00:00
prateek banga
af40c63357
review changes
2023-10-20 17:02:13 +05:30
prateek banga
e040ecba36
fixed lint error
2023-10-20 15:03:56 +05:30
prateek banga
6c260223ba
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-10-20 15:00:22 +05:30
prateek banga
161bbfb822
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-10-20 14:55:17 +05:30
Prateek Banga
d714760eb8
review changeS
2023-10-20 13:51:13 +05:30
prateek banga
24b2d70441
review changes
2023-10-20 13:33:27 +05:30
prateek banga
e4d2d15f70
review changes
2023-10-20 13:31:56 +05:30
prateek banga
db9e7b0199
review changes
2023-10-20 13:28:23 +05:30
Christy Jacob
21b9716bb2
Merge pull request #6959 from appwrite/chore-update-backup-timings
...
chore: update backup timings
2023-10-19 20:40:43 +04:00
德华 刘
de8b9638d5
chore: update backup timings
2023-10-19 16:07:54 +00:00
shimon
8048766d28
queues fixes
2023-10-19 18:28:01 +03:00
Matej Bačo
20c37db8fc
Upgrade executor
2023-10-19 11:54:56 +02:00
Christy Jacob
01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep
2023-10-19 05:28:02 -04:00
Christy Jacob
4b08729131
Update app/init.php
2023-10-19 05:27:52 -04:00
Christy Jacob
18dc8749d5
chore: update health API
2023-10-19 09:25:38 +00:00
Christy Jacob
a46b3d088c
Merge branch '1.4.x' into feat-api-db-timeout
2023-10-19 05:15:44 -04:00
prateek banga
99b5ac8669
adds push and sms controllers
2023-10-19 13:29:48 +05:30
Jake Barnby
03b6d65669
Add timeout on vcs project DBs
2023-10-19 17:21:11 +13:00
Jake Barnby
b5cdbb50c7
Use fixed message
2023-10-19 17:12:05 +13:00
Jake Barnby
354211950f
Add timeout test
2023-10-19 17:06:57 +13:00
Jake Barnby
b6b8fe7d51
Allow overriding timeout per request in dev mode
2023-10-19 16:19:40 +13:00
Jake Barnby
b17e24f645
Use const for timeout
2023-10-19 15:45:32 +13:00
Jake Barnby
389d367fca
Set hard timeouts for API dbs
2023-10-19 15:32:45 +13:00
Jake Barnby
db3fa21468
Update database
2023-10-19 14:26:44 +13:00
Steven Nguyen
6d040beb36
Update specs for 1.4.6
...
$ diff old.json new.json
4c4
< "version": "1.4.5",
---
> "version": "1.4.6",
8132c8132
< "/health/queue/databases": {
---
> "/health/queue/databases/{databaseId}": {
8164c8164,8175
< "security": [{ "Project": [], "Key": [] }]
---
> "security": [{ "Project": [], "Key": [] }],
> "parameters": [
> {
> "name": "databaseId",
> "description": "Database for which to check the queue size",
> "required": false,
> "type": "string",
> "x-example": "[DATABASE_ID]",
> "default": "database_db_main",
> "in": "path"
> }
> ]
2023-10-18 17:42:27 -07:00
Steven Nguyen
1d7c9d84d2
Fix get database queue endpoint params
...
A path param cannot be optional so change it to a query param.
2023-10-18 17:42:27 -07:00
Steven Nguyen
435b20df77
Bump appwrite version to 1.4.6
2023-10-18 16:07:47 -07:00
Steven Nguyen
9bc6b124c0
Bump console to version 3.2.3
2023-10-18 15:51:13 -07:00
Christy Jacob
67541d4a1d
chore: review comments
2023-10-18 21:35:15 +00:00
Christy Jacob
20985c7ee4
Merge pull request #6946 from appwrite/remove-resque
...
chore: remove resque library and update health check endpoints
2023-10-18 16:59:44 -04:00
Christy Jacob
be5ed9b282
Merge pull request #6934 from appwrite/feat-delegate-deletes
...
Delegate custom deletes
2023-10-18 16:13:08 -04:00
Christy Jacob
3d7cd91176
chore: fix injections
2023-10-18 19:54:56 +00:00
Christy Jacob
be26e4b729
chore: remove resque library and update health check endpoints
2023-10-18 19:44:06 +00:00
Christy Jacob
f822f86517
Merge branch '1.4.x' into refactor-workers-sn
2023-10-18 15:26:45 -04:00
Christy Jacob
74e3f3f7d2
fix: remove unused variable
2023-10-18 19:08:21 +00:00
Christy Jacob
133cb62b4e
fix: update injection name
2023-10-18 19:07:17 +00:00
Christy Jacob
4724d729fb
Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes
2023-10-18 18:59:51 +00:00
Christy Jacob
066dd6393d
Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes
2023-10-18 18:57:16 +00:00
Christy Jacob
72d0865ad8
chore: use deletes worker for deleting audit logs
2023-10-18 18:54:20 +00:00
Christy Jacob
699ac7f7f5
fix: review comments
2023-10-18 20:53:11 +04:00
Christy Jacob
050cb28d4f
fix: incorrect events
2023-10-18 20:30:47 +04:00
Khushboo Verma
979054e5ca
Merge branch 'main' into refactor-vcs-tests
2023-10-18 13:25:40 +05:30
Khushboo Verma
2914a4d1c5
Add test for createRepo endpoint
2023-10-18 13:24:32 +05:30
Prateek Banga
4bef86d88b
review changes
2023-10-18 13:19:21 +05:30
Jake Barnby
bb0744842d
Set metadata for all database instantiations
2023-10-18 16:21:10 +13:00
Christy Jacob
33ec5b3d7b
chore: re-order tests
2023-10-18 02:36:50 +04:00
Christy Jacob
39820b5a0f
chore: update docker compose config
2023-10-18 01:56:54 +04:00
shimon
593e5ab316
some fixes
2023-10-17 22:08:01 +03:00
shimon
1036cb406d
some fixes
2023-10-17 21:32:38 +03:00
Prateek Banga
ffeb3f8fcf
review work
2023-10-17 22:53:26 +05:30
shimon
3d5930c104
some fixes
2023-10-17 16:55:08 +03:00
Christy Jacob
022952e2ee
chore: revert console
2023-10-17 08:36:41 +00:00
Christy Jacob
20468782e5
chore: revert console
2023-10-17 08:35:22 +00:00
Jake Barnby
64d582a43a
Update for package changes
2023-10-17 21:31:00 +13:00
Matej Bačo
97ea29bba2
Add dart 3.1 support
2023-10-17 10:18:29 +02:00
shimon
55dfb0b034
Merge remote-tracking branch 'origin/refactor-workers-sn' into refactor-workers-sn
2023-10-17 06:44:53 +03:00
shimon
9a6d88a819
addressing some comments
2023-10-17 06:44:36 +03:00
Jake Barnby
dbfe5e45aa
Delegate custom deletes
2023-10-17 12:18:51 +13:00
Prateek Banga
4ccffb6649
adds graphql tests for topics, subcribers, email
2023-10-17 03:41:42 +05:30
Shimon Newman
e565557eb2
Update app/worker.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-16 20:13:39 +03:00
shimon
a8f5886474
minor fix
2023-10-16 18:17:02 +03:00
shimon
e660a6f4a3
small fixes
2023-10-16 17:09:51 +03:00
shimon
2451d9fef1
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn
...
Conflicts:
src/Appwrite/Platform/Workers/Deletes.php
2023-10-16 17:06:59 +03:00
shimon
2fcda9fc11
Merge branch 'cl-1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn
2023-10-16 17:03:43 +03:00
shimon
0e2c1c1f2d
small fixes
2023-10-16 16:20:41 +03:00
Bradley Schofield
23a1da58fb
Update Status Codes
2023-10-16 11:57:17 +01:00
loks0n
dfeb49951b
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-16 10:26:51 +01:00
shimon
0c776e0a44
comparing $workersCount via worker.php vs init php
2023-10-16 11:04:44 +03:00