prateek banga
379f7b9aa2
fixes subquery attribute in collection config
2023-08-28 20:41:47 +05:30
Matej Bačo
ec174c179f
Update compose.phtml
2023-08-28 16:23:16 +02:00
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
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
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
d7c8562260
removes target controllers from account service
2023-08-25 16:02:46 +05:30
prateek banga
c59887e8fb
fixes issue in sub queries
2023-08-25 15:55:04 +05:30
prateek banga
9be0592dab
lint fix
2023-08-25 04:46:15 +05:30
prateek banga
94b7f67e44
changes id to providerId for provider create controllers
2023-08-25 04:43:40 +05:30
prateek banga
048e8e81ba
removes permission from provider controllers
2023-08-25 02:59:06 +05:30
prateek banga
33f4bd6ac4
adds custom id for provider controlers, fixes subquery
2023-08-25 02:32:51 +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
Jake Barnby
7636fe23ac
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-23 16:19:55 -04:00
Jake Barnby
0e7a136cf8
Fix deletes worker crash
2023-08-23 16:19:22 -04:00
Khushboo Verma
ff2ec8a93b
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-24 01:09:40 +05:30
Khushboo Verma
46852392b3
Added github console env variables to docker-compose
2023-08-24 01:09:02 +05:30
Jake Barnby
0a5b0fa06b
Fix functions worker crash
2023-08-23 15:08:26 -04: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
wess
bf5f0a8419
Pint linter ran
2023-08-23 13:12:43 -04:00
wess
eba91ae55a
Stubbing in tests and message builder
2023-08-23 12:22:04 -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
wess
3e7805afe1
Updates deps
...
Adds message builders to messaging worker
Adds Makefile to .gitignore ;)
2023-08-23 08:49:32 -04:00
Matej Bačo
8802e318d5
Fix pools resource
2023-08-23 13:52:17 +02:00
Matej Bačo
d3a9766c4f
Sync env & storage setup with 1.4.x
2023-08-23 12:08:48 +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
0639ac1ab3
Fix builds worker trying to update documents that don't exist
2023-08-23 00:43:23 -04: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
83cd30c63c
Fix API keys missing public scope
2023-08-22 21:50:40 -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
41faa7420f
Fix diff
2023-08-22 19:25:07 -04:00
Jake Barnby
b66734e49b
Revert commented vars
2023-08-22 19:19:46 -04:00
Jake Barnby
39ef0cc3c9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-git-integration-update-migration
...
# Conflicts:
# app/controllers/api/proxy.php
# composer.lock
2023-08-22 18:07:11 -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
dbbf4522e3
lint fix
2023-08-22 22:17:32 +05:30
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
4fbb98b705
upgrade executor
2023-08-22 17:20:23 +02:00
Matej Bačo
50059e90e9
Upgrade console
2023-08-22 16:17:41 +02:00
Jake Barnby
97429bf57f
Merge remote-tracking branch 'origin/feat-git-integration-update-migration' into revert-some-migrations
...
# Conflicts:
# src/Appwrite/Migration/Version/V19.php
2023-08-22 10:10:46 -04:00
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
Khushboo Verma
1b476eb774
Updated SDK
2023-08-22 18:05:51 +05:30
Khushboo Verma
ad680d547a
Fix grammar in GitHub comments
2023-08-22 16:52:42 +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
58cf106d7f
Update console
2023-08-22 11:05:08 +02:00
Matej Bačo
7c1a387a37
Improve commands quality
2023-08-22 10:16:17 +02:00
Khushboo Verma
310512dbfe
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-22 12:43:28 +05:30
Khushboo Verma
658ce3cb62
Updated email id
2023-08-22 12:43:00 +05:30
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
Vincent (Wen Yu) Ge
1ffd660334
Improve error copy
2023-08-22 04:15:15 +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
Steven Nguyen
ebe114617e
Fix "Pool 'console' is empty" error by breaking from loop when ready
2023-08-21 15:53:30 -07:00
Steven Nguyen
a13b7606a2
Fix console db namespace
2023-08-21 15:53:30 -07:00
Steven Nguyen
5d6029fe7d
Uncomment new db env vars
2023-08-21 15:53:30 -07:00
Steven Nguyen
6bb04ca95e
Bump appwrite version to 1.4.0
2023-08-21 15:53:30 -07:00
Matej Bačo
4b90517dfd
Update console
2023-08-21 23:11:34 +02: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
Khushboo Verma
c016ad7415
Added commitHash to git clone command
2023-08-21 17:03:07 +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
Bradley Schofield
1f32b2f6f6
Merge branch 'feat-git-integration' of https://github.com/appwrite/appwrite into feat-git-integration
2023-08-20 14:27:43 +01:00
Bradley Schofield
558a7d9eee
Add Shell Escapes
2023-08-20 14:27:34 +01: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
621e49e4b6
Add host to execution detail
2023-08-20 13:43:06 +02:00
Matej Bačo
4d84cb2e45
Fix wrong preview url hostname
2023-08-20 12:26:23 +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
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
Khushboo Verma
74c97a833c
Removed null check for scheduleId
2023-08-19 18:30:22 +05:30
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
Matej Bačo
e17281caec
Update console
2023-08-19 10:05:59 +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
aa9ea0e013
Increment Version Number
2023-08-18 15:23:47 +01:00
Bradley Schofield
5c40f985f7
Run Linter
2023-08-18 11:19:51 +01: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
Steven Nguyen
e8f5229756
Fix console db namespace
2023-08-17 17:17:13 -07:00
Steven Nguyen
9f6b27f828
Uncomment new db env vars
2023-08-17 17:17:13 -07:00
Steven Nguyen
22780b87dc
Bump appwrite version to 1.4.0
2023-08-17 17:10:14 -07: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
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
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
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
Matej Bačo
3a6f10fa62
Fix failing tests
2023-08-16 08:19:42 +02:00
Jake Barnby
04d0e284a1
Update specs
2023-08-14 22:29:47 -04: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
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
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
Bishwajeet Parhi
d00af693bb
fix duplicate locale code and tests passes
2023-08-11 21:29:13 +05:30
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
prateek banga
0304adf872
fix test cases
2023-08-11 16:19:05 +05:30
prateek banga
971ebbc686
fix test cases
2023-08-11 16:17:31 +05:30
Matej Bačo
1592533c98
Disable coroutine to fix DB issues
2023-08-11 12:02:06 +02:00
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
Bishwajeet Parhi
5c8618410b
chore: implement blacklist and regenerate specs
2023-08-11 13:13:46 +05:30
Jake Barnby
16cb495a41
Lint
2023-08-10 21:31:31 -04:00
Bishwajeet Parhi
528846c35e
fix: missing Whitelist enums
2023-08-11 02:25:50 +05:30
Jake Barnby
6cd0e328d9
Review fixes
2023-08-10 16:44:38 -04:00
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
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
0111f25ef5
Update console
2023-08-10 03:01:24 +02:00
Matej Bačo
2a94dacdd1
Fix deployment issues from QA server
2023-08-10 02:31:49 +02:00
Matej Bačo
659b2d7504
Update console
2023-08-10 01:54:06 +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
c6302014f5
Run Linter
2023-08-09 23:51:36 +01:00
Bradley Schofield
f4ef252bf2
Update migrations.php
2023-08-09 23:47:51 +01:00
Bradley Schofield
d001f14249
Add Service Account Role Assignment
2023-08-09 23:46:23 +01:00
Matej Bačo
3ed4a65828
Fix VCS after lib upgrade
2023-08-09 23:00:04 +02: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
09254aeae0
Add description for the delete account identity's identityId param
2023-08-09 09:25:29 -07: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
Khushboo Verma
2856077c04
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-09 21:24:24 +05:30
Khushboo Verma
a63a668601
Add additional deployment info
2023-08-09 21:23:58 +05:30
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
18cf10139d
Asset names
2023-08-09 18:40:28 +05:30
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
ebeda626cd
Update console
2023-08-09 11:53:17 +02:00
Matej Bačo
a60b54f434
Use identities table
2023-08-09 11:52:34 +02:00
Khushboo Verma
c6cdc0c37c
Fix broken functions flow
2023-08-09 13:16:17 +05:30
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
prateek banga
4d03610755
resolve merge conflicts
2023-08-09 03:23:45 +05:30
Christy Jacob
5be55f05e8
feat: update error page
2023-08-08 21:25:48 +00:00
