1
0
Fork 0
mirror of synced 2024-07-06 07:00:56 +12:00
Commit graph

2915 commits

Author SHA1 Message Date
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
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
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
Bishwajeet Parhi 9c6956b947 update specs 2023-07-18 21:56:27 +05:30
Bishwajeet Parhi 3c15359447 Merge branch 'master' into feat-whitelist-enums 2023-07-18 21:22:48 +05:30
Bishwajeet Parhi 8f851aaa53 chore: refactor avatar, flags, credit-cards and update spec 2023-07-18 20:00:19 +05:30
Torsten Dittmann 74308b445e
Merge pull request #5587 from appwrite/feat-user-labels
Add a new labels attribute to the Users collection
2023-07-18 14:59:18 +02:00
jaivik 6380004678
Merge branch 'appwrite:master' into fix-5768-pull-request-to-return-team-id-conflict-error 2023-07-18 10:35:52 +05:30
David 3a42dca19e
Update es.json
Fixed suggested changes by Matej
2023-07-17 13:44:04 +02:00
Bishwajeet Parhi 3616756f50 chore: add x-enum-name param 2023-07-13 21:51:22 +05:30
jaivix 4db919b42d linting and wording updates based on stnguyen90 feedback 2023-07-13 00:33:38 +05:30
shimon d282dbf787 usage collections fix 2023-07-12 16:02:42 +03:00
Christy Jacob e0aa3db21e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-07-11 19:36:37 +00:00
Damodar Lohani cefaad386f update specs 2023-07-11 06:36:15 +00:00
Damodar Lohani 57bdf56c3d fix schedules collections 2023-07-11 02:12:28 +00:00
Christy Jacob 125c14d492 Merge branch 'master' of https://github.com/appwrite/appwrite into 1.3.x 2023-07-10 20:59:05 +00:00
Christy Jacob 42b66b938c
Merge pull request #5796 from appwrite/update-dotnet-docs-examples
doc: Add .NET SDK docs examples
2023-07-11 02:15:05 +05:30
Christy Jacob 7f5f6b352d Merge branch '1.3.x' of https://github.com/appwrite/appwrite into update-python-version 2023-07-10 20:38:56 +00:00
Aditya Oberai b4fea28787 Add .NET SDK docs examples 2023-07-11 00:15:46 +05:30
Christy Jacob 5aefa88a50 feat: update python version 2023-07-10 21:36:17 +04:00
Damodar Lohani f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
jaivix a6671a5caa fixed team creation response if teamId already exists 2023-07-09 16:50:09 +05:30
Aditya Oberai a7dd5f617d
Update .NET SDK version 2023-07-08 00:59:57 +05:30
Steven Nguyen 8258d70b78
Update user's search attribute using database filter
Using a database filter is the cleanest approach because it ensures
the logic is applied whenever the user is updated regardless of
whichever endpoint was used.
2023-07-05 12:17:47 -07:00
Matej Bačo f4da8079e2 Improve VCS indexes 2023-07-01 08:46:21 +02:00
Matej Bačo c6e491f2ed Support for external contributors 2023-06-28 10:48:10 +02:00
Matej Bačo cc06a4bdaa log streaming, locking GH comments, execution headers, locale header, redeploy logic 2023-06-22 12:59:41 +02:00
Matej Bačo 1b4036078b Improve response models for console 2023-06-18 16:08:53 +02:00
Matej Bačo a174562c4e vcs.createRepository() 2023-06-18 13:38:37 +02:00
Matej Bačo 5237e24739 VCS integration edge cases fix 2023-06-17 12:07:30 +02:00
Bishwajeet Parhi 7a91e9f552 push latest spec file 2023-06-15 16:39:03 +05:30
Matej Bačo 0128e73079 Formatting 2023-06-15 12:38:03 +02:00
Jake Barnby 0363993f13
Fix errors 2023-06-15 17:28:35 +12:00
Damodar Lohani 7eaa5f1e35 fix errors 2023-06-15 01:23:46 +00:00
Jake Barnby 10f06226d3
Make error optional 2023-06-15 13:05:37 +12:00
Jake Barnby 1604b339dd
Merge remote-tracking branch 'origin/1.4.x' into add-error-attribute
# Conflicts:
#	CHANGES.md
#	app/workers/databases.php
#	composer.json
#	composer.lock
2023-06-15 12:26:29 +12:00
Damodar Lohani c25e014be1 refactor collections config 2023-06-15 00:20:18 +00:00
Migueli 39ea3adc9d Added missing word to portuguese email template 2023-06-12 23:39:00 +01:00
Christy Jacob a9e2eca8a4
Merge pull request #5683 from appwrite/master
Update 1.4.x from Master
2023-06-12 13:20:26 +05:30
Jake Barnby ed2c1139a7
Update messages 2023-06-09 13:03:19 +12:00
Matej Bačo 6522d86fa9 Update installation, certificate & repository response models 2023-06-08 17:24:27 +02:00
Matej Bačo 5e221e285f Update naming convention, add new VCS endpoints, support silent mode and rootDirectory 2023-06-07 17:50:32 +02:00
Jake Barnby b7f4f57521
Add new error message to differentiate between missing data and missing data + permissions for document updates 2023-06-07 13:51:24 +12:00
Damodar Lohani 3469c7ad2f fix word wrap issue 2023-06-07 01:03:12 +00:00
Matej Bačo 966210d58c Update installation model 2023-06-06 09:50:52 +02:00
Damodar Lohani 09b842fc36 add doctype 2023-06-06 05:58:33 +00:00
Damodar Lohani 0083de9c61 fixes 2023-06-06 05:04:41 +00:00
Damodar Lohani bbf77dcb9a refactored email template 2023-06-06 04:50:15 +00:00
Steven Nguyen 85a40bf82d
Add a new labels attribute to the Users collection
This labels attribute can be used apply labels to users. These labels
can eventually be used:

