1
0
Fork 0
mirror of synced 2024-07-15 19:36:08 +12:00
Commit graph

396 commits

Author SHA1 Message Date
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
shimon ce82a9efa9 remove usage executions from shared api 2023-10-03 17:41:11 +03:00
shimon b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
shimon c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	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
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
shimon c30fa277d3 linter fix 2023-09-13 10:24:36 +03:00
shimon f246d4d6e5 removed $route->setIsActive(false);
from cache output
2023-09-05 21:21:24 +03:00
shimon a46879f1cb cache key reformat 2023-09-05 18:29:11 +03:00
Jake Barnby b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Jake Barnby 1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks 2023-08-18 13:25:21 -04:00
Jake Barnby a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# 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.json
#	composer.lock
2023-08-18 13:23:35 -04:00
Jake Barnby 414d85be8e
Update mode checks 2023-08-16 17:58:25 -04:00
Jake Barnby b6ffb385a7
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-16 15:55:19 -04:00
Matej Bačo 93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
prateek banga 4d03610755 resolve merge conflicts 2023-08-09 03:23:45 +05:30
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
Jake Barnby b196914638
Fix console/API key checks 2023-08-08 15:46:01 -04:00
prateek banga 0630f56dd5 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-query-support-attributes-indexes 2023-08-07 20:35:55 +05:30
Matej Bačo d5fd3a28f9 More QA fixes 2023-08-06 15:11:30 +02:00
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Steven Nguyen d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
prateek banga 1d558fa5f5 Add select queries support to list indexes and list attributes endpoint 2023-08-03 17:34:28 +05:30
Damodar Lohani 078f7e58d6 Merge remote-tracking branch 'origin/master' into feat-sync-1.4-with-master 2023-08-02 09:43:09 +00: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
Jake Barnby ff83751450
Allow privileged user/app user/admin mode access to all resources when disabled 2023-07-31 14:24:21 -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
Damodar Lohani 8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00: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
shimon 57bc7d0584 functions/builds/deletes worker 2023-06-11 17:08:48 +03:00
Shimon Newman 73ac9f796d
cache perm fix 2023-06-02 17:56:09 +03:00
shimon 6e7c160249 changing event signature 2023-06-02 06:54:34 +03:00
shimon f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
shimon 98dc1db878 re-working worker flow 2023-05-23 16:43:03 +03:00
shimon 432ee72071 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	app/cli.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/teams.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	src/Appwrite/Event/Event.php
	src/Appwrite/Event/Mail.php
2023-05-22 18:41:24 +03: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
Bhaskar Singh a4299a69ef Refactored the condition for strict inequality 2023-05-02 23:47:50 +05:30
Bhaskar Singh 7064f884aa Refactor usage init hook to remove unecessary
inject
2023-04-27 19:32:05 +05:30
Bhaskar Singh 3865f48d32 Moved check for _APP_USAGE_STATS
to create init hook for App
2023-04-21 23:09:01 +05:30
Damodar Lohani 0177ddccb3 use custom templates to send email when enabled 2023-04-19 08:29:29 +00:00
Damodar Lohani bf02687ea4 fix type and test reset 2023-03-17 06:37:16 +00:00
Damodar Lohani c649ba897f update response model 2023-03-13 09:33:11 +00:00
Damodar Lohani 82498459db update project smtp using hook 2023-03-13 09:21:16 +00:00
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
Matej Bačo 47dbf4c8f6 Fix wildcard bugs 2023-02-19 12:04:12 +01:00
Damodar Lohani 5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
shimon 3533f56337 few last updates 2023-02-15 21:14:26 +02:00
shimon df2e7ca7e1 few last updates 2023-02-15 20:40:42 +02:00