1
0
Fork 0
mirror of synced 2024-08-20 20:51:40 +12:00
Commit graph

906 commits

Author SHA1 Message Date
fogelito
c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
 Conflicts:
	app/init.php
	composer.json
	composer.lock
2023-01-16 10:24:37 +02:00
Jake Barnby
004bb82688
Fix functions + builds not deleted 2023-01-12 22:42:07 +13:00
Jake Barnby
d49de9c6cf
Use getProjectDB instead of new function 2023-01-12 22:27:20 +13:00
Steven Nguyen
2b4dbfb4b9
Convert _APP_STORAGE_DEVICE env var to lowercase
This is done for backwards compatibility. Up to utopia-php/storage
version 0.12.X, the devices were not lowercase. Starting 0.13.X, they
are all converted to lowercase, but people would still have the old
case in their .env file. This change makes the value check insensitive
so that the value from older versions still works.
2023-01-11 11:41:26 -08:00
Jake Barnby
4b0ef4598b
Fix deletes worker not deleting project database tables 2023-01-11 19:37:06 +13:00
Jake Barnby
da8af68e1e
Fix deletes worker not deleting database collections 2023-01-11 17:20:43 +13:00
Damodar Lohani
495da1bfd4 fix: template path 2022-12-16 06:11:12 +00:00
Damodar Lohani
ea241ceaf5
Update app/workers/certificates.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-12-16 11:33:16 +05:45
Damodar Lohani
5d195659bd refactor: mails refactor 2022-12-15 09:22:05 +00:00
fogelito
8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
fogelito
f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Damodar Lohani
42c855cb41 feat: make mails event and worker general 2022-12-14 06:23:14 +00:00
Matej Bačo
dd99ab7b00 Fix session expiration 2022-11-21 14:24:52 +00:00
Christy Jacob
08a986e433 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into fix-deletes-worker 2022-11-16 11:10:39 +00:00
Matej Bačo
8dd5eb09f0 Fix executions usage count 2022-11-15 09:33:07 +00:00
Christy Jacob
b4bf0cf8d0 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into fix-deletes-worker 2022-11-14 08:11:26 +00:00
Christy Jacob
72a37516d3 feat: address review comments: 2022-11-11 13:54:05 +00:00
Christy Jacob
d664549495 fix: use getDevice in deletes worker 2022-11-10 13:48:55 +00:00
Everly Precia Suresh
13ea6a5e69 update error attribute 2022-11-08 17:06:50 +00:00
Everly Precia Suresh
eece18c9f6 style:run linter 2022-11-03 16:10:39 +00:00
Everly Precia Suresh
9e8dddd70d Push changes 2022-11-03 14:56:20 +00:00
Damodar Lohani
8baa95db1c Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-01 04:54:48 +00:00
Torsten Dittmann
983f885b3f fix: builds worker buildTime 2022-10-31 12:47:41 +01: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
Damodar Lohani
4086ba93ad Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-10-31 06:36:26 +00:00
Damodar Lohani
a0a0ef2386 update docblock comments and naming 2022-10-28 08:40:04 +00:00
Torsten Dittmann
eb31bfb78e
Merge pull request #4418 from appwrite/feat-deployment-buildtime
Add build time to deployments
2022-10-26 18:42:53 +02:00
Everly Precia Suresh
cd0a5b73f8 style:run linter 2022-10-25 19:26:15 +00:00
Everly Precia Suresh
f055e15031 push changes 2022-10-25 18:47:24 +00:00
Everly Precia Suresh
de7fee6790 implement error msg 2022-10-25 17:46:28 +00:00
Everly Precia Suresh
17251b1973 initial implementation 2022-10-25 17:37:07 +00:00
Damodar Lohani
c8b5301267 update maintenance to delete only hourly metrics older than 3 months 2022-10-23 07:29:13 +00:00
Damodar Lohani
3ed3ef9d71 rename variable 2022-10-23 04:46:23 +00:00
Bradley Schofield
60e924b62b Run Linter 2022-10-19 02:50:48 +01:00
Bradley Schofield
fe4028f588 Add tests and add buildTime to worker 2022-10-19 02:43:40 +01:00
Steven Nguyen
5542e5b04c Only delete collection data for correct db
Ensure attributes, indexes, and audit for correct database is deleted.
2022-10-11 22:51:10 +00:00
Jake Barnby
702710aab1
Fix import 2022-10-10 16:20:46 +13: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
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
637a97c4de Merge branch '1.0.x' of https://github.com/appwrite/appwrite into fix-function-vars-null 2022-09-30 12:06:32 +02:00
Torsten Dittmann
d511c2d2ad
Merge pull request #3858 from appwrite/fix-certificate-fail-mail
Fix: Certificate -> Mail worker communication
2022-09-30 11:54:31 +02:00
Torsten Dittmann
65b4c9f931 fix: default value for optional function vars 2022-09-30 11:52:35 +02:00
Matej Bačo
46c91899e7
Merge branch '0.16.x' into feat-improve-sms-e2e-tests 2022-09-23 08:23:29 +02:00
Christy Jacob
c38f451c78
Merge pull request #3862 from Faizan-Pasha/master
Fixed the bug #3859
2022-09-23 11:38:39 +05:30
Matej Bačo
96134f2a5e Remove todo 2022-09-20 08:29:34 +00:00
Matej Bačo
89afad1a32 Replace nulls with empty strings 2022-09-19 11:58:41 +00:00
Matej Bačo
e31c7f7740 Improve delete worker for functions 2022-09-19 11:53:34 +00:00
Matej Bačo
6e8a4cc97b Update sms mock to use request catcher 2022-09-19 08:09:48 +00:00
Faizan Pasha
ffe525c5cc Removed unused import 2022-09-17 06:02:11 +05:30
Faizan Pasha
12b6e671b0 Fixed the bug #3859 2022-09-17 05:58:14 +05:30
Matej Baco
81ddc99f7b Improve mail events code quality 2022-09-16 11:54:59 +02:00
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
Matej Bačo
7c2fa12414 Fix getting function ID 2022-08-17 13:42:06 +00:00
Matej Bačo
c93b7aa452 Fix event-triggered multi-execution 2022-08-17 13:34:52 +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
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