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

941 commits

Author SHA1 Message Date
Bradley Schofield 3c71164741 Merge branch '1.1.x' into feat-implement-session-length-api 2022-11-14 15:30:38 +00:00
Torsten Dittmann 465dad522e fix: remove unnecessary files 2022-11-14 15:31:24 +01:00
Bradley Schofield 0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield 66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +00:00
Jake Barnby 702bb413dc
Merge remote-tracking branch 'origin/feat-mysql-test' into feat-realtime-dbpools
# Conflicts:
#	.env
#	app/config/variables.php
#	app/init.php
#	app/realtime.php
#	composer.lock
2022-11-14 11:21:58 +13:00
Jake Barnby ee69a306a9
Merge remote-tracking branch 'origin/fix-realtime-connections' into feat-cloud-jake 2022-11-10 13:26:19 +13:00
shimon 1761b77d0f function worker 2022-11-09 19:01:43 +02:00
Jake Barnby fafbe71b24
Accept a size parameter when creating db/redis pools 2022-11-09 16:21:27 +13:00
Jake Barnby e1d80c2b93
Add get worker pool size function 2022-11-09 16:19:01 +13:00
Bradley Schofield e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield 4cfc3b3a7f Update authDuration fallback value 2022-11-04 10:12:02 +00:00
Bradley Schofield 94676a6c16 Alter sessionVerify to remove expire 2022-11-04 09:50:59 +00:00
Eldad Fux c28edaaa96 Enabled 64 connections 2022-11-03 18:30:55 +02:00
Eldad Fux be8c145e84 Fix for linter 2022-11-03 18:26:31 +02:00
Eldad Fux 9bba91fcb8 Update pools library version 2022-11-03 18:07:53 +02:00
Eldad Fux de610855fe Updates 2022-11-03 17:19:55 +02:00
Bradley Schofield cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Torsten Dittmann d387f198db Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x 2022-10-31 09:45:51 +01:00
Eldad Fux 766c19b165 Removed logs 2022-10-29 17:04:35 +03:00
Eldad Fux 5eb39b1ccd No need to delegate DB errors 2022-10-29 16:59:03 +03:00
Eldad Fux 8e492a9797 Tests 2022-10-28 17:45:16 +03:00
Christy Jacob 269266127d feat: update db library 2022-10-28 14:30:31 +05:30
Christy Jacob 9165da14b7 feat: add support for the new DSN class 2022-10-26 12:16:22 +05:30
Christy Jacob 503bd53a47 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-mysql-test 2022-10-25 13:48:59 +00:00
Eldad Fux e113253e35 Fixed tests 2022-10-19 17:13:38 +03:00
Eldad Fux e5c62c6730 Fixed usage of DSN database 2022-10-19 16:55:58 +03:00
Eldad Fux 159fd5fc59 Change URLURL to AppwriteURL 2022-10-19 15:41:38 +03:00
Eldad Fux d51c379514 Fixed linter errors 2022-10-19 11:35:30 +03:00
Eldad Fux 1632ae61eb Fixing CLI tasks 2022-10-17 19:43:51 +03:00
Eldad Fux 65e004f145 Fixed health API and add new test endpoints 2022-10-17 14:43:57 +03:00
Eldad Fux f6449687b5 Create connections only on fill method 2022-10-17 01:49:53 +03:00
Eldad Fux fe29e58f22 Fixed doctor health checks 2022-10-16 20:48:53 +03:00
Eldad Fux f2068a10e4 Added support for cache sharding, and fallback connections 2022-10-16 14:42:00 +03:00
Eldad Fux 224d526c84 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools-eldad 2022-10-16 12:24:53 +03:00
Eldad Fux 7484656be3 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools-eldad 2022-10-15 22:08:16 +03:00
Eldad Fux 95a9ded28f Adjusted compose files and tests 2022-10-15 21:17:03 +03:00
Eldad Fux 0506dbb30e Adapted HTTP API 2022-10-15 17:14:17 +03:00
Eldad Fux daecc1aa76 Init new connection pool, removed old extensions 2022-10-15 11:52:50 +03:00
Damodar Lohani be3743e227 fix renamed function 2022-10-14 11:24:37 +00:00
Torsten Dittmann bc66efa1a5 chore: prepare 1.0.3 2022-10-12 12:03:55 +02:00
Eldad Fux fc8c40c62f Removed unused hostnames 2022-10-10 19:34:57 +03:00
Jake Barnby 608f1532a6
Merge remote-tracking branch 'origin/1.0.x' into feat-integrate-messaging
# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-10 14:01:59 +13:00
Eldad Fux a229eac2cc Renamed DatabasePool to Pools 2022-10-08 08:51:58 +03:00
Eldad Fux c23c5c686c Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-db-pools-eldad 2022-10-08 08:48:06 +03:00
Eldad Fux 26b1a94d22 Renamed DatabasePool to Pools 2022-10-08 08:43:02 +03:00
Christy Jacob 12b1ecfcf9 feat: mysql support 2022-10-04 17:04:42 +05:30
Jake Barnby 2fbc40e966
Merge fixes 2022-10-03 13:42:53 +13:00
Jake Barnby 2bb8854f61
WIP integrate messaging library
(cherry picked from commit 9a25f77e3e7e76f6c93cc3ce1985f43426a0debf)

# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-03 13:28:30 +13:00
Torsten Dittmann fbbb150e86 Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region"
This reverts commit 2117fa53f0, reversing
changes made to c634d12ef4.
2022-09-30 14:22:11 +02:00
Torsten Dittmann e0b9f57d85
Revert "Feat app region" 2022-09-30 12:32:58 +02:00
Torsten Dittmann 757a3f8651 chore: prepare 1.0.2 2022-09-30 12:27:26 +02:00
Christy Jacob 3b802e9ba6 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-09-27 20:59:50 +05:30
Damodar Lohani e80e65946b Merge branch 'master' of https://github.com/appwrite/appwrite into feat-app-region 2022-09-19 12:01:56 +00:00
Matej Bačo 6e8a4cc97b Update sms mock to use request catcher 2022-09-19 08:09:48 +00:00
Torsten Dittmann 95d322dc36 feat: prepare 1.0.1 release 2022-09-14 21:03:00 +02:00
Torsten Dittmann 78cd9ea71a chore: prepare 1.0.0 release 2022-09-14 11:00:13 +02:00
Damodar Lohani ed81ff1263 regions using config instead 2022-09-08 07:19:14 +00:00
Matej Bačo ae2826ad1f Bug fixes 2022-09-02 14:19:36 +00:00
Matej Bačo 432bfe96ac New version preparation 2022-09-01 04:41:50 +00:00
Christy Jacob e5a9195e66
Merge pull request #3736 from appwrite/refactor-cache-date
Refactor cache date
2022-08-31 19:00:36 +02:00
Damodar Lohani 8fe365d66e Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 13:21:45 +00:00
shimon 94ad09b53f const update 2022-08-31 16:11:23 +03:00
Christy Jacob 0438e830b0
Merge pull request #3634 from appwrite/feat-variables-api
Implement Function Variable API
2022-08-31 14:37:30 +02:00
Damodar Lohani 67f38d0644 compression type constants 2022-08-31 09:51:20 +00:00
Matej Bačo 0897cd0fe4
Merge branch '0.16.x' into feat-variables-api 2022-08-31 09:37:47 +02:00
Jake Barnby 190d9684f0
Use consts for rate limit count + period 2022-08-31 11:34:17 +12:00
Christy Jacob 25d9c8e501 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-27 20:03:15 +00:00
Matej Baco 8513bb2dbe Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-25 11:14:42 +02:00
Jake Barnby 625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# 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/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Christy Jacob 9cfefe58bf feat: refactoring classes 2022-08-24 20:52:54 +05:30
Christy Jacob 85bfdd8f54 feat: refactoring classes 2022-08-24 20:26:41 +05:30
Matej Bačo 4b01ff3f51 Use new query methods 2022-08-24 14:10:56 +00:00
Christy Jacob d3308a4d42 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-08-24 14:40:06 +05:30
Bradley Schofield 0d81918685 Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-19 11:25:39 +01:00
Christy Jacob 2a750eaa73 Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:32:22 +00:00
Christy Jacob 278afd77c0 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:20:08 +00:00
Jake Barnby cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby 7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# 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/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Damodar Lohani 3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
Damodar Lohani a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
shimon 9c68cff317 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.json
	composer.lock
2022-08-17 11:16:09 +03:00
Damodar Lohani 80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
Christy Jacob 4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00:00
Jake Barnby bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
2022-08-16 19:20:26 +12:00
shimon 0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Jake Barnby cb4a256d5f Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes
# 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
#	public/dist/scripts/app-all.js
#	public/dist/scripts/app-dep.js
#	public/dist/scripts/app.js
#	public/dist/styles/default-ltr.css
#	public/dist/styles/default-rtl.css
#	public/scripts/dependencies/appwrite.js
2022-08-15 12:05:52 +12:00
Eldad Fux 22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux 25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Jake Barnby 9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
Jake Barnby 6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Christy Jacob c6f0b14e92 feat: address issues on init.php 2022-08-14 11:05:25 +05:30
Christy Jacob 4521907b83 feat: refactor workers 2022-08-12 21:39:45 +05:30
Christy Jacob b4e944e9ba feat: run linter 2022-08-10 19:19:58 +05:30
Christy Jacob 741824ef87 feat: move server list to app resource 2022-08-10 19:15:04 +05:30
Bradley Schofield 6882ffaa00 Merge branch '0.16.x' into feat-variables-api 2022-08-09 13:37:24 +01:00
Bradley Schofield 603cb1db34 Update init.php 2022-08-09 13:32:33 +01:00