Matej Bačo
f4ada97d1a
Allow any hostname, and serve API+Console by default
2023-09-05 17:02:07 +02:00
Matej Bačo
ac62641f5a
Add assistant scole to console member
2023-09-05 15:55:13 +02:00
Matej Bačo
1a6530fb57
Fix project variables
2023-09-05 10:21:36 +02:00
prateek banga
337839103f
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-05 13:15:12 +05:30
prateek banga
3f95d6abd5
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-collections-in-config
2023-09-05 01:34:02 +05:30
prateek banga
ea324262e7
updated messaging collectin
2023-09-05 01:33:50 +05:30
Steven Nguyen
3c7c44adda
Fix _APP_EXECUTOR_HOST for upgrades
...
As of 1.4.0, the hostname of the executor should be executor rather than
appwrite-executor. The problem is our install command always uses the
existing installation's variable values as the default for the upgrade.
This means the _APP_EXECUTOR_HOST will retain it's old value.
This PR Adds an overwrite key to variables.php to allow overwriting the
variable value regardless of whatever was in the previous installation.
2023-09-04 11:06:43 -07:00
Matej Bačo
7588a9c4ec
Make v2 functions work again
2023-09-04 19:53:25 +02:00
Christy Jacob
dcdfeed391
Merge branch 'master' of github.com:appwrite/appwrite into chore-update-sdks
2023-09-01 13:25:27 -04:00
Christy Jacob
7f42ca2b7b
chore: generate specs
2023-08-31 21:52:28 -04:00
Christy Jacob
bf4444b045
chore: update sdks for apwrite 1.4.1
2023-08-31 18:08:24 -04:00
prateek banga
1762c81b8d
Merge branch 'feat-messages-event-config' into feat-mailgun-provider
2023-08-31 18:32:26 +05:30
prateek banga
0534b11b32
Merge branch 'feat-add-messaging-response-models' into feat-messages-event-config
2023-08-31 18:26:32 +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
prateek banga
7fd124705c
merge master
2023-08-31 18:11:56 +05:30
Jake Barnby
781aa8025a
Fix style typo
2023-08-30 20:39:40 -04:00
Jake Barnby
922332042e
Fix template strings
2023-08-30 20:31:11 -04:00
Jake Barnby
f10698aebe
Merge pull request #6073 from appwrite/chore-update-version
...
Chore update version
2023-08-30 16:25:06 -04:00
Jake Barnby
513d913298
Merge remote-tracking branch 'origin/1.4.x' into chore-sync-master
...
# Conflicts:
# app/config/specs/open-api3-1.4.x-console.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/swagger2-1.4.x-console.json
# app/config/specs/swagger2-latest-console.json
2023-08-30 16:11:48 -04:00
Jake Barnby
e018c29b71
Bump .NET SDK version
2023-08-30 15:48:01 -04:00
Jake Barnby
fc3ff188b1
Fix VCS + migrations scopes
2023-08-30 14:44:33 -04:00
Christy Jacob
cc8aa27fea
feat: update specs
2023-08-30 12:36:47 -04: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
Jake Barnby
3f3d518f36
Merge remote-tracking branch 'origin/1.4.x' into feat-git-integration
...
# Conflicts:
# docker-compose.yml
2023-08-29 14:40:46 -04:00
Jake Barnby
cfdc9dff1b
Remove cloud specific config
2023-08-29 14:25:00 -04:00
prateek banga
112c7a5133
adds default attribute for providers
2023-08-29 22:29:48 +05:30
Matej Bačo
ca40bf6702
Merge branch 'feat-git-integration' into fix-smtp-behaviour
2023-08-29 11:41:15 +02:00
Matej Bačo
c98d5bd3cd
Fix SMTP after QA
2023-08-29 11:40:30 +02:00
Torsten Dittmann
4f630e90b3
chore: update specs
2023-08-29 10:56:32 +02:00
Jake Barnby
ece93a14e5
Fix install task
2023-08-28 18:09:37 -04:00
prateek banga
379f7b9aa2
fixes subquery attribute in collection config
2023-08-28 20:41:47 +05:30
Matej Bačo
89c9f8da6a
Implement proper behaviour for SMTP sender
2023-08-28 14:19:37 +02:00
Bradley Schofield
c566843518
Style Changes
2023-08-28 09:35:26 +01:00
Bradley Schofield
82f400d177
Add more HTML back
2023-08-28 09:03:55 +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
c59887e8fb
fixes issue in sub queries
2023-08-25 15:55:04 +05:30
prateek banga
df77f92860
adds sub query for targets and topics, permission for user target
2023-08-25 01:22:16 +05:30
prateek banga
5ca8dc0a73
merge cl-1.4.x
2023-08-24 14:10:26 +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
Matej Bačo
06ba381b57
Merge branch 'feat-git-integration' of https://github.com/appwrite/appwrite into feat-git-integration
2023-08-23 20:35:29 +02:00
wess
bf5f0a8419
Pint linter ran
2023-08-23 13:12:43 -04:00
Bradley Schofield
bdd84735dd
Add Migrations and Assistant env vars
2023-08-23 14:00:21 +01:00
Matej Bačo
34a2ed3426
Update variables.php
2023-08-23 14:53:27 +02: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
5be66c3c11
Linter fix
2023-08-23 10:16:52 +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
83cd30c63c
Fix API keys missing public scope
2023-08-22 21:50:40 -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
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
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
c929fe113e
Fix colliding ID overrides
2023-08-22 13:11:32 -04:00
prateek banga
78385a59c6
adds remaining provider controllers
2023-08-22 22:15:31 +05:30
Matej Bačo
eea43e17bd
Fix function request filter
2023-08-22 15:16:07 +02:00
Khushboo Verma
1b476eb774
Updated SDK
2023-08-22 18:05:51 +05:30
Vincent (Wen Yu) Ge
1ffd660334
Improve error copy
2023-08-22 04:15:15 +00:00
prateek banga
a6d613542b
adds messaging api controlle for mailgun provider
2023-08-21 16:14:50 +05:30
prateek banga
5e3065c30a
merge resolve conflicts
2023-08-21 14:07:18 +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
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
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
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
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
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
Khushboo Verma
4285d99f08
Added exception for repo creation + small fixes
2023-08-17 19:24:57 +05:30
prateek banga
07b7a9db0f
adds controller for creating a user target
2023-08-17 17:24:45 +05:30
prateek banga
455176d077
Merge branch 'feat-add-messaging-collections-in-config' into feat-target-controllers-account-user
2023-08-16 20:29:19 +05:30
prateek banga
40f419663c
removes id attribute from collections config
2023-08-16 20:28:40 +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
ab655e69e6
Merge branch 'feat-add-messaging-collections-in-config' into feat-messages-event-config
2023-08-16 18:49:00 +05:30
prateek banga
9fc75e5535
moves messaging collection to common, adds subqueryTargets
2023-08-16 18:48:38 +05:30
prateek banga
37e5cecfb1
resolve merge conflicts
2023-08-16 18:35:15 +05:30
prateek banga
caad1a07d9
resolve merge conflicts
2023-08-16 18:21:04 +05:30
prateek banga
e2e4287801
resolve merge conflicts
2023-08-16 15:19:16 +05:30
prateek banga
92e587769a
resolve merge conflicts
2023-08-16 15:16:45 +05:30
Jake Barnby
04d0e284a1
Update specs
2023-08-14 22:29:47 -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
prateek banga
4b63a4abbb
resolve merge conflicts
2023-08-14 21:13:47 +05:30
prateek banga
296a54d0ce
adds messages event config and target attribute in user model
2023-08-14 21:11:24 +05:30
Bishwajeet Parhi
ac4701988a
generate api specs
2023-08-14 17:01:42 +05:30
Bishwajeet Parhi
d00af693bb
fix duplicate locale code and tests passes
2023-08-11 21:29:13 +05:30
Matej Bačo
897d299ae6
PR review changes, fixes from QA
2023-08-11 15:34:57 +02:00
Bishwajeet Parhi
5c8618410b
chore: implement blacklist and regenerate specs
2023-08-11 13:13:46 +05:30
Bishwajeet Parhi
528846c35e
fix: missing Whitelist enums
2023-08-11 02:25:50 +05:30
Bishwajeet Parhi
cec9798126
push latest specs
2023-08-11 00:44:22 +05:30
Bishwajeet Parhi
d0755a587f
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-10 22:31:53 +05:30
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
