Commit Graph

16610 Commits

Author SHA1 Message Date
fogelito fa13eb1064 .env 2023-08-09 13:00:10 +03:00
fogelito c823e36183 remove unchanged setResource 2023-08-09 12:47:26 +03:00
Shmuel Fogel ecb142fa50 Update app/controllers/api/databases.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-09 12:40:18 +03:00
fogelito aceb49505c pull changes 2023-08-09 12:38:34 +03:00
fogelito eed89b9fd3 Merge branch '1.4.x' of github.com:appwrite/appwrite into poc-timeout
 Conflicts:
	.env
	app/controllers/api/databases.php
	composer.json
	composer.lock
	docker-compose.yml
2023-08-09 12:36:23 +03:00
fogelito e6cf0a6ac3 addressing comments 2023-08-09 12:27:32 +03: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
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
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
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
Eldad A. Fux 90e89aa02e Merge pull request #5934 from appwrite/feat-appwrite-assistant
Feat appwrite assistant
2023-08-07 17:56:22 +03: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
Eldad A. Fux 4b7cd5c372 Merge pull request #5715 from appwrite/fix-phone-abuse-param
fix: abuse label for creating phone session
2023-08-07 15:16:40 +03:00
Damodar Lohani 72ebccfd7f update assistant 2023-08-07 07:55:24 +00:00
Steven Nguyen d960f85da6 Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -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
Damodar Lohani 767a3caef8 remove unused injection 2023-08-04 13:17:23 +00:00
Damodar Lohani cd18853fed add abuse labels 2023-08-04 13:16:57 +00:00
Damodar Lohani 64321cfb0b remove authorization 2023-08-04 13:08:59 +00:00
Damodar Lohani 49085be4e4 fix formatting 2023-08-04 02:17:02 +00:00
Damodar Lohani 45afea9175 moved assistant endpoint to console, and add env support 2023-08-04 01:42:22 +00:00
Eldad A. Fux 9f7f99ba83 Merge pull request #5935 from appwrite/feat-vcs-logos
Add VCS assets
2023-08-03 14:47:54 +03:00
Khushboo Verma 717f9ca471 Add VCS assets 2023-08-03 16:56:32 +05:30
Damodar Lohani 2a7ec490af setup appwrite assistant for test 2023-08-03 10:29:36 +00:00
Eldad A. Fux 8ed4029169 Merge pull request #5867 from appwrite/feat-base-image-upgrade
test updated docker-base version
2023-08-03 10:30:04 +03:00
Damodar Lohani 078f7e58d6 Merge remote-tracking branch 'origin/master' into feat-sync-1.4-with-master 2023-08-02 09:43:09 +00: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
Eldad A. Fux be67fe96f6 Merge pull request #5922 from appwrite/feat-error-page
Style Appwrite Error Page
2023-08-02 08:43:03 +03:00
Eldad A. Fux 05a316bf48 Merge pull request #5895 from appwrite/feat-2591-improve-oauth2-error-handling
Improve OAuth2 error handling
2023-08-01 22:55:58 +03:00
Eldad A. Fux b86a62bb3b Merge pull request #5918 from appwrite/fix-5717-duplicate-users-endpoint
Delete duplicate users endpoint
2023-08-01 22:46:19 +03:00
Steven Nguyen ee6e65ffbc Style appwrite error page 2023-08-01 11:23:27 -07:00
Christy Jacob fcd4a69ad1 Merge pull request #5924 from appwrite/christyjacob4-patch-1
fix: error in initialising the Exception constructor in api.php
2023-08-01 20:51:49 +04:00
Vincent (Wen Yu) Ge f6d2df8115 Update app/controllers/shared/api.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-08-01 12:21:34 -04:00
Christy Jacob 3b4255c457 fix: error in initialising the Exception constructor in api.php 2023-08-01 18:18:27 +05:30
fogelito 0f57d87c55 composer.lock 2023-08-01 11:32:38 +03:00
fogelito d61921573b composer 2023-08-01 11:32:23 +03:00
fogelito 82c9c074bc merge in master 2023-08-01 11:29:39 +03:00
fogelito 632d41ec6c Merge branch 'master' of github.com:appwrite/appwrite into poc-timeout
 Conflicts:
	app/controllers/api/databases.php
	composer.json
	composer.lock
	tests/e2e/Services/Databases/DatabasesBase.php
2023-08-01 11:25:21 +03:00
fogelito 59dd6bfbcc composer update 2023-08-01 11:13:14 +03:00
fogelito 54cae4ab00 composer update 2023-08-01 11:13:01 +03:00
Eldad A. Fux 264c7bf9a9 Merge pull request #5916 from appwrite/fix-5913-dsn-with-special-chars
Update DSN to support special chars for user and password
2023-08-01 09:32:11 +03:00
Steven Nguyen eb7526601d Delete duplicate 'Update Email Verification' endpoint 2023-07-31 11:00:30 -07:00