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
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
9562b95285
saving file output to cache instead of decoding data to json
2023-05-31 19:34:12 +03:00
shimon
e9fda6168c
saving file output to cache instead of decoding data to json
2023-05-31 15:50:19 +03:00
shimon
a6768bdc32
saving file output to cache instead of decoding data to json
2023-05-31 14:41:56 +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
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
shimon
794f566fae
addressing comments
2023-02-06 16:03:45 +02:00
shimon
5850a454e0
addressing comments
2023-02-05 22:07:46 +02:00
shimon
1ac935077b
addressing comments
2023-02-02 20:16:01 +02:00
shimon
a30dfd284c
addressing comments
2023-02-02 18:36:32 +02:00
shimon
be65f89eff
usage test
2023-01-16 11:38:52 +02:00
shimon
9a2f734d3a
compose.lock
2023-01-12 18:06:20 +02:00
Damodar Lohani
f41e3b1e8f
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-01-12 07:25:23 +00:00
Eldad A. Fux
f0bb8dcc33
Merge pull request #4859 from appwrite/refactor-mails-next
...
refactor: make mails event and worker general
2023-01-12 09:07:43 +02:00
shimon
3d2ac6b2d6
minor adjustments
2022-12-29 17:36:00 +02:00
shimon
8941af0677
minor adjustments
2022-12-29 13:32:00 +02:00
shimon
4198cbfca5
moved reduce after delete document to usage-worker
2022-12-28 18:27:26 +02:00
shimon
3954137382
minor adjustments
2022-12-25 19:16:38 +02:00
shimon
e533f8f067
minor adjustments
2022-12-25 19:07:03 +02:00
shimon
b89e04f561
add internalId to collections
2022-12-22 19:18:54 +02:00
shimon
20f9b0c655
refactor usage worker
2022-12-22 15:02:41 +02:00
shimon
18f7b3adbb
refactor usage worker
2022-12-22 10:48:03 +02:00
shimon
5e394fed5d
refactor usage worker
2022-12-21 21:03:09 +02:00
Bradley Schofield
c0daed3644
Refactor names and cleanup code
2022-12-20 16:11:30 +00:00
shimon
18f192ed65
benchmarks
2022-12-19 10:25:49 +02:00
shimon
86638e0079
e2e tests
2022-12-15 19:00:05 +02:00
shimon
7601c9047b
e2e tests
2022-12-15 11:45:43 +02:00
Damodar Lohani
5d195659bd
refactor: mails refactor
2022-12-15 09:22:05 +00:00
shimon
285bfe9fd7
e2e tests
2022-12-15 09:56:06 +02:00
shimon
961c408885
metric negative / positive values in worker
2022-12-14 09:34:04 +02:00
Jake Barnby
ff33068906
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support
2022-12-13 21:37:21 +13:00
shimon
141d55bd36
build+functions worker
2022-12-13 09:35:05 +02:00
Damodar Lohani
255c4043d6
fix lint errors
2022-12-13 06:33:26 +00:00
Damodar Lohani
2c46cdcc3c
add session default and comment
2022-12-13 06:08:38 +00:00
shimon
2f34c566e5
addressing comments
2022-12-12 11:37:10 +02:00
shimon
93c3b73291
usage cleanup
2022-12-12 10:16:09 +02:00
shimon
d80bd75b6d
usage cleanup
2022-12-12 09:54:53 +02:00
shimon
0348472345
usage cleanup
2022-12-11 19:15:38 +02:00
shimon
ba04f845da
databases usage
2022-12-11 11:00:00 +02:00
Damodar Lohani
e0be09ded6
refactor: use session group for session limit
2022-12-11 08:33:52 +00:00
Damodar Lohani
3885e0452c
fix: session limit test
2022-12-11 08:26:31 +00:00
Damodar Lohani
509aef16bd
fix: delete user document cache
2022-12-11 07:13:39 +00:00
Damodar Lohani
cda8e53386
feat: add test for max sessions
2022-12-09 11:54:23 +00:00
Damodar Lohani
cbcc17ded6
refactor: add whitespace
2022-12-09 11:36:39 +00:00
Damodar Lohani
f070f0974a
session limit check on shutdown
2022-12-09 11:33:26 +00:00
shimon
806a775663
Switch to decreaseDocumentAttribute
2022-12-09 13:01:17 +02:00
shimon
e2e3d99410
Switch to decreaseDocumentAttribute
2022-12-09 12:41:22 +02:00
shimon
70394ff1bb
nested object calculation
2022-12-08 21:06:55 +02:00
shimon
2d6c0ac844
functions api usage
2022-12-08 15:55:18 +02:00
shimon
4c6b6d00e8
functions api usage
2022-12-07 19:56:38 +02:00
shimon
5d63d2f199
functions api usage
2022-12-07 19:01:25 +02:00
shimon
e1368231b2
updates
2022-12-06 16:17:56 +02:00
shimon
f44ee4ec90
updates
2022-12-06 13:36:17 +02:00
shimon
b71bba2a9c
updates
2022-12-04 19:06:23 +02:00
Eldad Fux
db345fae41
WIP
2022-11-24 09:53:52 +02:00
Eldad Fux
95e835a902
Deprecated Usage stats
2022-11-23 19:08:42 +02:00
Christy Jacob
080abbbb79
Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console
2022-11-17 20:26:10 +05:30
Matej Baco
44875e2d18
QA review changes
2022-11-16 11:33:11 +01:00
Jake Barnby
f9d2976c1d
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
...
# Conflicts:
# CHANGES.md
# 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/init.php
# app/tasks/sdks.php
# composer.lock
# docker-compose.yml
2022-11-16 19:37:35 +13:00
Christy Jacob
8b0a78bb36
fix: function events and linter
2022-11-16 11:00:57 +05:30
Matej Baco
44a82de09b
Refactor func event triggering
2022-11-15 19:13:17 +01:00
shimon
180262d166
Merge branch '1.1.x' of github.com:appwrite/appwrite into fix-cache-permissions
2022-11-11 13:18:33 +02:00
shimon
7723762dd1
cache buster added to cache key
2022-11-11 12:41:41 +02:00
shimon
f9671ee855
enabling file permissions
...
via cache preview
2022-11-10 12:08:01 +02:00
Damodar Lohani
4b5d537eee
Apply suggestions from code review
...
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-11-02 15:41:50 +05:45
Damodar Lohani
7433a260db
fix formatting
2022-10-30 05:16:51 +00:00
Damodar Lohani
0d29968169
refactor database listener callback
2022-10-30 05:14:46 +00:00
Jake Barnby
89b4d0026a
Move shutdown hook to graphql controller
2022-10-28 10:04:31 +13:00
Jake Barnby
34bd0fe93d
Review remove redundant registry injection
2022-10-25 15:45:08 +13:00
Damodar Lohani
d35b438255
fix collection and document counts
2022-10-21 01:50:03 +00:00
Damodar Lohani
868e487a59
fix bucket collection name
2022-10-18 07:52:41 +00:00
Damodar Lohani
e7c82a28dd
more fixes
2022-10-18 07:09:11 +00:00
Damodar Lohani
305dafe2ad
update missing stats
2022-10-18 06:53:17 +00:00
Damodar Lohani
5b90c433ab
fix collection id
2022-10-17 07:53:55 +00:00
Damodar Lohani
00d194d5d1
fix linters
2022-10-17 07:37:30 +00:00
Damodar Lohani
f3c183b563
listen to delete events
2022-10-17 07:10:18 +00:00
Damodar Lohani
84f5842c81
document create listener
2022-10-17 06:52:24 +00:00
Damodar Lohani
019fa11616
setup to use database listeners
2022-10-16 08:50:53 +00:00
Jake Barnby
a2b532ed22
Set dirty property instead of in registry from shutdown
2022-10-13 12:59:32 +13:00
Damodar Lohani
4969ceadd4
add project internal id to the timeseries tats
2022-09-25 02:07:26 +00:00
Damodar Lohani
2956d5f3eb
collect console stats
2022-09-22 07:34:03 +00:00
Jake Barnby
544413dddf
More 1.0 migrations
2022-09-20 20:25:05 +12:00
Jake Barnby
e9f75d32a1
Merge remote-tracking branch 'origin/master' into feat-graphql-support
...
# Conflicts:
# Dockerfile
# app/config/errors.php
# app/config/roles.php
# 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/graphql.php
# app/controllers/shared/api.php
# app/init.php
# composer.lock
# docker-compose.yml
# src/Appwrite/Extend/Exception.php
# src/Appwrite/Migration/Migration.php
2022-09-20 15:43:09 +12:00
shimon
eabc90ec49
decouple audits log from events
2022-09-04 17:53:37 +03:00
shimon
f63c740917
decouple audits log from events
2022-09-04 11:45:53 +03:00
shimon
2c9b749f72
account labels
2022-09-04 11:23:24 +03:00
shimon
5ea0816540
account labels
2022-09-04 11:17:53 +03:00
shimon
8e1dc84a48
account labels
2022-09-04 10:32:56 +03:00
shimon
94ad09b53f
const update
2022-08-31 16:11:23 +03:00
shimon
dab844308b
dateTime bug fix in the deletes worker
...
dateTime small fix
2022-08-31 16:07:27 +03:00
shimon
b2023020e0
Merge branch '0.16.x' of github.com:appwrite/appwrite into refactor-cache-date
2022-08-31 11:53:16 +03:00
shimon
5e6c288c2b
dateTime
2022-08-31 11:52:55 +03:00
Jake Barnby
8da011ad78
Ensure abuse hit counter is not increased for admin/API keys
2022-08-31 15:50:53 +12:00
Jake Barnby
1273f4c9b7
Allow using route method in abuse key
2022-08-31 15:49:44 +12:00
shimon
cee77ef5a1
timestamp -> datetime on file cache
2022-08-30 15:52:26 +03:00
shimon
97a957e17a
timestamp -> datetime on file cache
2022-08-30 15:46:27 +03:00
shimon
69066cfc5e
timestamp -> datetime on file cache
2022-08-30 15:44:37 +03:00
Jake Barnby
e25fbd1c2a
Fix default for usage params
2022-08-25 23:51:59 +12: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
Jake Barnby
8841f8fe76
Merge remote-tracking branch 'origin/master' into feat-graphql-support
...
# Conflicts:
# app/controllers/general.php
# app/controllers/shared/api.php
# composer.json
# composer.lock
2022-08-22 21:13:29 +12:00
Damodar Lohani
fa165a735b
linter fix
2022-08-21 10:16:55 +00:00
Damodar Lohani
0d57c67cc0
use same method to parse usage params labels
2022-08-21 02:10:42 +00: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
shimon
cc9a166146
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/storage.php
app/controllers/shared/api.php
2022-08-17 17:08:54 +03:00
Damodar Lohani
c0119e6a0d
fix formatting
2022-08-17 11:10:17 +00:00
Damodar Lohani
6b11fa26ce
rename and remove unused param
2022-08-17 10:55:01 +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
Damodar Lohani
80dfa85c82
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-17 00:45:07 +00:00
shimon
1abd57567f
linter fix
2022-08-16 18:02:17 +03:00
shimon
5d284b8c27
fill gaps from merge
2022-08-16 16:20:35 +03:00
Christy Jacob
51cb03a93e
feat: linter fix
2022-08-16 17:58:30 +05:30
shimon
8f8f033d1a
fill gaps from merge
2022-08-16 12:00:28 +03:00
Jake Barnby
fb34ecfa7d
Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
...
# Conflicts:
# 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
2022-08-16 19:20:26 +12:00
shimon
590c1467bc
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/account.php
app/controllers/api/functions.php
app/controllers/api/users.php
2022-08-15 18:19:59 +03:00
shimon
f64c82a8cb
addressing comments
2022-08-15 17:03:03 +03:00
shimon
df0bdeb8a3
some fixes
2022-08-15 16:55:11 +03:00
shimon
67d12d3120
some fixes
2022-08-15 15:16:32 +03:00