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
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
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
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
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
shimon
4c6976488c
clean up
2023-10-25 15:06:54 +03:00
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
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
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
loks0n
dfeb49951b
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-16 10:26:51 +01:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
Yatharth Verma
96f389cee5
merge 1.4.x changes to my branch
2023-10-14 11:57:40 +05:30
Bradley Schofield
5274f1234b
Merge branch 'main' into feat-improve-migration-validations
2023-10-13 16:23:25 +01:00
Bradley Schofield
d4b53e5014
Run Linter
2023-10-13 16:23:20 +01:00
loks0n
250e9ae9f7
chore: cleanup pr
2023-10-13 16:10:55 +01:00
Torsten Dittmann
3778939605
fix: relative links to absolute
2023-10-13 15:43:23 +02:00
Khushboo Verma
f18d33a0d6
Resolved merge conflicts
2023-10-13 18:54:14 +05:30
Khushboo Verma
66ec7f2e1d
VCS tests
2023-10-13 18:50:58 +05:30
Prateek Banga
feac25f401
adds already sent exception in update message
2023-10-13 18:35:49 +05:30
Prateek Banga
0b1b7646d5
review changes
2023-10-13 18:26:54 +05:30
loks0n
63d3a2bc73
chore: revert abuse-key changes
2023-10-13 11:08:25 +01:00
loks0n
07286e5864
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-13 11:05:22 +01:00
loks0n
81c4a9bbd5
chore: fmt
2023-10-13 11:05:14 +01:00
Prateek Banga
4a44fb3330
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-10-13 14:52:02 +05:30
Steven Nguyen
3f2f6ab43a
Ensure permissions are updated when a project moves orgs
...
Since the following collections also have permissions set to the team,
the team should be updated for consistency:
- installations
- repositories
- vcsComments
2023-10-12 17:34:53 -07:00
Steven Nguyen
3bb22c38cc
Update teamInternalId when updating project team
...
This is important because when an organization is deleted, projects are
fetched by the teamInternalId and if the teamInternalId is not updated
when the project team is updated, the project will be deleted if the
previous organization is deleted.
2023-10-12 17:03:45 -07:00
Khushboo Verma
bb75036efe
WIP: Mocked GitHub installation
2023-10-13 01:45:27 +05:30
loks0n
8ab429b92f
feat: replace session confirmation endpoints
2023-10-12 14:38:32 +01:00
Prateek Banga
cc1769ed41
review changes
2023-10-12 11:48:26 +05:30
loks0n
b299ed056e
chore: rename $sessionSecret
2023-10-11 17:07:02 +01:00
loks0n
f9d6ebd3a0
docs: add descriptions to universal token endpoints
2023-10-11 16:31:32 +01:00
loks0n
e41fab769f
fix: edge cases
2023-10-11 13:20:25 +01:00
shimon
893b1d0ba7
Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.gitmodules
app/controllers/api/functions.php
app/controllers/api/health.php
app/init.php
app/views/install/compose.phtml
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Workers/Builds.php
src/Appwrite/Platform/Workers/Deletes.php
src/Appwrite/Platform/Workers/Functions.php
src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
shimon
002fc19d60
tests fix
2023-10-10 21:02:24 +03:00
Prateek Banga
17ba6355e0
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-10-10 19:52:19 +05:30
loks0n
c343d7550f
chore: fmt
2023-10-10 14:41:02 +01:00
loks0n
c30c024805
test: fix magic url assertions
2023-10-10 14:36:53 +01:00
Prateek Banga
bb52647366
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-10-10 19:06:39 +05:30
loks0n
a88175fc46
fix: unhash session responses
2023-10-10 13:30:42 +01:00
Prateek Banga
1e5a2a78aa
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.5.x-with-1.4.x
2023-10-10 17:46:44 +05:30
loks0n
c4e82e4191
fix: edge cases
2023-10-09 14:49:07 +01:00
Prateek Banga
a77a212e2c
adds scheduling for messaging worker
2023-10-09 17:29:26 +05:30
shimon
e2989afda8
queueForBuilds fix via functions controller
2023-10-09 13:28:06 +03:00
shimon
24e09d3d8e
queueForBuilds fix via functions controller
2023-10-09 13:16:05 +03:00
shimon
31466c44d8
update projects database
2023-10-08 16:44:14 +03:00
Bradley Schofield
9cb1cf418c
Improve Error Handling and Add more Validation
2023-10-06 17:02:01 +01:00
Prateek Banga
a92390dda2
review changes
2023-10-06 19:23:46 +05:30
Prateek Banga
d842191cc6
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-10-06 03:53:16 +05:30
Prateek Banga
d5cc214546
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x
2023-10-06 03:44:36 +05:30
Prateek Banga
8e9f270ef0
update id param
2023-10-06 03:30:47 +05:30
shimon
948f36a023
sync with 1.4
2023-10-05 16:15:39 +03:00
Prateek Banga
22d445587e
review changes
2023-10-05 16:57:48 +05:30
loks0n
e94631f730
fix: token verification
2023-10-05 11:18:19 +01:00
Christy Jacob
32ba34cba5
chore: add database overrides
2023-10-05 05:58:52 +00:00
Christy Jacob
adbbb6dc20
chore: add database overrides
2023-10-05 05:53:49 +00:00
Prateek Banga
fb98d21ae5
adds graphql test cases for provider endpoints
2023-10-05 02:12:04 +05:30
Prateek Banga
5891872fad
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-10-04 17:27:56 +05:30
Prateek Banga
c9c49158a3
changes to validator length
2023-10-04 16:24:29 +05:30
Prateek Banga
61785ab35a
typo fix
2023-10-04 16:19:05 +05:30
Prateek Banga
48b91e39a8
review changes
2023-10-04 16:15:59 +05:30
shimon
7f1507f810
sync with 1.4
2023-10-04 11:20:32 +03:00
shimon
e3668a4d06
sync with 1.4
2023-10-03 21:56:36 +03:00
shimon
429dabaaee
sync with 1.4
2023-10-03 19:50:48 +03:00
shimon
ce82a9efa9
remove usage executions from shared api
2023-10-03 17:41:11 +03:00
Christy Jacob
ff3c25d352
chore: update database
2023-10-02 22:23:35 +00:00
Christy Jacob
29ad61d461
chore: update database
2023-10-02 22:01:42 +00:00
Christy Jacob
b456c9df2c
chore: remove DB creates
2023-10-02 21:32:05 +00:00
shimon
2bb4d8fb89
sync with 1.4
2023-10-02 17:02:48 +03:00
shimon
75d8741eaa
sync against master
2023-10-01 21:30:52 +03:00
shimon
b02d51c794
migrations worker
2023-10-01 20:39:26 +03:00
Matej Bačo
1502bfef74
Increase timeout
2023-09-30 17:24:09 +02:00
Matej Bačo
78dd0ca439
Merge branch 'cl-1.4.x' into patch-sync-exec-timeout
2023-09-30 16:02:33 +02:00
Christy Jacob
43de260b33
Merge pull request #6366 from appwrite/1.4.x
...
Update cl-1.4.x
2023-09-30 10:02:15 -04:00
Matej Bačo
d9f2f1c37b
Introduce execution sync timeout
2023-09-30 11:54:54 +02:00
Steven Nguyen
9d47237da9
Merge branch '1.4.x' into fix-skip-non-ascii-chars-image
2023-09-29 11:07:31 -07:00
Bradley Schofield
1136dc9e64
Add Test and don't stop on special char
2023-09-29 16:27:59 +01:00
Bradley Schofield
615d61d962
Merge branch '1.4.x' into fix-skip-non-ascii-chars-image
2023-09-29 09:21:17 +01:00
Christy Jacob
a65c1c1ee5
chore: fix merge conflict
2023-09-28 22:22:44 +00:00
loks0n
739be813e0
feat: oauth ssr token flow
2023-09-28 13:45:52 +01:00
loks0n
5ed2da4cf1
feat: add userId to abuse-keys
2023-09-28 11:33:01 +01:00
loks0n
b8f2c1deec
chore: revert oauth workaround
2023-09-28 11:26:44 +01:00
loks0n
ef93c59698
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-09-28 11:21:26 +01:00
Christy Jacob
ac844d33ef
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into cl-1.4.x
2023-09-27 23:25:48 +00:00
Christy Jacob
9fa93e0449
chore: review comments
2023-09-27 22:13:03 +00:00
Matej Bačo
e58bf7f695
Rename audits back to logs
2023-09-27 21:24:56 +00:00
Matej Bačo
5120152369
Add all worker health endpoints
2023-09-27 21:24:41 +00:00
Christy Jacob
50600d6f2a
Merge pull request #6343 from appwrite/master
...
Merge master into 1.4.x
2023-09-27 17:20:32 -04:00
shimon
dcf0107a79
sync with master
2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e
Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.env
app/cli.php
app/config/collections.php
app/console
app/controllers/api/account.php
app/controllers/api/databases.php
app/controllers/api/functions.php
app/controllers/api/projects.php
app/controllers/api/storage.php
app/controllers/api/teams.php
app/controllers/api/users.php
app/controllers/general.php
app/controllers/shared/api.php
app/init.php
app/worker.php
app/workers/audits.php
app/workers/builds.php
app/workers/certificates.php
app/workers/databases.php
app/workers/deletes.php
app/workers/functions.php
app/workers/mails.php
bin/worker-usage
composer.json
composer.lock
docker-compose.yml
src/Appwrite/Event/Delete.php
src/Appwrite/Event/Mail.php
src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case
2023-09-27 11:11:58 -04:00
Prateek Banga
90352c57ac
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-27 18:58:18 +05:30
Prateek Banga
234f7f003b
updated test cases for msg91 provider, moves worker to use provider from settings
2023-09-27 18:58:00 +05:30
Prateek Banga
63bd4d6daf
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-27 16:57:07 +05:30
Prateek Banga
a0858ccc4e
adds message description, options to mailgun provider
2023-09-26 13:12:44 +05:30
Steven Nguyen
4a0c77a8df
Update avatar font and default colors
2023-09-25 15:55:15 -07:00
Christy Jacob
2273cb50b4
Merge branch '1.4.x' of github.com:appwrite/appwrite into cl-1.4.x
2023-09-26 00:02:19 +04:00
Christy Jacob
6a28499f1b
Merge pull request #6329 from appwrite/patch-oauth-flows-1.4.x
...
Patch: Disable console protection
2023-09-25 09:34:43 -04:00
Matej Bačo
420d2a9c36
@Meldiron Disable console endpoint protection
2023-09-25 15:05:51 +02:00
Matej Bačo
c35f05f495
Increase max body size
2023-09-25 11:12:41 +02:00
Matej Bačo
725897c896
Rename audits back to logs
2023-09-24 14:36:20 +02:00
Matej Bačo
24204bce54
Add all worker health endpoints
2023-09-24 14:07:37 +02:00
Yatharth Verma
6b47999120
fix conflicts
2023-09-22 22:56:07 +05:30
Yatharth Verma
f07f246f8d
fix conflicts
2023-09-22 22:53:41 +05:30
Christy Jacob
9dde039adf
Merge pull request #6290 from appwrite/fix-deployment-delete
...
Fix deployment delete
2023-09-22 11:37:50 -04:00
Prateek Banga
e00b273577
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-21 22:19:30 +05:30
Prateek Banga
e2acb608fa
fix tests with real sms providers
2023-09-21 22:16:02 +05:30
Prateek Banga
d63eaf3ef0
fixes get message endpoint
2023-09-21 21:49:40 +05:30
Prateek Banga
06a05a3358
adds param messageId in send an email endpoint, tokenId as messageId in create phone session, membershipId as messageId in create team membership
2023-09-21 21:17:15 +05:30
Matej Bačo
3e41578d61
Merge branch '1.4.x' into cl-1.4.x
2023-09-21 16:36:09 +02:00
Matej Bačo
cebfc5a22d
Fix migrations
2023-09-21 16:09:51 +02:00
Prateek Banga
3ebcfe548d
Adds get message endpoint
2023-09-21 16:26:53 +05:30
Prateek Banga
342f122365
adds key auth to providers endpoint
2023-09-21 16:18:20 +05:30
Prateek Banga
b4de44c905
fix small bug in worker and send email endpoint
2023-09-21 16:12:56 +05:30
Christy Jacob
c7e6efc050
chore: update backups schedule
2023-09-21 10:23:55 +00:00
Christy Jacob
864092d81c
Merge pull request #6272 from appwrite/feat-router-protection
...
Feat: router protection
2023-09-21 05:13:34 -04:00
Christy Jacob
f78b520f12
Merge pull request #6269 from appwrite/feat-https-function-domains
...
Feat: Function domains force https
2023-09-21 05:11:06 -04:00
Steven Nguyen
9ca82b7662
Fix missing resourceInternalId on deployments
2023-09-20 19:26:23 -07:00
Prateek Banga
39854239fb
skip authorization in adding subscriber on targets
2023-09-21 02:29:57 +05:30
Prateek Banga
0510de5eab
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-20 23:37:35 +05:30
Prateek Banga
35d842171c
review changes
2023-09-20 23:37:10 +05:30
Prateek Banga
87011af914
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-20 23:00:48 +05:30
Prateek Banga
975b444761
fix test cases and bug fix in messaging worker
2023-09-20 20:51:03 +05:30
Prateek Banga
8d9e0ae7d0
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-20 17:53:08 +05:30
Prateek Banga
3456ad4e8c
fixes merge conflict issue
2023-09-20 17:52:25 +05:30
Prateek Banga
afef225339
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-20 17:39:36 +05:30
Prateek Banga
f9030132a5
messaging worker logic to send message to providers batch limit
2023-09-20 17:38:29 +05:30
Prateek Banga
a2e34b5b64
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-20 16:59:07 +05:30
Prateek Banga
67397cd763
fix tests and code changes
2023-09-20 15:55:22 +05:30
Prateek Banga
bd36a09473
adds search in messaging controllers, updated mailgun endpoint with isEu param
2023-09-19 15:36:40 +05:30
Matej Bačo
8926d24a0d
One more env var rename
2023-09-19 09:35:32 +02:00
Matej Bačo
d87dbad768
PR review changes
2023-09-19 09:31:57 +02:00
Matej Bačo
007d6953bf
PR review changes
2023-09-19 09:21:11 +02:00
Matej Bačo
6afba0b9c9
Linter fix
2023-09-18 13:22:06 +02:00
Matej Bačo
a1049bd2d5
Implement router protection
2023-09-18 13:18:58 +02:00
Matej Bačo
6a7950aa34
Add function domains force https
2023-09-18 12:27:47 +02:00
Jake Barnby
9ba609c46e
Merge pull request #6238 from appwrite/1.4.x
...
1.4.x
2023-09-15 18:49:55 -04:00
Christy Jacob
2ea8dbff29
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-bun-support
2023-09-14 15:21:31 +00:00
Prateek Banga
350549db7d
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-14 02:17:34 +05:30
Prateek Banga
15dd6863dd
removes comments
2023-09-14 01:07:30 +05:30
Prateek Banga
f8c9c2f39b
fixes manual internal id insertion
2023-09-14 00:48:50 +05:30
Matej Bačo
0690b00c30
Add Bun auto detection
2023-09-13 21:08:49 +02:00
prateek banga
4bb611efc4
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-13 17:48:18 +05:30
prateek banga
0066216bef
adds enabled param for provider endpoints and review changes
2023-09-13 17:47:38 +05:30
shimon
c30fa277d3
linter fix
2023-09-13 10:24:36 +03:00
shimon
eddb269513
Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-key
2023-09-13 10:24:00 +03:00
Prateek Banga
fbd4712a72
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-13 00:54:02 +05:30
Prateek Banga
d742b0c0a9
removes provider type from create user target
2023-09-13 00:53:25 +05:30
Steven Nguyen
6b0c24a9d6
Update user creation from teams and users services to not set accessedAt
...
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
2023-09-12 12:05:11 -07:00
Prateek Banga
420eb8857a
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-13 00:07:32 +05:30
Prateek Banga
6affa6b5a0
Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-13 00:07:09 +05:30
Prateek Banga
11a458f1df
change providers to authProviders in remaining places
2023-09-13 00:06:18 +05:30
shimon
922f0a5c84
Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-key
...
Conflicts:
app/controllers/shared/api.php
2023-09-12 10:44:34 +03:00
Binyamin Yawitz
5cb03da001
Extracting function event validator to its own class.
2023-09-11 23:24:11 -04:00
Prateek Banga
32970ba8a0
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-11 19:54:24 +05:30
Prateek Banga
2ecf9ee98a
udpates send email endpoint according to collection changes
2023-09-11 19:53:48 +05:30
Matej Bačo
93e2a4fb8d
Add v2 old vars support
2023-09-11 12:22:16 +02:00
Jake Barnby
d4f6b99ee2
Fix mock enum endpoint
2023-09-07 19:25:42 -04:00
Jake Barnby
fa01f5d67f
Merge remote-tracking branch 'origin/master' into feat-mock-enums
2023-09-07 17:24:44 -04:00
Jake Barnby
cf92936fcc
Add mock endpoint with whitelist param
2023-09-07 17:21:06 -04:00
Matej Bačo
418c8e3764
Fix redeploys
2023-09-07 11:33:42 +02:00
Christy Jacob
47427972bf
fix: test failures
2023-09-07 00:57:23 -04:00
Christy Jacob
90eed32311
fix: add check for localhost domain
2023-09-06 18:39:53 +00:00
Christy Jacob
67698cce88
Merge pull request #6155 from appwrite/fix-unknown-domains
...
Fix: Untrusted custom domains + auto-ssl
2023-09-06 14:09:17 -04:00
Christy Jacob
12b03f3fb0
Merge pull request #6162 from appwrite/fix-webhook-secret-validation
...
Fix webhook secret validation and executor path validation
2023-09-06 13:59:13 -04:00
Vincent (Wen Yu) Ge
3bc085ea3f
Update app/controllers/api/vcs.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-09-06 13:57:46 -04:00
Christy Jacob
4ea0541623
Merge pull request #6150 from appwrite/fix-global-vars
...
Fix: Global variables
2023-09-06 13:51:13 -04:00
Khushboo Verma
39a4447103
Update webhook secret check
2023-09-06 22:34:03 +05:30
Christy Jacob
db763b180c
Merge pull request #6142 from appwrite/fix-v2-functions
...
Fix: v2 functions
2023-09-06 12:43:51 -04:00
Matej Bačo
6964477429
Increase labels maximum limit
2023-09-06 18:15:03 +02:00
prateek banga
a81006e961
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-06 16:31:07 +05:30
prateek banga
15773a3561
sets the correct response for send email
2023-09-06 16:30:46 +05:30
prateek banga
06361828a9
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-06 15:41:19 +05:30
prateek banga
039e717d72
fixes in send email endpoint
2023-09-06 15:40:56 +05:30
Bradley Schofield
8e0e131824
Remove Special Chars from Initials
2023-09-06 09:54:59 +01:00
Matej Bačo
adb4c72a9c
Fix project internal ID
2023-09-06 10:31:40 +02:00
Matej Bačo
0d6abda431
Fix autossl domain query
2023-09-06 10:27:21 +02:00
Khushboo Verma
0fbe9d6ce9
Revert allowing empty string in path
2023-09-06 13:46:01 +05:30
Matej Bačo
933f9631d5
Fix v2 endpoint description
2023-09-06 10:00:04 +02:00
Matej Bačo
9060aa1ba7
Remove unnessessary cache clear
2023-09-06 09:53:02 +02:00
Khushboo Verma
af4be4051f
Skip validation if webhook secret is empty
2023-09-06 13:12:27 +05:30
Matej Bačo
cafe792879
Fix API returning html
2023-09-06 09:34:02 +02:00
shimon
f246d4d6e5
removed $route->setIsActive(false);
...
from cache output
2023-09-05 21:21:24 +03:00
Bradley Schofield
8357d20be7
Make URL optional for API and Serverside Requests
2023-09-05 19:13:47 +01:00
prateek banga
3d286a2171
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-09-05 23:10:59 +05:30
prateek banga
38d81c058b
lint fix
2023-09-05 23:10:33 +05:30
prateek banga
6aa443454b
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-05 22:58:43 +05:30
prateek banga
78a53aee37
adds messaging event and updates messaging worker
2023-09-05 22:40:48 +05:30
shimon
a46879f1cb
cache key reformat
2023-09-05 18:29:11 +03:00
Matej Bačo
cda58d2256
Re-add automatic ssl generation
2023-09-05 17:09:54 +02:00
Matej Bačo
f4ada97d1a
Allow any hostname, and serve API+Console by default
2023-09-05 17:02:07 +02:00
Matej Bačo
9a1d13f9db
Add v2 function test
2023-09-05 15:47:59 +02:00
Matej Bačo
8e509efcec
Add global env var test
2023-09-05 13:55:02 +02:00
Matej Bačo
79726dbfb6
Fix formatting
2023-09-05 13:16:20 +02:00
Matej Bačo
5538c47b3f
Improve installation exception when missconfigured
2023-09-05 12:14:43 +02:00
Matej Bačo
1a6530fb57
Fix project variables
2023-09-05 10:21:36 +02:00
Matej Bačo
7588a9c4ec
Make v2 functions work again
2023-09-04 19:53:25 +02:00
Christy Jacob
22745e0418
Merge pull request #6125 from appwrite/fix-functions-backwards-compatibility
...
Fix CLI backwards compatibility
2023-09-04 12:28:03 -04:00
Steven Nguyen
605ee2f7c5
Update create deployment default commands
...
Default to function commands only if commands weren't supplied.
2023-09-04 09:04:15 -07:00
Steven
62065a1c33
Fix create phone session abuse key
...
Create phone session doesn't have anything to do with email. The key
name should be email just for clarity (even though, technically, it
doesn't matter).
2023-09-03 21:37:02 +00:00
Steven Nguyen
a609759951
Make runtime optional when updating a function
...
This is important for backwards compatibility since it wasn't possible
to update a function runtime in previous versions and it was never
included in the request.
2023-09-02 16:37:40 -07:00
Jake Barnby
f47aa91ff1
Merge pull request #6109 from appwrite/fix-1.4-bugs
...
Fix events not triggering functions and path not a string bugs
2023-09-01 15:15:55 -04:00
Jake Barnby
017cd75071
Merge pull request #6102 from appwrite/fix-file-security-check
...
Fix fileSecurity check
2023-09-01 15:11:03 -04:00
Khushboo Verma
7013bc94a6
Fix events triggering functions and path not a string bugs
2023-09-01 21:15:53 +05:30
Steven Nguyen
9bc6011876
Fix fileSecurity check
...
Because of the `getAttributes()` call, `$fileSecurity` was always true
which lead to invalid permission check. This resulted in files being
deleted when a user had delete permissions on the file even though
they didn't on the bucket.
2023-08-31 20:28:13 -07:00
Steven Nguyen
073172d84b
Remove route setIsActive() call
...
The method has been removed since it's no longer necessary.
2023-08-31 19:18:13 -07:00
prateek banga
82e165c4c3
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-31 18:33:02 +05:30
prateek banga
1762c81b8d
Merge branch 'feat-messages-event-config' into feat-mailgun-provider
2023-08-31 18:32:26 +05:30
prateek banga
e104e6d0f2
Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers
2023-08-31 18:16:48 +05:30
Jake Barnby
fdb7218978
Update firebase connect scope
2023-08-30 22:48:51 -04:00
Jake Barnby
922332042e
Fix template strings
2023-08-30 20:31:11 -04:00
Steven Nguyen
24efa0de82
Fix router error
...
It's possible for the route to be null (no match) which leads to an
error like:
```
appwrite | [Error] Timestamp: 2023-08-30T21:39:58+00:00
appwrite | [Error] Type: Error
appwrite | [Error] Message: Call to a member function label() on null
appwrite | [Error] File: /usr/src/code/app/controllers/general.php
appwrite | [Error] Line: 50
```
This adds a null check to prevent the error.
2023-08-30 16:07:11 -07:00
Christy Jacob
5dbec3d406
chore: remove redundant attribute
2023-08-30 18:43:09 -04:00
Christy Jacob
4e19c94d08
Merge branch '1.4.x' of github.com:appwrite/appwrite into fix-email-templates
2023-08-30 18:40:39 -04:00
Christy Jacob
21dc3b16b0
chore: update changelog
2023-08-30 18:36:40 -04:00
Christy Jacob
861921526e
fix: remove redundant name property
2023-08-30 18:34:20 -04:00
Jake Barnby
b2f9506130
Update app/controllers/mock.php
2023-08-30 17:57:38 -04:00
Jake Barnby
b77d83d246
Add back headers route
2023-08-30 17:55:27 -04:00
Christy Jacob
74012158b3
fix: variable names
2023-08-30 17:54:26 -04:00
Christy Jacob
05615d1449
fix: missing variable in email templates
2023-08-30 17:52:55 -04:00
Christy Jacob
75e957ed4a
fix: missing variable in email templates
2023-08-30 17:48:25 -04:00
Jake Barnby
fc3ff188b1
Fix VCS + migrations scopes
2023-08-30 14:44:33 -04:00
Torsten Dittmann
3b2cb9b868
Merge pull request #6059 from appwrite/fix-smtp
...
Fix smtp
2023-08-30 16:09:10 +02:00
Torsten Dittmann
e507fb6715
fix: hide services from server/client sdks
2023-08-30 13:28:43 +02:00
Torsten Dittmann
0427c2e4eb
chore: generate 1.4.x specs
2023-08-30 11:19:55 +02:00
Eldad A. Fux
7835fa9bbc
Update app/controllers/api/proxy.php
2023-08-30 09:43:23 +03:00
Eldad A. Fux
75a9b2c1c5
Update app/controllers/api/console.php
2023-08-30 09:43:11 +03:00
Jake Barnby
ff16fd7d9c
Check link after fetching page as well
2023-08-30 02:14:19 -04:00
Jake Barnby
085b50be8b
Check if host is public domain before requesting
2023-08-30 02:04:52 -04:00
Jake Barnby
d3929a5bae
Fix forced username and password requirement
2023-08-30 01:31:02 -04:00
Jake Barnby
3d0ae4b9d9
Remove invites codes
2023-08-30 00:31:38 -04:00
Jake Barnby
a1d0b67c6b
Fix SMTP
2023-08-30 00:30:44 -04:00
Jake Barnby
07f8e9411a
Apply suggestions from code review
2023-08-29 13:41:40 -04:00
Khushboo Verma
1293e7bc5f
Optimised list repositories endpoint
2023-08-29 23:07:34 +05:30
prateek banga
24eabf29d0
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-29 22:30:02 +05:30
prateek banga
112c7a5133
adds default attribute for providers
2023-08-29 22:29:48 +05:30
Matej Bačo
c98d5bd3cd
Fix SMTP after QA
2023-08-29 11:40:30 +02:00
prateek banga
1d6276eb9f
lint fix
2023-08-28 20:43:18 +05:30
prateek banga
264f0bd5dd
adds subscriber controllers
2023-08-28 20:41:05 +05:30
Matej Bačo
d4acbcf4f0
Add domain_enabled var
2023-08-28 16:08:50 +02:00
Matej Bačo
f130a9ebc9
linter fix
2023-08-28 14:21:35 +02:00
Matej Bačo
89c9f8da6a
Implement proper behaviour for SMTP sender
2023-08-28 14:19:37 +02:00
Bradley Schofield
82f400d177
Add more HTML back
2023-08-28 09:03:55 +01:00
Bradley Schofield
88d48715c5
Run Linter
2023-08-28 06:53:26 +01:00
Bradley Schofield
11dca76a70
Update teams.php
2023-08-28 06:53:02 +01:00
Bradley Schofield
1be5f58fd9
Update account.php
2023-08-28 06:14:43 +01:00
Bradley Schofield
ee0563c46f
Cover other routes and cleanup code
2023-08-28 06:09:28 +01:00
Bradley Schofield
1f1e7dd397
Remove Testing Bypasses
2023-08-28 05:55:40 +01:00
Bradley Schofield
608b6b3847
Continue work
2023-08-27 23:45:37 +01:00
Matej Bačo
596e59f2cc
response format fix, smtp QA fixes
2023-08-25 17:13:25 +02:00
prateek banga
639fae3156
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-25 16:03:37 +05:30
prateek banga
d7c8562260
removes target controllers from account service
2023-08-25 16:02:46 +05:30
prateek banga
24853004f9
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-25 04:49:02 +05:30
prateek banga
9be0592dab
lint fix
2023-08-25 04:46:15 +05:30
prateek banga
a266682951
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-25 04:44:13 +05:30
prateek banga
94b7f67e44
changes id to providerId for provider create controllers
2023-08-25 04:43:40 +05:30
prateek banga
d0c50403c8
adds test cases for topic controller
2023-08-25 04:36:41 +05:30
prateek banga
f835e1b52e
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-25 03:01:38 +05:30
prateek banga
048e8e81ba
removes permission from provider controllers
2023-08-25 02:59:06 +05:30
prateek banga
33028ebbf2
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-25 02:34:10 +05:30
prateek banga
33f4bd6ac4
adds custom id for provider controlers, fixes subquery
2023-08-25 02:32:51 +05:30
prateek banga
52f6b72f23
adds topic controllers
2023-08-25 01:45:17 +05:30
prateek banga
df77f92860
adds sub query for targets and topics, permission for user target
2023-08-25 01:22:16 +05:30
Matej Bačo
293e44e91e
Introduce SMTP ping timeout
2023-08-24 13:04:49 +02:00
prateek banga
eafea1c41d
formats messaging controller
2023-08-24 14:31:22 +05:30
prateek banga
5ca8dc0a73
merge cl-1.4.x
2023-08-24 14:10:26 +05:30
prateek banga
e8cc60b0c2
adds audit resource in messaging controllers
2023-08-24 14:05:51 +05:30
prateek banga
82d220e158
fixes audit events
2023-08-24 13:43:30 +05:30
Jake Barnby
55deaec8b2
Fix missing env
2023-08-23 17:53:24 -04:00
prateek banga
a95c29d546
lint fix
2023-08-24 01:55:08 +05:30
prateek banga
ec54000263
adds test for target controllers
2023-08-24 01:54:25 +05:30
prateek banga
ac33d7828f
Revert "Pint linter ran"
...
This reverts commit bf5f0a8419
.
2023-08-24 01:53:52 +05:30
wess
bf5f0a8419
Pint linter ran
2023-08-23 13:12:43 -04:00
Matej Bačo
8802e318d5
Fix pools resource
2023-08-23 13:52:17 +02:00
prateek banga
c225563d77
adds test for provider controllers
2023-08-23 15:31:29 +05:30
Matej Bačo
bdc9cb5bb5
QA changes
2023-08-23 10:29:01 +02:00
Matej Bačo
43b1c196e0
Merge branch 'feat-git-integration' into feat-git-integration-copy
2023-08-23 10:16:23 +02:00
Jake Barnby
b58c34a052
Add global scope to fix invalid routes getting 401 instead of 404
2023-08-22 22:42:04 -04:00
Jake Barnby
3ec84986b2
Fix project imports
2023-08-22 22:04:36 -04:00
Jake Barnby
2286c7a4b7
Fix param order
2023-08-22 22:03:12 -04:00
Jake Barnby
c99288229f
Add back missing route
2023-08-22 21:36:32 -04:00
Jake Barnby
537756551e
Fix missing accessedAt
2023-08-22 21:36:04 -04:00
Jake Barnby
339893f4f1
Fix param order
2023-08-22 21:35:27 -04:00
Jake Barnby
43ba14fb75
Fix console tests
2023-08-22 21:35:00 -04:00
Jake Barnby
a84e669a1f
Add missing accessedAt values when creating users
2023-08-22 21:34:23 -04:00
Jake Barnby
efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
...
# Conflicts:
# app/controllers/api/users.php
# composer.json
# composer.lock
# tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
Jake Barnby
02f8e7796d
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
2023-08-22 17:20:50 -04:00
Jake Barnby
8b4479aa99
Merge pull request #5988 from appwrite/feat-1.4.x-response-filters
...
Create 1.4 response filter
2023-08-22 17:20:21 -04:00
Jake Barnby
0094ced967
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4.x-response-filters
2023-08-22 17:13:12 -04:00
Vincent (Wen Yu) Ge
31b8c77b5c
Fix typos, improve a few errors
2023-08-22 20:30:00 +00:00
Vincent (Wen Yu) Ge
07a7a710ee
Improve error and copy in params/models
2023-08-22 20:11:33 +00:00
Jake Barnby
2edbb1269f
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-22 16:02:29 -04:00
Jake Barnby
87b72e4d0d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters
2023-08-22 16:01:19 -04:00
Jake Barnby
00dd77e930
Fix exception condition
2023-08-22 14:14:57 -04:00
Jake Barnby
f202294fc6
Merge branch 'feat-1.4.x-response-filters' of github.com:appwrite/appwrite into feat-1.4.x-response-filters
2023-08-22 14:14:39 -04:00
Jake Barnby
45a4e076ea
Fix exception condition
2023-08-22 14:14:20 -04:00
Jake Barnby
360935fd28
Apply suggestions from code review
2023-08-22 14:13:37 -04:00
Jake Barnby
c3682362e9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
...
# Conflicts:
# app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby
e7d5d25263
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4.x-response-filters
...
# Conflicts:
# app/controllers/api/proxy.php
2023-08-22 13:37:03 -04:00
Matej Bačo
ff9eb39689
Rever changes
2023-08-22 19:32:19 +02:00
Matej Bačo
4a2f10f938
Fix request host missing
2023-08-22 19:28:37 +02:00
Jake Barnby
c929fe113e
Fix colliding ID overrides
2023-08-22 13:11:32 -04:00
prateek banga
ab89abfc89
lint fix
2023-08-22 22:16:09 +05:30
prateek banga
78385a59c6
adds remaining provider controllers
2023-08-22 22:15:31 +05:30
Matej Bačo
ee06ecf5c5
Linter
2023-08-22 15:18:07 +02:00
Matej Bačo
eea43e17bd
Fix function request filter
2023-08-22 15:16:07 +02:00
prateek banga
9f19bec7a7
lint fix
2023-08-22 18:21:30 +05:30
Matej Bačo
ce54c71e16
Fix 404 pages
2023-08-22 12:23:49 +02:00
Matej Bačo
e345ef071a
Allow custom deployment entrypoint
2023-08-22 11:47:10 +02:00
Matej Bačo
7c1a387a37
Improve commands quality
2023-08-22 10:16:17 +02:00
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# app/controllers/api/functions.php
# composer.json
# composer.lock
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Vincent (Wen Yu) Ge
caf6bcae95
Remove mention of environment variables in docs
2023-08-22 04:16:41 +00:00
Jake Barnby
6c67172fd7
Fix missing ID
2023-08-21 23:45:32 -04:00
Jake Barnby
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04:00
Eldad A. Fux
8e46bdf7cb
Merge branch 'feat-git-integration' into feat-usage-rollback
2023-08-21 22:46:09 +03:00
Steven Nguyen
a012a42008
Create 1.4 request filters
2023-08-21 11:52:03 -07:00
Steven Nguyen
0a0a5e9f04
Create 1.4 response filter
2023-08-21 11:48:48 -07:00
Matej Bačo
fedac9592b
Fix id null schedule bug
2023-08-21 19:43:03 +02:00
prateek banga
4406c7bd55
adds messaging worker and send an email controller
2023-08-21 22:15:15 +05:30
Matej Bačo
7c184498bb
Fix GitHub app auth and migrations
2023-08-21 15:16:02 +02:00
Bradley Schofield
b7d053f60d
Update migrations.php
2023-08-21 13:42:02 +01:00
Khushboo Verma
d5968f3f2a
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-21 17:03:40 +05:30
shimon
1969ea9d16
rolling back usage flow
2023-08-21 13:50:45 +03:00
shimon
722a7ce8c9
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
2023-08-21 13:50:34 +03:00
prateek banga
a6d613542b
adds messaging api controlle for mailgun provider
2023-08-21 16:14:50 +05:30
Bradley Schofield
9d88017e1f
Add Download Deployment Function
2023-08-21 11:21:18 +01:00
shimon
7ba42b0d6c
rolling back usage flow
2023-08-21 11:53:00 +03:00
prateek banga
fe8b8d3dc6
fix lint
2023-08-21 14:14:06 +05:30
prateek banga
5e3065c30a
merge resolve conflicts
2023-08-21 14:07:18 +05:30
shimon
3cca907465
rolling back usage flow
2023-08-21 11:10:23 +03:00
shimon
99a43dec8c
rolling back usage flow
2023-08-21 10:34:34 +03:00
shimon
f261ef8b70
rolling back usage flow
2023-08-21 10:31:12 +03:00
Khushboo Verma
4a80b08f4b
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-20 22:54:44 +05:30
shimon
e86286e7e3
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
...
Conflicts:
composer.lock
2023-08-20 18:07:57 +03:00
shimon
83ffea68d1
rolling back usage flow
2023-08-20 16:53:26 +03:00
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
Matej Bačo
7bdbd51255
PR review changes
2023-08-20 14:14:05 +02:00
Khushboo Verma
e83f0f7b56
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-20 15:13:13 +05:30
Khushboo Verma
afbadf9322
Add search attribute to redeploy endpoint
2023-08-20 15:13:05 +05:30
Matej Bačo
60d24e0072
Downgrade assistant
2023-08-20 11:42:17 +02:00
Matej Bačo
20a2d3755e
Add vars for Console
2023-08-20 10:10:42 +02:00
Matej Bačo
efe3793679
PR review changes, fix node test
2023-08-19 20:26:47 +02:00
Khushboo Verma
78a224be14
Fix deployment creation on branch creation
2023-08-19 18:24:43 +05:30
Khushboo Verma
3305e300b1
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-19 18:21:40 +05:30
Khushboo Verma
1284449765
Fixed GitHub comments
2023-08-19 18:21:27 +05:30
Matej Bačo
5de7c24ee8
Fix more function tests
2023-08-19 13:37:45 +02:00
Jake Barnby
9b2226b243
Fix manual and VCS redeploys
2023-08-19 02:15:47 -04:00
prateek banga
36a5d1e245
adds remaining controllers for target in account and users
2023-08-18 23:28:12 +05:30
Jake Barnby
1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
2023-08-18 13:25:21 -04:00
Jake Barnby
a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.json
# composer.lock
2023-08-18 13:23:35 -04:00
Bradley Schofield
0ebd6d43d5
Merge branch 'feat-git-integration' into feat-git-integration-migrations
2023-08-18 11:18:58 +01:00
Khushboo Verma
c1b7b6cd0d
Update limits
2023-08-18 12:44:13 +05:30
Khushboo Verma
76c3eb5c65
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-18 12:26:11 +05:30
Khushboo Verma
00f6785818
Addressed PR comments
2023-08-18 12:25:44 +05:30
Jake Barnby
a3895b041a
Apply suggestions from code review
2023-08-17 21:48:21 -04:00
Jake Barnby
a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2023-08-17 19:54:25 -04:00
Jake Barnby
a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.lock
2023-08-17 19:51:36 -04:00
Jake Barnby
92c39470be
Merge pull request #5800 from appwrite/fix-team-update-membership
...
Update method name for `updateMembershipRoles`
2023-08-17 19:43:56 -04:00
Jake Barnby
861ed521a0
Merge branch '1.4.x' into fix-team-update-membership
...
# Conflicts:
# app/config/specs/open-api3-1.4.x-client.json
# app/config/specs/open-api3-1.4.x-console.json
# app/config/specs/open-api3-1.4.x-server.json
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-1.4.x-client.json
# app/config/specs/swagger2-1.4.x-console.json
# app/config/specs/swagger2-1.4.x-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2023-08-17 17:51:24 -04:00
Jake Barnby
3c3326260a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# composer.lock
2023-08-17 17:39:26 -04:00
Jake Barnby
07c985ebc3
Fix missing params from redeploy event
2023-08-17 17:37:52 -04:00
prateek banga
f73b3bf272
deletes user cache document
2023-08-18 01:07:42 +05:30
Bradley Schofield
e8056834aa
Run Formatter
2023-08-17 15:55:28 +01:00
Bradley Schofield
6577fc17a9
Remove ./vendor import and add missing envvars
2023-08-17 15:54:19 +01:00
Khushboo Verma
4285d99f08
Added exception for repo creation + small fixes
2023-08-17 19:24:57 +05:30
prateek banga
27df545fb7
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into fix-5404-update-document-without-relation-permission
2023-08-17 19:15:33 +05:30
prateek banga
860e9958c7
lint fix
2023-08-17 19:04:41 +05:30
prateek banga
c83e4db23d
lint fix
2023-08-17 19:02:07 +05:30
prateek banga
07b7a9db0f
adds controller for creating a user target
2023-08-17 17:24:45 +05:30
Jake Barnby
414d85be8e
Update mode checks
2023-08-16 17:58:25 -04:00
Jake Barnby
b6ffb385a7
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
...
# Conflicts:
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-16 15:55:19 -04:00
Bradley Schofield
7fedac9306
Handle Eldad Suggestions
2023-08-16 19:08:24 +01:00
Bradley Schofield
47b10fa82b
Implement IAM Custom Roles
2023-08-16 18:17:20 +01:00
Bradley Schofield
a0cd65b94b
Fix Migrations Stability
2023-08-16 16:01:56 +01:00
prateek banga
e53f189b3b
lint fix
2023-08-16 20:17:36 +05:30
prateek banga
c7dec3762b
Adds getTarget and list targets controller to user and account
2023-08-16 20:13:38 +05:30
prateek banga
92e587769a
resolve merge conflicts
2023-08-16 15:16:45 +05:30
Matej Bačo
3a6f10fa62
Fix failing tests
2023-08-16 08:19:42 +02:00
Jake Barnby
8820d422be
Update app/controllers/api/databases.php
2023-08-14 20:45:05 -04:00
Jake Barnby
4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param
2023-08-14 19:37:37 -04:00
Jake Barnby
c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-14 19:33:56 -04:00
prateek banga
8e1ef812d3
resolve merge conflicts
2023-08-14 21:59:24 +05:30
Damodar Lohani
9d15f70db5
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2
2023-08-13 00:45:11 +00:00
Matej Bačo
ec82fec59f
Re-enable assistant
2023-08-12 21:08:44 +02:00
Matej Bačo
c24e2786fb
Even more PR review changes
2023-08-11 18:52:13 +02:00
Matej Bačo
f0125ac3bb
PR review changes
2023-08-11 18:44:05 +02:00
Matej Bačo
897d299ae6
PR review changes, fixes from QA
2023-08-11 15:34:57 +02:00
prateek banga
971ebbc686
fix test cases
2023-08-11 16:17:31 +05:30
Matej Bačo
1bd96228bf
Fix file responses from router
2023-08-11 11:19:05 +02:00
Matej Bačo
5032fd7d08
Fix AI endpoints
2023-08-11 09:52:08 +02:00
Jake Barnby
16cb495a41
Lint
2023-08-10 21:31:31 -04:00
Jake Barnby
6cd0e328d9
Review fixes
2023-08-10 16:44:38 -04:00
Bishwajeet Parhi
d0755a587f
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-10 22:31:53 +05:30
Khushboo Verma
dfd686436a
Fix fetch commit details condition
2023-08-10 17:52:10 +05:30
prateek banga
8cefc54ca3
merge resolve conflicts
2023-08-10 17:22:15 +05:30
Matej Bačo
2a94dacdd1
Fix deployment issues from QA server
2023-08-10 02:31:49 +02:00
Matej Bačo
b9c52d8583
QA after merge fix
2023-08-10 01:44:00 +02:00
Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02:00
Matej Bačo
75e66e675b
Move oauth secret to identity
2023-08-10 01:02:13 +02:00
Bradley Schofield
d001f14249
Add Service Account Role Assignment
2023-08-09 23:46:23 +01:00