* with permissions to grant access
* to filter users in the Users collection
2023-06-05 14:12:28 -07:00
Matej Bačo 0b600e3ed7 Disable abuse, fix order of params 2023-06-01 12:01:03 +02:00
Damodar Lohani f2737cd663 update latest specs 2023-06-01 05:47:23 +00:00
Damodar Lohani 5f93767ace update spec 2023-05-31 08:24:25 +00:00
Jake Barnby f45905e545
Merge pull request #5553 from 2002Bishwajeet/feat-add-enable-param-db
Feat: Add enable param in Database and Collection
2023-05-29 20:35:33 +12:00
Matej Bačo f53d75205b Implement branches endpoint, rename some attributes, update response models 2023-05-26 00:29:08 +02:00
Christy Jacob 075ed65a2f
Merge pull request #5572 from appwrite/feat-update-project-creation
Feat update project creation
2023-05-25 22:50:24 +05:30
Steven Nguyen f774721701
Update the error message for blocked users
Remove the "You can unblock the user from the Appwrite console." part
as it is not relevant for the person receiving the error.
2023-05-23 10:40:05 -07:00
Christy Jacob 0839822a66 Apply suggestions from code review 2023-05-23 14:39:26 +00:00
Christy Jacob f0df316b4f fix: throw correct exception when project custom ID already exists 2023-05-23 14:38:33 +00:00
Khushboo Verma df17c8a3dc Add production branch as param in updateFunction 2023-05-23 16:04:38 +05:30
Jake Barnby 181741d7a2
Merge pull request #5538 from appwrite/feat-dotnet-sdk
Feat dotnet sdk
2023-05-23 21:37:01 +12:00
Damodar Lohani 5a9f83c43d validate smtp configuration 2023-05-23 05:09:17 +00:00
Jake Barnby 772e730b67
Revert "Update SDK generator + examples" spec changes
This reverts commit 2eef1cfca5.
2023-05-23 16:26:07 +12:00
Eldad A. Fux b86ce2d233
Merge pull request #5561 from appwrite/fix-delete-account
Update the Update Account Status API to clear the cookie
2023-05-22 23:06:02 +03:00
Steven Nguyen 09b4fbcc21
Update the error message for blocked users
Remove the "You can unblock the user from the Appwrite console." part
as it is not relevant for the person receiving the error.
2023-05-22 12:28:47 -07:00
Matej Bačo 18105d4999 Remove repository owner 2023-05-22 15:02:55 +02:00
Matej Bačo f15b9ced88 Update specs 2023-05-22 14:07:54 +02:00
Matej Bačo 612af6edf0 Update dependencies, fix bugs 2023-05-22 13:29:35 +02:00
Matej Bačo 6e515e3cc4 Copy Khushboo's integration from feat-peach-q1-kh 2023-05-22 12:58:13 +02:00
Christy Jacob d630d8772b
Merge pull request #5460 from appwrite/fix-create-project-error
fix: throw correct exception when project ID already exists
2023-05-19 22:48:02 +05:30
Bishwajeet Parhi 40f70faa89 Feat: Add enable param in Database and Collection 2023-05-18 18:55:22 +05:30
Suven-p 582698bd03
Validate value of x-appwrite-id header 2023-05-18 00:41:07 +05:45
Jake Barnby 2eef1cfca5
Update SDK generator + examples 2023-05-16 16:54:34 +12:00
Jake Barnby 67f1ae377c
Update version 2023-05-16 14:40:55 +12:00
Jake Barnby 257c58f438
Merge remote-tracking branch 'origin/master' into feat-dotnet-sdk 2023-05-15 19:15:34 +12:00
Christy Jacob 0d12b13241 feat: update error message 2023-05-14 01:48:51 +05:30
Christy Jacob 12afc294bd feat: add checks for domain 2023-05-13 23:35:05 +05:30
Matej Bačo c63505078d Fix bugs with new versions of utopia 2023-05-13 12:08:02 +02:00
Matej Bačo eb764871db Upgrade versions 2023-05-11 22:52:48 +02:00
Matej Bačo 998c2749cb Merge branch 'feat-db-pools-master' into feat-executor-v3 2023-05-11 21:59:49 +02:00
Matej Bačo a36bdb2797 Remove deployment conf params 2023-05-11 21:57:31 +02:00
Damodar Lohani f70712865e refactor 2023-05-11 06:52:27 +00:00
Torsten Dittmann 1c815c8d99
Merge pull request #5166 from lucasctd/master
set correct value for logging drivers
2023-05-09 17:07:08 +02:00
shimon 1e29ec8d59 added bucketInternalId to file 2023-05-08 10:32:29 +03:00
Christy Jacob 60f51580a7
Merge pull request #5246 from singhbhaskar/fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled
Fix: Updated error when _APP_USAGE_STATS is disabled
2023-05-04 20:47:50 +05:30
Jake Barnby db1fd42b0d
Update platform 2023-05-03 21:54:38 +12:00
Damodar Lohani 23cfb694eb spec update 2023-05-02 07:30:01 +00:00
Matej Bačo 1d35eef756 Update cards emails 2023-05-01 21:19:26 +02:00
Christy Jacob 33d2e94d1d
Apply suggestions from code review 2023-04-30 01:54:45 +05:30
Christy Jacob ac004acbc8 fix: throw correct exception when project custom ID already exists 2023-04-29 12:41:17 +05:30
Matej Bačo 8c1d89c33c Fix race condition 2023-04-28 09:30:30 +02:00
Damodar Lohani ba33dc2b17 generate specs 2023-04-28 07:19:04 +00:00
Damodar Lohani b1bbc9dfbd Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-28 07:11:17 +00:00
Steven Nguyen 518a37d294
Add a generic OIDC OAuth2 provider 2023-04-27 19:48:51 -07:00
Steven Nguyen 206553bac7
Bump sdk-generator and specs 2023-04-27 17:00:12 -07:00
Matej Bačo db472b19c7 Improve employee detection 2023-04-27 10:24:53 +02:00
Matej Bačo 2e421f15ab Implement 2D cloud cards 2023-04-26 10:21:10 +02:00
Christy Jacob 0e5e3f6f6f
Merge pull request #5362 from appwrite/update-cli
feat: update cli version
2023-04-25 23:49:29 +05:30
Torsten Dittmann 4ceae33a5a
Merge pull request #5163 from yatharth1706/fix-5147-fix-error-description-in-case-of-duplicate-user
fix error description for duplicate user
2023-04-25 15:45:59 +02:00
Damodar Lohani ac9f434c85 more fixes and reset endpoints 2023-04-19 08:44:22 +00:00
Damodar Lohani 0177ddccb3 use custom templates to send email when enabled 2023-04-19 08:29:29 +00:00
Damodar Lohani 53a9de477b fix spec 2023-04-18 02:11:08 +00:00
Christy Jacob 62bdc77b93
Merge pull request #5377 from appwrite/fix-function-timeout-desc
Update description for _APP_FUNCTIONS_INACTIVE_THRESHOLD
2023-04-17 22:55:14 +04:00
Vincent (Wen Yu) Ge b6c43e2ccf
Update app/config/variables.php 2023-04-17 14:02:11 -04:00
Damodar Lohani 16695a4b6d fix errors 2023-04-17 08:04:52 +00:00
Damodar Lohani 3c9fb3d1e7 more missing locale codes 2023-04-17 05:30:47 +00:00
Damodar Lohani 591fd9d734 generate specs 2023-04-17 02:33:50 +00:00
Damodar Lohani 377928bf65 generate specs 2023-04-17 02:15:55 +00:00
Damodar Lohani 2522f128ef format 2023-04-17 02:15:46 +00:00
Damodar Lohani 7419867078 new locale codes endpoint 2023-04-17 02:10:17 +00:00
Damodar Lohani fffff197c9 fix codes 2023-04-17 01:26:43 +00:00
Christy Jacob 00322db289 Merge branch 'disallow-personal-data' of github.com:appwrite/appwrite into disallow-personal-data 2023-04-15 13:38:57 +04:00
Christy Jacob ac682a85f6 chore: update specs 2023-04-15 13:38:24 +04:00
Vincent (Wen Yu) Ge 166b446fe7
Update description for _APP_FUNCTIONS_INACTIVE_THRESHOLD 2023-04-14 14:31:22 -04:00
Christy Jacob 6f28047feb
Update app/config/errors.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2023-04-14 04:31:35 +05:30
Christy Jacob 0fb34433b9 feat: personal data filters to enhance password protection 2023-04-14 00:20:03 +04:00
Damodar Lohani d394715b56 Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-13 01:35:56 +00:00
Christy Jacob 0fcfeb50a6 feat: update cli version 2023-04-13 01:48:44 +04:00
Christy Jacob f30d11ed60 feat: update cli version 2023-04-13 01:23:49 +04:00
Vincent (Wen Yu) Ge 07017e0835 Updated specs for storage links 2023-04-12 11:32:25 -04:00
Vincent (Wen Yu) Ge c96b32d7b6 Update specs 2023-04-12 11:18:55 -04:00
Jake Barnby 211f1bb117
Update versions 2023-04-12 19:02:36 +12:00
Jake Barnby 979fa36b02
Update versions 2023-04-12 17:59:43 +12:00
Jake Barnby 924b7b90a4
Update specs 2023-04-12 17:09:19 +12:00
Torsten Dittmann d47b32856b fix: console server duplicate key 2023-04-11 20:57:27 +02:00
Jake Barnby 71b96452c6
Update platforms 2023-04-12 02:58:59 +12:00
Jake Barnby 07b8f0fe3f
Merge pull request #5339 from appwrite/feat-add-version
Add versioned specs and examples
2023-04-12 01:56:29 +12:00
Jake Barnby 6b497a31c8
Add versioned specs and examples 2023-04-12 01:23:29 +12:00
Jake Barnby 7fe14ca10b
Merge remote-tracking branch 'origin/master' into sync-master
# 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
#	app/console
#	app/controllers/api/storage.php
#	composer.lock
2023-04-12 00:50:31 +12:00
Christy Jacob 391e114cdd feat: update docs examples 2023-04-11 08:27:36 +00:00
Christy Jacob 4a314c0a58 Merge branch 'master' of https://github.com/appwrite/appwrite into update-cli-1.2.1 2023-04-11 08:14:52 +00:00
Jake Barnby f00bd7dac7
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2
# Conflicts:
#	composer.lock
2023-04-11 17:25:26 +12:00
Jake Barnby 7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships
# Conflicts:
#	composer.lock
2023-04-11 15:57:35 +12:00
Jake Barnby b252fe847f
Add custom delete restricted error 2023-04-06 00:54:44 +12:00
Christy Jacob d4c7c40427 fix: failing tests 2023-04-03 09:40:20 +00:00
Torsten Dittmann 28758d4794 fix: typo 2023-03-31 18:47:00 +02:00
Torsten Dittmann 3860602697 feat: console service 2023-03-31 17:14:59 +02:00
Jake Barnby 578d4d1619
Disallow index creation on relationship attributes 2023-03-31 18:06:50 +13:00
Jake Barnby c7201cc417
Remove HTML from API error messages 2023-03-31 18:05:45 +13:00
Damodar Lohani 41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
David 536bcf28b5
Corrected spanish translations (emails)
Some translations to spanish had some misspellings and redaction issues. Fixed that.
2023-03-28 21:05:38 +02:00
Matej Bačo 5389afc80e Add build & install commands 2023-03-28 15:21:42 +02:00
Jake Barnby 0797df8414
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2
# 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-03-25 15:32:55 +13:00
Bhaskar Singh 700f4f33ed
Merge branch 'appwrite:master' into fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled 2023-03-24 21:33:42 +05:30
Jake Barnby 0071b9d885
Generate specs 2023-03-24 20:59:12 +13:00
Jake Barnby 48b018fd9d
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2 2023-03-24 20:53:41 +13:00
Christy Jacob 5f10ff4d3b Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools-sync 2023-03-24 06:35:30 +00:00
Torsten Dittmann 10cd97e978 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-team-prefs 2023-03-23 13:03:50 +01:00
Torsten Dittmann 0fc4d5f49a chore: generate specs 2023-03-23 11:28:15 +01:00
Torsten Dittmann 818d111068 fix: wrong team event descriptions 2023-03-23 10:52:43 +01:00
Damodar Lohani 25d94f0995 hyphen to underscore 2023-03-22 08:47:01 +00:00
Damodar Lohani afe049ec9a fix format 2023-03-22 08:44:18 +00:00
Damodar Lohani a6c515684f locales config 2023-03-22 08:31:24 +00:00
Bhaskar Singh 8b5e0e1f1a Updating the exception variable name for easy
readability
2023-03-21 20:33:42 +05:30
Christy Jacob e114da1d9a Merge branch 'master' of github.com:appwrite/appwrite into update-cli-1.2.1 2023-03-20 16:55:02 +05:30
Matej Bačo e8b11b2d14 Fix scheduler 2023-03-19 10:43:57 +01:00
Bhaskar Singh ac2085ffa8 Updated error when _APP_USAGE_STATS is disabled
for usage
2023-03-18 22:12:36 +05:30
Torsten Dittmann 841a8d3fae chore: generate specs 2023-03-17 10:27:56 +01:00
fogelito 00c1418246 Update response Model.php 2023-03-16 13:48:27 +02:00
fogelito 79bfa025cb Merge branch 'feat-database-update-attribute' of github.com:appwrite/appwrite into feat-relations-2
 Conflicts:
	app/controllers/api/databases.php
	composer.json
	composer.lock
