1
0
Fork 0
mirror of synced 2024-07-04 22:20:45 +12:00
Commit graph

3120 commits

Author SHA1 Message Date
Prateek Banga d2ce8155e6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-15 01:06:17 +05:30
Jake Barnby 316cd4f8f8
Bump CLI, Swift, Apple SDK versions 2023-09-14 15:11:40 -04:00
Christy Jacob 50405f838e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into chore-cleanup-dockerfile 2023-09-14 18:07:53 +00:00
Steven Nguyen 15f54c0dba
Fix the _APP_FUNCTIONS_MAINTENANCE_INTERVAL variable
* Clarify the description and make it match the other maintenance
  variables.
* Fix the introduction since it was introduced in 1.4.0 and not 1.2.0.
* Fix the default value because it was 1 hour in the previous versions
  and a number that is too low will conflict with a function's timeout.
2023-09-13 16:23:14 -07: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 dbd227ed50 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-09-14 02:13:27 +05:30
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 778056d8e0 Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-13 17:08:37 +05:30
prateek banga f472ae578f Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-13 17:02:56 +05:30
prateek banga 9b6fc440d9 Review changes and adds enabled in providers collection 2023-09-13 16:57:59 +05:30
Jake Barnby 1f9872b398
Merge remote-tracking branch 'origin/1.5.x' into feat-add-messaging-response-models 2023-09-12 15:40:25 -04:00
Prateek Banga d14fbde9e7 removes provider sub query 2023-09-13 00:40:51 +05:30
Prateek Banga 118a50b894 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-12 22:07:17 +05:30
Prateek Banga 720c7300dc Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-12 22:06:31 +05:30
Prateek Banga 68365babd1 Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-12 22:05:45 +05:30
Prateek Banga 9fbad72b08 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-12 22:03:34 +05:30
Prateek Banga 5136724a29 fix default,type index 2023-09-12 22:02:19 +05:30
Prateek Banga b54556d10e Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-12 21:31:45 +05:30
Prateek Banga a69368973b Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-12 21:31:06 +05:30
Prateek Banga 878e56ae7e Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-12 21:24:11 +05:30
Prateek Banga d14a4c2506 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-12 21:23:18 +05:30
Prateek Banga 2f2875e3c0 lint fix 2023-09-12 21:19:21 +05:30
Prateek Banga ba96f71a3f Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-collections-in-config 2023-09-12 21:15:00 +05:30
Prateek Banga b7119a2718 review changes 2023-09-12 21:03:44 +05:30
Prateek Banga cbea4264ea merge master 2023-09-12 20:53:16 +05:30
Prateek Banga 996de004fb Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-11 20:41:52 +05:30
Prateek Banga ddbee0a55b Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-11 20:41:12 +05:30
Prateek Banga 8957640d27 Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-11 20:40:32 +05:30
Prateek Banga 899c962061 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-11 20:30:30 +05:30
Prateek Banga a59cfb6461 review changes 2023-09-11 20:30:21 +05:30
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 27741644e8 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-11 19:52:48 +05:30
Prateek Banga f4f1aa4b5b review changes and adds missing subqueries 2023-09-11 19:27:45 +05:30
Prateek Banga cf7b63fd2f Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-09 01:19:42 +05:30
Prateek Banga ee0f789e37 udpates deliveryError to be an array type 2023-09-09 01:18:26 +05:30
Christy Jacob da854f36dc chore: update changelog for dart and flutter 2023-09-07 18:33:23 -04:00
Christy Jacob 3d267bb4d9 chore: remove leftovers 2023-09-07 17:38:29 -04:00
Christy Jacob 1e3639bf6d Merge branch 'master' of github.com:appwrite/appwrite into chore-update-sdks 2023-09-07 17:18:42 -04:00
Jake Barnby 410072882d
Fix guests missing global scope 2023-09-07 12:00:53 -04:00
Christy Jacob eb3c237301 Merge branch 'master' of github.com:appwrite/appwrite into 1.4.x 2023-09-07 02:11:43 -04:00
Christy Jacob a1e3d7ba97 chore: generate specs 2023-09-07 02:10:15 -04:00
Christy Jacob 9c01e94d8a chore: generate specs 2023-09-07 02:09:53 -04:00
Christy Jacob 47427972bf fix: test failures 2023-09-07 00:57:23 -04:00
Christy Jacob 1a0054890d chore: bug fix with scopes 2023-09-06 22:02:14 +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 4ea0541623
Merge pull request #6150 from appwrite/fix-global-vars
Fix: Global variables
2023-09-06 13:51:13 -04:00
Christy Jacob db763b180c
Merge pull request #6142 from appwrite/fix-v2-functions
Fix: v2 functions
2023-09-06 12:43:51 -04:00
Christy Jacob 8e204f7105
Merge pull request #6153 from appwrite/fix-ai-assistant
Fix: AI Assistant
2023-09-06 00:08:27 -04:00
Christy Jacob 53b1c87c6e
Merge pull request #6141 from appwrite/fix-overwrite-executor-variable
Fix _APP_EXECUTOR_HOST for upgrades
2023-09-05 19:35:31 -04:00
Steven Nguyen d4f6c5f491
Update the error message for router_domain_not_configured
Explicitly list the environment variables that need to be configured to
make it clear what needs to be done.
2023-09-05 11:18:15 -07:00
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 597fd965f7 Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-05 22:57:48 +05:30
prateek banga 45ab78caa7 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-providers 2023-09-05 22:56:37 +05:30
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 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
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 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 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 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 491d58f146 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-28 20:42:12 +05:30
prateek banga 379f7b9aa2 fixes subquery attribute in collection config 2023-08-28 20:41:47 +05:30
prateek banga 264f0bd5dd adds subscriber controllers 2023-08-28 20:41:05 +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 9567bf3943 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-25 15:55:54 +05:30
prateek banga c59887e8fb fixes issue in sub queries 2023-08-25 15:55:04 +05:30
prateek banga d0c50403c8 adds test cases for topic controller 2023-08-25 04:36:41 +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
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
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
prateek banga 9057a50a10 rename provider param in config 2023-08-07 15:54:00 +05:30
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
Matej Bačo 345df3f2ca More QA fixes 2023-08-06 12:30:38 +02:00
Matej Bačo e60456cfda QA after merge with 1.4 2023-08-06 10:51:53 +02:00
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
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
Eldad A. Fux 702424ed31
Merge pull request #5694 from Miguelii/fix-5693-portuguese-email-template-missing-word
Added missing word to portuguese email template
2023-08-05 06:32:11 +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 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 aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Bradley Schofield 84b159938e Regenerate Specs 2023-08-04 17:23:42 +01:00
Bradley Schofield 8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
Bishwajeet Parhi dfc7ab97ab update spec files 2023-08-04 19:28:38 +05:30
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 4ca798f4d7 fix lint issues 2023-08-04 19:01:55 +05:30
prateek banga 867f3e8c08 adds messaging providers rename providers.php to authProviders.php 2023-08-04 19:00:08 +05:30
prateek banga 19fd30d6d8 fix lint issues 2023-08-04 15:01:26 +05:30
prateek banga 13e73d8558 add scopes required for messaging service 2023-08-04 14:55:03 +05:30
Matej Bačo 1db0c57518 PR review changes 2023-08-04 07:59:23 +02:00
Steven Nguyen b8e22151f6
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-02 15:37:22 -07:00
Steven Nguyen a235024268
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-02 15:36:06 -07:00
prateek banga 2d33681a0b add collections to config file 2023-08-02 20:28:30 +05:30
Eldad A. Fux 75894987f9
Merge pull request #5917 from appwrite/doc-dsn-url-encode
Update the docs for the _APP_SMS_PROVIDER env var
2023-08-02 08:43:58 +03:00
Steven Nguyen 5b36a820a4
Update the docs for the _APP_SMS_PROVIDER env var
To handle special characters like '@' or '/', the user
and secret values must be URL encoded.
2023-07-31 10:53:42 -07:00
Matej Bačo ac2ca267d7 Address more PR reviews 2023-07-31 08:47:47 +02:00
Matej Bačo c7605b85e0 Remove vcs prefix 2023-07-30 21:10:25 +02:00
Matej Bačo c3cef56e39 Bug fixing after QA 2023-07-30 15:12:55 +02:00
Matej Bačo 34d310154f Upgrade console 2023-07-30 14:17:50 +02:00
Matej Bačo 280b2fc994 Rename repositories and installation IDs 2023-07-30 11:51:13 +02:00
Matej Bačo a718f09f74 Update execution model, add detection to repository 2023-07-30 09:17:23 +02:00
Matej Bačo 2e177873c0 Update execution response model 2023-07-29 18:20:20 +02:00
Matej Bačo 22f638e6aa rename vcsRepos to vcsRepositories 2023-07-29 18:04:43 +02:00
Matej Bačo 6fb72db7c4 Rename exception 2023-07-29 18:03:13 +02:00
Matej Bačo 37c0cc122a More PR review changes 2023-07-28 10:27:16 +02:00
Matej Bačo ce98b04348 Address PR reviews 2023-07-28 09:56:07 +02:00
Steven Nguyen 3499a7028c
Create OAuth2 exception class 2023-07-27 17:19:49 -07:00
Steven Nguyen 611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Damodar Lohani 86ec1ec1d2 adding audio/x-hx-aac-adts as well 2023-07-25 01:08:46 +00:00
Damodar Lohani 82f2033f99
audio/aac mime type added 2023-07-25 06:37:27 +05:45
Matej Bačo 743c214a66 PR review changes 2023-07-24 15:12:36 +02:00
Matej Bačo 7e386b885c Upgrade console, reword commands into 1 param 2023-07-21 13:52:14 +02:00
loks0n 611fbf6b32 feat: X domain console cookie 2023-07-21 11:08:34 +01:00
Steven Nguyen 5be6d8e90b
Update Project providers to also include the provider key
Pass the provider key and name back so that a nicely formatted name
can be shown in the Appwrite Console.
2023-07-20 16:53:33 -07:00
Eldad A. Fux 7a02a1690a
Merge pull request #5449 from appwrite/feat-4299-oidc-oauth2-provider
Add a generic OIDC OAuth2 provider
2023-07-20 20:44:03 +03:00
Christy Jacob 882698d6e4 chore: update specs 2023-07-20 17:41:28 +04:00
Christy Jacob c26194e189 Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 17:19:18 +04:00
Christy Jacob 6cdc8a97b7 chore: update tests 2023-07-20 17:12:41 +04:00
Steven Nguyen 2befa60350
Track a user's last activity
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.

To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
2023-07-19 22:22:58 -07:00
Eldad A. Fux 66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Christy Jacob 4c8608b49c chore: update naming conventions 2023-07-20 02:24:32 +04:00
Christy Jacob 43ee8e1ed4 fix: update tests 2023-07-20 02:17:16 +04:00
Christy Jacob e493551f8a Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 01:44:25 +04:00
Bishwajeet Parhi faece71145 ignore adding enums for users/usage providers param 2023-07-19 21:47:23 +05:30
Damodar Lohani 4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Damodar Lohani 8044ab568c update specs 2023-07-19 07:32:32 +00:00
Damodar Lohani 8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00