1
0
Fork 0
mirror of synced 2024-10-04 04:06:16 +13:00
Commit graph

3072 commits

Author SHA1 Message Date
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
dedacecb52 Enable coroutines for VCS, upgrade version to 1.4 2023-08-20 10:46:44 +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
Bradley Schofield
0ebd6d43d5
Merge branch 'feat-git-integration' into feat-git-integration-migrations 2023-08-18 11:18:58 +01:00
Bradley Schofield
bcfb0d1428
Fix Realtime 2023-08-18 11:11:24 +01:00
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
2d53c73e7a
Remove extra line 2023-08-17 22:15:33 -04:00
Jake Barnby
dbba62fe24
Remove permission index and _uid column type change migrations 2023-08-17 22:14:55 -04:00
Jake Barnby
a3895b041a
Apply suggestions from code review 2023-08-17 21:48:21 -04:00
Steven Nguyen
ccd8c86e88
Skip updating _uid attribute and _permission index
These updates make use of the PDO to manually execute a SQL statement,
but the PDO is not available in the new migration platform task. So
that we can move forward with the release, we will skip these updates
and then figure it out in a subsequent release.
2023-08-17 17:17:13 -07:00
Steven Nguyen
e8f5229756
Fix console db namespace 2023-08-17 17:17:13 -07:00
Steven Nguyen
436600547c
Fix Migration task after it was converted to a Platform task 2023-08-17 17:17:12 -07:00
Steven Nguyen
586ad1984c
Update 1.4 migration 2023-08-17 17:15:35 -07: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
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
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
Jake Barnby
23deb5c4df
Apply suggestions from code review 2023-08-14 21:57:48 -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
68601c5dc2
FIx lint 2023-08-14 19:35:18 -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
Bishwajeet Parhi
12a61feed4 chore: add PlatformType 2023-08-14 14:03:30 +05:30
Matej Bačo
ec82fec59f Re-enable assistant 2023-08-12 21:08:44 +02:00
Jake Barnby
efe81f5723
Merge branch 'cl-1.4.x' into v19-migration 2023-08-11 19:29:12 -04:00
Bishwajeet Parhi
e691efde6c chore: vars naming changes 2023-08-11 22:50:40 +05:30
Bishwajeet Parhi
4e0250cc9f
Update src/Appwrite/Specification/Format.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-11 22:46:48 +05:30
Bishwajeet Parhi
61a37a9a48
Update src/Appwrite/Specification/Format/OpenAPI3.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-11 22:46:24 +05:30
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
Jake Barnby
7cd995ac3c
Apply suggestions from code review 2023-08-11 12:29:55 -04:00
Matej Bačo
d219085196 More PR review changes 2023-08-11 17:17:32 +02:00
Matej Bačo
c6684ee7f8 PR review changes 2023-08-11 16:45:36 +02:00
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
d0755a587f Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-10 22:31:53 +05:30
prateek banga
233f4ebb56 lint fix 2023-08-10 20:03:47 +05:30
prateek banga
023e88ff56 removes condition 2023-08-10 20:00:13 +05:30
Matej Bačo
2a94dacdd1 Fix deployment issues from QA server 2023-08-10 02:31:49 +02:00
Matej Bačo
899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +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
Bradley Schofield
0d58d20635
Update Migration Lib 2023-08-09 18:08:10 +01: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
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
88ce493aa5 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-09 18:37:56 +05:30
Khushboo Verma
52b61c5c75 Add description to exception 2023-08-09 18:37:22 +05:30
Matej Bačo
35ea97ba15 Fix graph QL 2023-08-09 13:52:57 +02:00
Matej Bačo
b9d790224f Fix missing model 2023-08-09 13:29:56 +02: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
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
prateek banga
f6d7449dd5 remove select queries and prohibit queries from Base validator 2023-08-09 14:19:47 +05:30
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
prateek banga
4d03610755 resolve merge conflicts 2023-08-09 03:23:45 +05:30
prateek banga
11df973aa1 review changes 2023-08-09 02:39:04 +05:30
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
prateek banga
51ceb5d74a prohibit select queries in list attributes and remove static method 2023-08-09 00:12:53 +05:30
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
Bishwajeet Parhi
b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
prateek banga
769114d161 lint fix 2023-08-08 03:35:13 +05:30
prateek banga
7e185cd799 moved formatting logic to relationship attribute model 2023-08-08 03:34:13 +05:30
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration 2023-08-07 14:46:00 -07:00
Matej Bačo
11068696c9 QA changes 2023-08-07 17:37:36 +02: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
Matej Bačo
2bbdbaebd3 Upgrade SDKs 2023-08-06 21:14:25 +02:00
Matej Bačo
d5fd3a28f9 More QA fixes 2023-08-06 15:11:30 +02:00
Matej Bačo
906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Khushboo Verma
6cb5af2457 Update Comment Table 2023-08-06 02:10:53 +05:30
Matej Bačo
8a9f3f1b54 Update build to use 1 logs attribute 2023-08-05 16:50:28 +02:00
Eldad A. Fux
a56f91b054
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile 2023-08-05 06:36:21 +03:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen
57b031d7f5
Publicly allow filtering on identities.providerAccessTokenExpiry
This will allow developers to set up a job to find expired access tokens
so they can refresh them.
2023-08-04 15:07:36 -07:00
Steven Nguyen
cb7abdb906
Remove identity status
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-04 15:07:36 -07:00
Steven Nguyen
27e212553d
Separate OAuth2 info from Sessions into Identities
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-04 15:07:36 -07:00
Steven Nguyen
d1c0bccb59
Merge tag '1.3.8' into cloud-1.3.x 2023-08-04 14:12:58 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Bradley Schofield
8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
Bishwajeet Parhi
5f1a515f00 Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-04 19:20:44 +05:30
prateek banga
4dc8976863 add queries type for sdk generation 2023-08-04 14:53:56 +05:30
Matej Bačo
8bc933ab91 Fix template issues 2023-08-04 10:56:46 +02:00
prateek banga
91e434b3d6 optimize if condition in response output method 2023-08-04 14:01:08 +05:30
Matej Bačo
1db0c57518 PR review changes 2023-08-04 07:59:23 +02:00
Khushboo Verma
0b6fb471f6 Updated GitHub comment table 2023-08-04 01:04:04 +05:30
Steven Nguyen
a32d9abd98
Publicly allow filtering on identities.providerAccessTokenExpiry
This will allow developers to set up a job to find expired access tokens
so they can refresh them.
2023-08-03 11:07:22 -07:00
prateek banga
ea57a303d0 lint fixes 2023-08-03 17:39:13 +05:30
prateek banga
f797c2574a resolve merge conflicts with 1.4.x 2023-08-03 17:38:22 +05:30