Khushboo Verma
d3b0b00917
Allow users to disable APIs
2024-03-04 23:12:54 +01:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints"
2024-02-22 12:21:48 +05:30
shimon
6b6f04d2d3
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/config/collections.php
app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Matej Bačo
738a696ca9
Add proejct ID abuse protection
2024-01-29 20:38:01 +00:00
Matej Bačo
0a518cd47e
Fix failing tests
2024-01-29 20:03:14 +00:00
Christy Jacob
47fc6efb0d
chore: update endpoint
2024-01-29 17:48:12 +00:00
Christy Jacob
0ff6e99354
chore: update auth group
2024-01-29 17:42:14 +00:00
shimon
03f2041913
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
2024-01-07 18:09:48 +02:00
shimon
99f1543f1b
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
Dockerfile
app/console
app/init.php
composer.lock
src/Appwrite/Platform/Services/Workers.php
src/Appwrite/Platform/Tasks/Hamster.php
2024-01-02 11:49:23 +02:00
Torsten Dittmann
d9b300051a
Merge pull request #7292 from appwrite/fix-7147-user-last-activity-not-updating
...
Fix user last activity not updating
2023-12-28 01:59:23 +01:00
Steven Nguyen
6d17f8e877
Fix user last activity not updating
...
Add back a section of code that was mistakenly removed.
2023-12-15 21:37:26 +00:00
shimon
9960912bb1
sync against main
2023-11-26 18:52:02 +02:00
shimon
1869852985
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/controllers/shared/api.php
composer.lock
src/Appwrite/Platform/Workers/Deletes.php
2023-11-26 16:29:18 +02:00
shimon
21895e3ac0
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
CHANGES.md
Dockerfile
app/controllers/api/storage.php
app/init.php
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Services/Tasks.php
src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
Khushboo Verma
fccbe405db
Add chunkId to abuse key to prevent rate limit for SDKs
2023-11-16 23:04:38 +05:30
Steven Nguyen
55a73efeab
Ensure usage endpoints don't throw 500 when usage is disabled
2023-11-06 21:28:45 +00:00
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
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
45f16e560c
sync against master
2023-09-05 21:17:54 +03:00
shimon
ec93239630
Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/config/collections.php
app/controllers/api/storage.php
app/controllers/shared/api.php
app/init.php
app/workers/deletes.php
2023-09-05 19:19:59 +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
shimon
bed88baa6c
added bucketId to cache::deleteByResource
2023-07-22 17:08:28 +03: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