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
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
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
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
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
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
Prateek Banga
76ed15f2a1
adds more assertion in logs tests
2023-11-10 02:20:55 +05:30
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
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
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
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
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
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
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
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
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
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
Khushboo Verma
cba20d8b96
Addressed PR comments
2023-10-27 19:38:33 +05:30
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
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
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
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
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
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
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
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
18dc8749d5
chore: update health API
2023-10-19 09:25:38 +00:00
prateek banga
99b5ac8669
adds push and sms controllers
2023-10-19 13:29:48 +05:30
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
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
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
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
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
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
shimon
593e5ab316
some fixes
2023-10-17 22:08:01 +03:00
Prateek Banga
ffeb3f8fcf
review work
2023-10-17 22:53:26 +05:30
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
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
0e2c1c1f2d
small fixes
2023-10-16 16:20:41 +03:00