Commit Graph
16585 Commits
Author SHA1 Message Date
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
Jake Barnby 171f22daa0 Merge pull request #5604 from 2002Bishwajeet/feat-add-encrypt-param
feat: add encrypt param to string attribute
2023-08-14 20:45:15 -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 0ca90cee6c Fix test 2023-08-14 19:30:11 -04:00
Jake Barnby 03cdae245e Merge pull request #5923 from appwrite/v19-migration
V19 migration - uid varchar
2023-08-11 19:30:17 -04:00
Jake Barnby efe81f5723 Merge branch 'cl-1.4.x' into v19-migration 2023-08-11 19:29:12 -04:00
Christy Jacob 5e4e7ff5a5 Merge pull request #5968 from appwrite/feat-implement-migrations
Feat: Move oauth secret to identity
2023-08-10 03:04:06 +04:00
Matej Bačo 75e66e675b Move oauth secret to identity 2023-08-10 01:02:13 +02:00
Christy Jacob 598813d276 Merge pull request #5938 from appwrite/feat-implement-migrations
Implement Migrations
2023-08-10 02:53:45 +04: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
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
Christy Jacob 1f2a3c02bf Merge pull request #5953 from appwrite/feat-user-identities-cl-1.4.x
Separate OAuth2 info from Sessions into Identities
2023-08-09 21:06:42 +04:00
Steven Nguyen 4a9ac08e75 Update description for some of the account endpoints for clarity 2023-08-09 10:02:01 -07: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
Bradley Schofield 1135060681 Start work on identities implementation 2023-08-09 16:18:17 +01: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
Christy Jacob 21e3bc7cb4 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into cl-1.4.x 2023-08-09 13:55:50 +00:00
Christy Jacob 0d7597c4e2 Merge pull request #5964 from appwrite/remove-vcs-assets
Remove VCS assets
2023-08-09 11:58:01 +04:00
Khushboo Verma 8a8dfa1605 Remove VCS assets 2023-08-09 13:24:09 +05:30
Jake Barnby d2ef51551d Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
Christy Jacob 76cd8f9c24 Merge pull request #5961 from appwrite/1.4.x
Sync 1.4.x
2023-08-09 03:06:04 +04:00
Christy Jacob fe9ed76554 chore: update dependencies 2023-08-08 22:03:18 +00:00
Christy Jacob 5be55f05e8 feat: update error page 2023-08-08 21:25:48 +00:00
Christy Jacob 4f780a6caa chore: trigger ci 2023-08-08 20:53:42 +00: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
Jake Barnby b196914638 Fix console/API key checks 2023-08-08 15:46:01 -04:00
Bradley Schofield 47ebf77ff0 Continue work on OAuth Firebase last stage 2023-08-08 20:28:38 +01:00
Christy Jacob c1167f7dc7 Merge pull request #5371 from appwrite/disallow-personal-data
Disallow personal data
2023-08-08 23:08:10 +04: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
Christy Jacob 5b42d2c21f feat: review comments 2023-08-08 16:47:51 +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 9408a7e34f Update .env 2023-08-08 14:03:36 +01:00
Bradley Schofield f4cbcb1383 Re-Add collections 2023-08-08 13:45:33 +01:00
Bradley Schofield 31ac9b8367 Update docker-compose.yml 2023-08-08 11:18:29 +01:00
Bradley Schofield 388b43ea84 Update .env 2023-08-08 11:16:19 +01:00
Bishwajeet Parhi 2f3e14932a fix: Tests 2023-08-08 11:34:02 +05:30
Bishwajeet Parhi c3ebdc46e2 Merge branch 'master' into feat-add-encrypt-param 2023-08-08 11:04:28 +05:30
Bradley Schofield e28dd260c3 Update init.php 2023-08-07 16:17:34 +01:00
Bradley Schofield 893dbead7c Update composer.lock 2023-08-07 16:16:28 +01: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 88e1deefb5 Merge pull request #5929 from appwrite/feat-sync-1.4-with-master
Sync with master
2023-08-07 17:57:43 +03:00