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

802 commits

Author SHA1 Message Date
Matej Bačo 20bbbfc493 Merge remote-tracking branch 'origin/0.16.x' into fix-function-scheduling 2022-09-13 20:14:42 +00:00
shimon b86f7689ec Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling 2022-09-13 10:29:16 +03:00
Matej Bačo a315f43039 Fix functon scheduling loop logic, and double-loop prevention 2022-09-11 12:20:26 +00:00
Eldad A. Fux 07d65a3232
Merge pull request #3782 from appwrite/fix-rc-certificates
Fix certificate worker and retries
2022-09-11 15:11:34 +03:00
Christy Jacob cb50220b60 feat: rename time attribute to duration 2022-09-09 16:02:04 +04:00
Matej Bačo e23752d4f3 Improve certbot communication 2022-09-07 10:44:57 +00:00
Matej Bačo e2444734fd Fix certificate worker and retries 2022-09-07 08:58:35 +00:00
shimon f63c740917 decouple audits log from events 2022-09-04 11:45:53 +03:00
Matej Bačo ae2826ad1f Bug fixes 2022-09-02 14:19:36 +00:00
shimon f7da33a873 Merge branch '0.16.x' of github.com:appwrite/appwrite into refactor-cache-date 2022-08-31 16:09:42 +03:00
shimon dab844308b dateTime bug fix in the deletes worker
dateTime small fix
2022-08-31 16:07:27 +03:00
shimon 69066cfc5e timestamp -> datetime on file cache 2022-08-30 15:44:37 +03:00
Matej Bačo 1e95346205 PR review changes 2022-08-30 12:30:52 +00:00
Matej Bačo 3b7ac045d7 Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api 2022-08-26 07:51:54 +00:00
Matej Bačo 78f65401e8 Attempt to fix usage tests 2022-08-25 14:56: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
Matej Bačo 4b01ff3f51 Use new query methods 2022-08-24 14:10:56 +00:00
Bradley Schofield d4ba9441b6 Run Linter 2022-08-19 11:26:09 +01:00
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
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
shimon 9fc2e4c3a5 sync with 0.16 2022-08-17 17:29:22 +03: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
Eldad A. Fux 69a4f51d58
Merge pull request #3656 from appwrite/feat-functions-console-logs
Functions Console Logs Capture
2022-08-16 23:23:53 +03:00
Damodar Lohani 94d9bb8a18 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-functions-console-logs 2022-08-16 04:42:03 +00:00
Jake Barnby 77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
shimon 0dc485d8d7 some fixes 2022-08-15 12:05:41 +03: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
Jake Barnby 613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12: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
Damodar Lohani 5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00: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
Jake Barnby fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Bradley Schofield 237f5264d9 Fix vars exception, change cachedoc usage, 2022-08-13 20:18:48 +01:00
shimon d132202662 some fixes 2022-08-13 20:29:33 +03:00
Jake Barnby ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12:00
shimon e8a2e30bb5 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup 2022-08-13 10:35:54 +03:00
Eldad Fux 3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Steven 1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Bradley Schofield cb87c248d5 Rebuild Specs, SDKs and start working on subqueries 2022-08-12 16:51:24 +01:00
Damodar Lohani cd9efec4d2 refactor 2022-08-11 06:49:20 +00:00
Damodar Lohani 63371ce76e functions usage stats using route labels 2022-08-11 05:25:39 +00:00
Bradley Schofield 15fbe86124 Fix variables not being correctly used 2022-08-10 14:43:05 +01:00
Bradley Schofield c566f1e7c9 Fix Tests 2: Electric Boogaloo 2022-08-10 10:32:48 +01:00