Laura Du Ry
|
88836429af
|
Update README.md
|
2024-02-16 13:02:11 +01:00 |
|
|
Laura Du Ry
|
46b86a0728
|
Merge branch 'main' into LauraDuRy-patch-1
|
2024-02-16 13:00:54 +01:00 |
|
|
Laura Du Ry
|
e715d3c0cc
|
Update README.md
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
|
2024-02-16 13:00:45 +01:00 |
|
Christy Jacob
|
c3ddc6a05d
|
Merge pull request #5616 from appwrite/refactor-cache-poc
Refactor cache
|
2024-02-15 21:00:16 +05:30 |
|
|
Christy Jacob
|
7dbb1c6399
|
Merge branch 'main' into refactor-cache-poc
|
2024-02-15 20:33:57 +05:30 |
|
shimon
|
459db9b43e
|
usage updates
|
2024-02-14 07:34:12 +02:00 |
|
Jake Barnby
|
cbf1085850
|
Merge pull request #7135 from appwrite/remove-deletes-db-leftovers
Remove database methods from deletes worker
|
2024-02-13 23:13:24 +13:00 |
|
|
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 |
|
|
Jake Barnby
|
f5aebe6673
|
Merge pull request #7559 from Souptik2001/fix-7109-user-activity-log
Fix missing user activity logs
|
2024-02-12 23:04:20 +13:00 |
|
|
shimon
|
70effd1e99
|
Sync against main
|
2024-02-12 11:14:26 +02:00 |
|
|
shimon
|
e7ace61273
|
Sync against main
|
2024-02-12 11:10:52 +02:00 |
|
|
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 |
|
Eldad A. Fux
|
eb75b527ad
|
Merge pull request #7560 from appwrite/update-x-example-format
Update place holders from [PARAM_NAME] to <PARAM_NAME>
|
2024-02-11 23:04:42 +01:00 |
|
Damodar Lohani
|
d4ad369a7e
|
Merge pull request #7563 from appwrite/fix-user-deletion
PEA-233-prevent console user deletion before deleting their team
|
2024-02-11 16:04:59 +05:45 |
|
Damodar Lohani
|
eb7e2fd23b
|
fix injection
|
2024-02-11 09:46:39 +00:00 |
|
|
Damodar Lohani
|
36eabfa2dd
|
fix check twice
|
2024-02-11 09:45:36 +00:00 |
|
|
Damodar Lohani
|
2634c928c7
|
fix format
|
2024-02-11 09:34:13 +00:00 |
|
|
Damodar Lohani
|
e462d73f65
|
prevent user with active team, from deletion
|
2024-02-11 09:31:09 +00:00 |
|
|
Christy Jacob
|
e2baefe8c6
|
Merge pull request #7500 from appwrite/fix-account-delete
PEA-233-prevent console user deletion before deleting their team
|
2024-02-11 14:52:24 +05:30 |
|
|
Damodar Lohani
|
4ffde8e827
|
fix indentation
|
2024-02-11 14:55:14 +05:45 |
|
|
Damodar Lohani
|
57a695367b
|
fix typo
|
2024-02-11 14:54:32 +05:45 |
|
|
Damodar Lohani
|
681688e252
|
fix rename
|
2024-02-11 14:52:54 +05:45 |
|
|
Damodar Lohani
|
a8718bccb5
|
fix rename
|
2024-02-11 14:42:21 +05:45 |
|
|
Damodar Lohani
|
eba03cb126
|
Update app/config/errors.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
|
2024-02-11 14:41:32 +05:45 |
|
|
Damodar Lohani
|
622bdb7b2b
|
Update app/config/errors.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
|
2024-02-11 14:41:25 +05:45 |
|
|
Damodar Lohani
|
c8720805c7
|
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
|
2024-02-11 14:41:19 +05:45 |
|
|
Christy Jacob
|
fdb11af6bb
|
Merge pull request #7561 from appwrite/update-team-counts
Update team counts
|
2024-02-11 12:15:05 +05:30 |
|
|
shimon
|
b09386727b
|
Usage logs text update
|
2024-02-10 10:34:44 +02:00 |
|
|
Christy Jacob
|
f3e8994bb8
|
fix: use atomic operations for updating team count
|
2024-02-09 23:21:17 +05:30 |
|
|
Christy Jacob
|
fb68dcc89e
|
fix: use atomic operations for updating team count
|
2024-02-09 23:20:37 +05:30 |
|
|
Christy Jacob
|
5abcb86fd7
|
fix: use atomic operations for updating team count
|
2024-02-09 23:18:18 +05:30 |
|
|
Christy Jacob
|
ff93957922
|
Merge pull request #7503 from appwrite/usage-queue-poc
Usage queue poc
|
2024-02-09 20:12:40 +05:30 |
|
|
shimon
|
179a045399
|
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
Conflicts:
composer.lock
|
2024-02-09 16:29:26 +02:00 |
|
|
shimon
|
d0985db27d
|
interval update
|
2024-02-09 13:22:48 +02:00 |
|
|
shimon
|
3788d5bceb
|
interval update
|
2024-02-09 12:56:37 +02:00 |
|
Vincent (Wen Yu) Ge
|
f785ffbd71
|
Update place holders from [PARAM_NAME] to <PARAM_NAME>
|
2024-02-09 03:06:38 +00:00 |
|
|
shimon
|
c1fb4ecf39
|
interval update
|
2024-02-08 21:41:23 +02:00 |
|
Souptik Datta
|
e6a97bb36a
|
Merge branch 'master' into fix-7109-user-activity-log
|
2024-02-09 00:40:36 +05:30 |
|
|
shimon
|
a1539395c6
|
interval update
|
2024-02-08 21:08:29 +02:00 |
|
|
Christy Jacob
|
94468aa28f
|
Merge pull request #7556 from appwrite/refactor-usage-sn
Sync main with refactor-usage-sn
|
2024-02-09 00:25:07 +05:30 |
|
|
shimon
|
72ee7d7f34
|
interval update
|
2024-02-08 20:51:54 +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 |
|
|
Souptik Datta
|
f42a78ef9c
|
fix: Fix account activity logs total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
|
2024-02-09 00:14:37 +05:30 |
|
|
Christy Jacob
|
5842f1950a
|
chore: linter
|
2024-02-08 18:02:35 +00:00 |
|
|
Christy Jacob
|
ba4f708137
|
Apply suggestions from code review
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
|
2024-02-08 23:26:43 +05:30 |
|
|
Christy Jacob
|
2fdd0656d0
|
Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn
|
2024-02-08 11:48:53 +00:00 |
|
|
shimon
|
790cdc297b
|
composer update
|
2024-02-08 10:26:45 +02:00 |
|
|
shimon
|
990698e423
|
composer update
|
2024-02-08 09:32:05 +02:00 |
|
|
shimon
|
632f78140f
|
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
Conflicts:
composer.json
composer.lock
|
2024-02-08 09:29:12 +02:00 |
|