shimon
dac0e2a543
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02:00
Christy Jacob
c076dfe6f1
Merge pull request #7576 from appwrite/refactor-usage-sn
...
Refactor usage sn
2024-02-12 23:05:56 +05:30
shimon
e7ace61273
Sync against main
2024-02-12 11:10:52 +02:00
Souptik Datta
8d7be399d3
fix: Fix project user activity log's missing fields and total count
...
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:15:48 +05:30
shimon
790cdc297b
composer update
2024-02-08 10:26:45 +02:00
shimon
6a6c3445fa
updates
2024-02-04 20:02:01 +02:00
shimon
5518ca165e
remarks
2024-01-30 13:24:57 +02:00
shimon
44ed6826a9
refactor usage poc
2024-01-28 15:33:04 +02:00
shimon
7a2ee683e3
refactor usage poc
2024-01-28 11:28:59 +02:00
shimon
a0b38a5a7c
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
2024-01-18 14:19:19 +02:00
Torsten Dittmann
9ba2eafa83
fix: escape html in email params ( #7409 )
...
* fix: escape html in email params
* revert: phpunit stop on failure
* chore: fix linter
2024-01-08 18:08:17 +01:00
Matej Bačo
fae28b468c
Fix password hashing bug
2024-01-07 13:40:45 +01:00
Matej Bačo
e5f0e00742
Apply password validation to all places
2024-01-05 12:31:38 +01:00
Matej Bačo
0a2be34ceb
Fix PHP refference bug
2024-01-05 12:07:41 +01:00
Matej Bačo
ba32170f72
Improve password validator hook
2024-01-04 16:26:15 +01:00
Steven Nguyen
f1ba7b08ab
Update the delete identity endpoints to set the params and payload
...
Because no payload was set, the event params (userId and identityId)
wasn't picked up automatically. This updates the endpoints so that the
payload is set, but also makes sure to set the userId and identityId
params since the identityId param's key doesn't match the key in the
payload.
2023-12-27 23:35:32 +00:00
Damodar Lohani
5e59d73f78
rename stats collection
2023-12-18 10:11:10 +00: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
Christy Jacob
d33b8c2ce1
Merge branch '1.4.x' into fix-null-password-history
2023-11-09 07:44:44 -08:00
Bradley Schofield
54e5985940
Fix wrong operator for password history
...
This fixes a potential chance for nulls to be introduced into the password history array when $password is null and $passwordHistory != 0
2023-11-08 14:35:16 +00:00
shimon
ad63a377ab
added inf metric
2023-11-08 11:09:32 +02:00
loks0n
dfc8c919d4
fix: missing sessionId error
2023-11-06 15:06:56 +00:00
shimon
1c1028412a
refactor users, project, functions usage display
2023-11-01 20:44:06 +02:00
shimon
4c6976488c
clean up
2023-10-25 15:06:54 +03: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
002fc19d60
tests fix
2023-10-10 21:02:24 +03:00
shimon
7f1507f810
sync with 1.4
2023-10-04 11:20:32 +03:00
shimon
429dabaaee
sync with 1.4
2023-10-03 19:50:48 +03:00
shimon
dcf0107a79
sync with master
2023-09-27 20:10:21 +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
Steven Nguyen
6b0c24a9d6
Update user creation from teams and users services to not set accessedAt
...
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
2023-09-12 12:05:11 -07:00
Matej Bačo
6964477429
Increase labels maximum limit
2023-09-06 18:15:03 +02:00
Matej Bačo
8802e318d5
Fix pools resource
2023-08-23 13:52:17 +02:00
Jake Barnby
c99288229f
Add back missing route
2023-08-22 21:36:32 -04:00
Jake Barnby
a84e669a1f
Add missing accessedAt values when creating users
2023-08-22 21:34:23 -04:00
Jake Barnby
efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
...
# Conflicts:
# app/controllers/api/users.php
# composer.json
# composer.lock
# tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04: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
Jake Barnby
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04:00
shimon
83ffea68d1
rolling back usage flow
2023-08-20 16:53:26 +03:00
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
Damodar Lohani
9d15f70db5
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2
2023-08-13 00:45:11 +00:00
Matej Bačo
b9c52d8583
QA after merge fix
2023-08-10 01:44:00 +02:00
Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-09 09:01:29 -07: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
Christy Jacob
82a206d808
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-08 08:34:01 -07:00
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration
2023-08-07 14:46:00 -07:00
Damodar Lohani
a6109a0341
Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2
2023-08-07 08:42:04 +00:00