1
0
Fork 0
mirror of synced 2024-08-27 08:02:22 +12:00
Commit graph

2871 commits

Author SHA1 Message Date
Matej Bačo
1a6530fb57 Fix project variables 2023-09-05 10:21:36 +02:00
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
f4cba83072 chore: update default env variables 2023-09-01 18:46:49 -04: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
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
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
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
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
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
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
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
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
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
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
Bradley Schofield
c6302014f5
Run Linter 2023-08-09 23:51:36 +01:00
Bradley Schofield
d001f14249
Add Service Account Role Assignment 2023-08-09 23:46:23 +01:00
Matej Bačo
a2a50d066b More deployment changes 2023-08-09 20:00:25 +02:00
Khushboo Verma
ced6eed6fa Add urls in deployment details 2023-08-09 23:05:23 +05:30
Bradley Schofield
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-09 18:08:40 +01:00
Steven Nguyen
c7c546bfe7
Add a secrets attribute to the identities collection
These secrets can be used to store data from the provider that may or
may not be sensitive.

For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.

This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 09:01:51 -07:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-09 09:01:29 -07:00
Bradley Schofield
1135060681
Start work on identities implementation 2023-08-09 16:18:17 +01:00
Steven Nguyen
14b84ed9e6
Add a secrets attribute to the identities collection
These secrets can be used to store data from the provider that may or
may not be sensitive.

For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.

This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 08:15:44 -07:00
Christy Jacob
7d60e4272d Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations 2023-08-09 13:59:44 +00:00
Khushboo Verma
e267349a88 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-09 16:33:49 +05:30
Khushboo Verma
056b7120a6 Add additional information to deployments 2023-08-09 16:24:46 +05:30
Matej Bačo
9d0eda68d6 Upgrade after conflict 2023-08-09 12:35:04 +02:00
Matej Bačo
93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
Matej Bačo
a60b54f434 Use identities table 2023-08-09 11:52:34 +02:00
Eldad A. Fux
6ce3045f89
Merge pull request #5921 from appwrite/feat-user-identities-git-integration
Separate OAuth2 info from Sessions into Identities
2023-08-09 10:18:43 +03:00
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
Christy Jacob
c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Bradley Schofield
47ebf77ff0 Continue work on OAuth Firebase last stage 2023-08-08 20:28:38 +01:00
Christy Jacob
347cd4d13f feat: generte specs 2023-08-08 16:58:06 +00:00
Christy Jacob
82a206d808 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07:00
Bradley Schofield
f0477a7f2b Move collections and update redirect sig 2023-08-08 14:36:44 +01:00
Bradley Schofield
f4cbcb1383 Re-Add collections 2023-08-08 13:45:33 +01:00
Matej Bačo
2b96fb6c6f Allow editing runtime 2023-08-08 11:28:25 +02:00
Bishwajeet Parhi
b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration 2023-08-07 14:46:00 -07:00
Bradley Schofield
91c82f0d7d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-07 16:09:28 +01:00
Eldad A. Fux
04b8030a27
Merge pull request #5875 from appwrite/fix-aac-file-issue
audio/aac mime type added
2023-08-07 17:33:50 +03:00
Bradley Schofield
f27345fb92 Update SDK 2023-08-07 11:56:42 +01:00
Matej Bačo
2bbdbaebd3 Upgrade SDKs 2023-08-06 21:14:25 +02:00
Matej Bačo
3b15dccc84 More QA fixes 2023-08-06 15:42:18 +02:00