2023-03-16 12:14:37 +02:00
Matej Bačo 75f935601e Add function entrypoint 2023-03-16 11:07:15 +01:00
Torsten Dittmann 348c2d4ffe
Update app/config/events.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-03-15 12:11:46 +01:00
Matej Bačo a4b31f6472 Fix after merge 2023-03-15 09:20:25 +01:00
Matej Bačo d10c7c7775 Merge branch 'feat-db-pools-master' into feat-executor-v3-sync 2023-03-15 08:59:42 +01:00
fogelito 31fad24603 collections.php 2023-03-14 15:20:56 +02:00
Matej Bačo c01fcb130c Merge branch 'feat-db-pools-master' into feat-db-pools-sync 2023-03-14 12:58:54 +01:00
Matej Baco ed610fcdd4 Address TODOs 2023-03-14 11:13:03 +00:00
Damodar Lohani 2552916314 sms template tests 2023-03-14 09:13:43 +00:00
Damodar Lohani c7db44b45f default sms template 2023-03-14 09:07:42 +00:00
Matej Baco e7351f4eec Add logs to rules 2023-03-13 13:35:34 +00:00
fogelito 9c4b269669 update collections.php with options 2023-03-13 12:59:01 +02:00
Torsten Dittmann ea1c0d0a1f chore: generate specs 2023-03-13 15:54:55 +05:30
Damodar Lohani d5c8807e26 update types 2023-03-13 01:45:23 +00:00
Matej Bačo 1f409b4e40 Shared variables 2023-03-11 17:06:02 +01:00
Matej Bačo 541cb010a6 Changes after dev-mode QA 2023-03-10 20:36:39 +01:00
Matej Baco 2d25514dd8 Improve 409 rule error; update console 2023-03-10 13:36:31 +00:00
Torsten Dittmann 2178bfc126 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-database-update-attribute 2023-03-10 18:39:11 +05:30
Matej Baco 4b0d6d9826 Bug fixes after proxy QA 2023-03-10 12:20:24 +00:00
Torsten Dittmann cb065e4228 fix: openapi specification 2023-03-10 15:36:10 +05:30
Matej Baco 04c7db9f7b Bug fixes for proxy rule service 2023-03-10 07:42:52 +00:00
Damodar Lohani 1cd0498b15 code format 2023-03-10 02:46:34 +00:00
Bhaskar Singh 31a903d144 Updated the error message for target check fails
in custom domain creation
2023-03-10 00:24:33 +05:30
Damodar Lohani 5589e5ac58 list of supported templates config for parameter validation 2023-03-09 13:44:23 +00:00
Damodar Lohani f1adf61337 project attribute update for templates 2023-03-09 13:43:59 +00:00
Torsten Dittmann fcd9b060fd chore: generate specs 2023-03-09 16:49:11 +05:30
Torsten Dittmann 01edc57806 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-team-prefs 2023-03-09 16:04:20 +05:30
Damodar Lohani dbcc70607a smtp attribute for project 2023-03-09 01:58:59 +00:00
Torsten Dittmann 4f08d8e82a
Apply suggestions from code review
Co-authored-by: Vincent (Wen Yu) Ge <vincent@appwrite.io>
2023-03-09 02:09:03 +05:30
Matej Bačo c4b4e537e7 Update specs 2023-03-08 20:58:09 +01:00
Matej Bačo 83370c21f7 Improve error logs 2023-03-08 20:50:51 +01:00
Matej Bačo 59f5978fa3 Implement rules 2023-03-08 19:30:01 +01:00
Bhaskar Singh b16c789282 Fixing the bracket 2023-03-08 17:23:15 +05:30
Bhaskar Singh 7a4cea9f79 Removed ENV_VARIABLE_INCORRECT_SETUP 2023-03-08 17:21:37 +05:30
Bhaskar Singh 7f3000439a Updated ENV_VARIABLE_INCORRECT_SETUP to DOMAIN_VARIABLE_INCORRECT 2023-03-08 17:15:55 +05:30
Steven Nguyen 85a2d623a6
Update APIs to check X-Appwrite-Timestamp header
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
2023-03-07 10:54:52 -08:00
Torsten Dittmann 496da61cd9 feat: team preferences 2023-03-06 19:54:02 +05:30
Bhaskar Singh eaf31fdb78 Updated the error to 501 error code for custom
domain when _APP_DOMAIN and _APP_DOMAIN_TARGET is setup incorrectly
2023-03-05 14:35:47 +05:30
Torsten Dittmann 41277864fd sdks: fix version number for console sdk 2023-02-28 15:26:37 +05:30
Torsten Dittmann 86134768fc chore: generate specs 2023-02-28 15:07:30 +05:30
Torsten Dittmann ae32536be2 Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-3-console-sdk 2023-02-28 14:45:34 +05:30
Matej Bačo bf3340a3c6 Add body & headers to sync response 2023-02-27 13:43:10 +01:00
Matej Bačo 10ebf6d5fb Update specs 2023-02-27 11:28:18 +01:00
Matej Bačo 69aa59a1d6 Add more log details to execution 2023-02-27 11:24:21 +01:00
Matej Bačo d7c5d8bb46 Remove response body & headers 2023-02-27 11:20:37 +01:00
Lucas Reis 2021dea936 set correct value for logging drivers
set correct value for logOwl and appSignal logging drivers
2023-02-26 19:31:56 +00:00
Torsten Dittmann 293c0e176b Merge branch 'master' of https://github.com/appwrite/appwrite into feat-console-sdk 2023-02-26 13:24:55 +05:30
yatharth b5f02bd6c8 fix error description for duplicate user 2023-02-25 20:36:09 +05:30
Matej Bačo 464f88634c Add function logging toggle 2023-02-24 10:24:20 +01:00
Steven Nguyen 0c6ddb8c99
Generate updated specs 2023-02-23 14:47:45 -08:00