1
0
Fork 0
mirror of synced 2024-08-04 21:12:18 +12:00
Commit graph

2718 commits

Author SHA1 Message Date
Bradley Schofield
cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield
d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Torsten Dittmann
d387f198db Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x 2022-10-31 09:45:51 +01:00
Damodar Lohani
4efabe9370 fix formatting 2022-10-31 07:44:44 +00:00
Damodar Lohani
cf5ecd5a62 ignore data without projectInternalId 2022-10-31 07:27:51 +00:00
Damodar Lohani
67113971d9 fix model 2022-10-31 07:27:43 +00:00
Damodar Lohani
4086ba93ad Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-10-31 06:36:26 +00:00
Damodar Lohani
60f2d10a50 update variable namings 2022-10-28 09:54:56 +00:00
Damodar Lohani
6d7b30d77e fix formatting issues 2022-10-28 09:08:58 +00:00
Damodar Lohani
a0a0ef2386 update docblock comments and naming 2022-10-28 08:40:04 +00:00
Jake Barnby
c23cca950a
Merge branch 'fix-provider-model' into feat-graphql-support 2022-10-28 11:30:15 +13:00
Jake Barnby
9274ec6880
Fix type error 2022-10-28 11:26:32 +13:00
Jake Barnby
e46eeb3e16
Remove namespace from var name 2022-10-28 10:19:09 +13:00
Jake Barnby
e632731c4e
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support 2022-10-27 12:24:57 +13:00
Everly Precia Suresh
943a334277 review comments 2022-10-26 17:01:16 +00:00
Torsten Dittmann
eb31bfb78e
Merge pull request #4418 from appwrite/feat-deployment-buildtime
Add build time to deployments
2022-10-26 18:42:53 +02:00
Jake Barnby
9fbf8d6aee
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	tests/e2e/General/HTTPTest.php
2022-10-26 13:54:52 +13:00
Steven Nguyen
ab2bb8176c
Fix create deployment realtime not triggering
Because the deployment event was missing the project ID, the realtime
event never fired.
2022-10-25 13:38:04 -07:00
Everly Precia Suresh
afc1f50a87 clean up code 2022-10-25 19:27:33 +00:00
Everly Precia Suresh
17251b1973 initial implementation 2022-10-25 17:37:07 +00:00
Jake Barnby
b6e7e84d50
Comments 2022-10-25 16:35:00 +13:00
Torsten Dittmann
461c12c7fe
Merge pull request #3701 from appwrite/feat-oauth-improvements
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00
Damodar Lohani
c8b5301267 update maintenance to delete only hourly metrics older than 3 months 2022-10-23 07:29:13 +00:00
Damodar Lohani
cbeb4984ab Merge remote-tracking branch 'origin' into feat-usage-refactor 2022-10-23 05:23:29 +00:00
Damodar Lohani
8048d24857 deprecate database aggregation 2022-10-23 05:17:50 +00:00
Damodar Lohani
3ed3ef9d71 rename variable 2022-10-23 04:46:23 +00:00
Eldad A. Fux
04066af992
Merge pull request #4277 from appwrite/feat-phone-examples
Add meaningful phone number to generated examples.
2022-10-22 12:42:31 +03:00
Damodar Lohani
9195c813db missing documents total count 2022-10-21 01:53:39 +00:00
Damodar Lohani
088fd89294 fix metric name 2022-10-21 01:40:26 +00:00
Jake Barnby
f9a32f6011
Fix reserved attribute selections 2022-10-21 13:53:54 +13:00
Jake Barnby
19123257fc
Strip $ instead of replace to match SDK models 2022-10-20 15:29:56 +13:00
Jake Barnby
120b788343
Update resolvers for framework changes 2022-10-20 12:22:46 +13:00
Jake Barnby
ce76fb58b1
Update request/response extensions for framework changes 2022-10-20 12:12:09 +13:00
Jake Barnby
f6dc7b2068
Add OAuth to blacklist 2022-10-19 13:23:42 +13:00
Jake Barnby
c2e0ef3f98
Merge remote-tracking branch 'origin/1.0.x' into feat-graphql-support
# Conflicts:
#	CHANGES.md
2022-10-19 13:21:06 +13:00
Jake Barnby
a2b1941a47
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	CONTRIBUTING.md
#	composer.json
#	composer.lock
#	docs/references/teams/list-teams.md
2022-10-19 13:17:56 +13:00
Akshay Rana
c08f2e65e6
Updated timestamp format
Co-authored-by: Steven <1477010+stnguyen90@users.noreply.github.com>
2022-10-18 22:22:01 +05:30
Damodar Lohani
5ff8ac46aa fix negative stats 2022-10-18 08:28:12 +00:00
Damodar Lohani
8cd4060334 fix storage stats 2022-10-18 07:38:05 +00:00
Damodar Lohani
027dafe906 fix linters 2022-10-18 07:26:28 +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
8093f034c0 fix inbound and outbount 2022-10-18 03:53:07 +00:00
Damodar Lohani
a3f14220d3 take care of negative values 2022-10-18 03:19:12 +00:00
Matej Bačo
97df10e6b8 Fix project pagination in usage containers 2022-10-17 11:45:38 +00:00
Damodar Lohani
00d194d5d1 fix linters 2022-10-17 07:37:30 +00:00
Akshay Rana
1fcc5eccb1 updated timestamp format to ISO string in realtime payload 2022-10-17 12:44:44 +05:30
Damodar Lohani
ffe029932d refactor stats 2022-10-17 06:59:27 +00:00
Damodar Lohani
f78cb09694 Merge remote-tracking branch 'origin/master' into feat-usage-refactor 2022-10-17 06:55:01 +00:00
Jake Barnby
fb5d2fc25c
Abstract setting params to init 2022-10-17 13:27:15 +13:00
Jake Barnby
cecc6dada2
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# 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/init.php
#	composer.json
#	composer.lock
2022-10-17 12:04:13 +13:00
Damodar Lohani
51cbc653af use metadata constant 2022-10-14 11:26:33 +00:00
Damodar Lohani
185b206076 fix moved constant 2022-10-14 11:23:20 +00:00
Damodar Lohani
e7b9ba70b6 fix error 2022-10-14 11:07:20 +00:00
Damodar Lohani
dee4f5c517 use metadata constants 2022-10-14 11:07:07 +00:00
Damodar Lohani
e7e8c53d89 use same array for all metrics 2022-10-14 08:49:00 +00:00
Jake Barnby
d163217d1f
Remove Appwrite URL dependency from resolvers 2022-10-14 18:04:23 +13:00
Jake Barnby
a1718e8a44
Remove database dependency from mapper 2022-10-14 18:01:39 +13:00
Jake Barnby
09e0e948b5
Remove resolver database dependency 2022-10-14 18:00:22 +13:00
Jake Barnby
444c68e07e
Remove redundant error 2022-10-14 13:23:21 +13:00
Jake Barnby
4e60db0598
Use upstream raw payload function 2022-10-13 16:56:12 +13:00
Jake Barnby
9c372d7335
Fix checking content type with postfixes 2022-10-13 14:32:06 +13:00
Jake Barnby
a2b532ed22
Set dirty property instead of in registry from shutdown 2022-10-13 12:59:32 +13:00
Jake Barnby
5c5bdac3d9
Add route blacklist instead of individual cases 2022-10-13 12:58:28 +13:00
Torsten Dittmann
99a6d7044c
Merge pull request #4433 from appwrite/1.0.x
sync: master <- 1.0.x
2022-10-12 13:22:40 +02:00
Torsten Dittmann
bc66efa1a5 chore: prepare 1.0.3 2022-10-12 12:03:55 +02:00
Jake Barnby
9821cc5e18
Check if value has then function when setting result to check external promise types 2022-10-12 21:48:58 +13:00
Jake Barnby
bb64bcc1c1
Allow cloning a request 2022-10-12 20:55:43 +13:00
Jake Barnby
597885028a
Use request setters 2022-10-12 20:55:04 +13:00
Jake Barnby
5debe2c13c
Alias + name fixes 2022-10-12 20:20:44 +13:00
Jake Barnby
b6621f5e87
Restructure schema building 2022-10-12 14:04:11 +13:00
Jake Barnby
39fcbe4d76
Restructure exception 2022-10-12 13:59:35 +13:00
Jake Barnby
4bc44183b6
Restructure type related helpers 2022-10-12 13:57:37 +13:00
Jake Barnby
ee2e8fcc23
Generify promises 2022-10-12 13:55:43 +13:00
fogelito
778751160b Merge branch '1.1.x' of github.com:appwrite/appwrite into bug_model_metric
 Conflicts:
	app/config/specs/open-api3-latest-console.json
	app/config/specs/swagger2-latest-console.json
2022-10-11 17:06:37 +03:00
Torsten Dittmann
e9ef7c0ecd
Merge pull request #4424 from appwrite/master
sync: 1.1.x <- master
2022-10-11 16:03:43 +02:00
fogelito
4250234231 Model MODEL_METRIC changes 2022-10-11 13:34:42 +03:00
Damodar Lohani
910c033d2a refactor build and execution time 2022-10-11 05:40:28 +00:00
Jake Barnby
bf194c30e9
Review updates 2022-10-11 13:38:06 +13:00
Jake Barnby
62038bd2a9
Passthru JSON objects 2022-10-11 12:32:04 +13:00
Jake Barnby
0716c430d6
Fix getting union implementations 2022-10-11 12:31:12 +13:00
Jake Barnby
96bce27642
Cherrypick empty model rules 2022-10-11 12:28:46 +13:00
Jake Barnby
fd8d4f4a1b
Add type property to hash algorithms to allow resolving union type implementation 2022-10-11 12:27:03 +13:00
Bradley Schofield
380a45f987 Add build time to deployment 2022-10-10 16:24:40 +01:00
Damodar Lohani
3ffc31ba58 fix formatting 2022-10-10 09:39:26 +00:00
Damodar Lohani
f41d388bf5 separate cumulative metrics 2022-10-10 09:13:20 +00:00
Jake Barnby
575b882b30
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	.github/workflows/tests.yml
#	composer.lock
2022-10-10 18:41:40 +13:00
Jake Barnby
f93099cbb6
Merge remote-tracking branch 'origin/1.1.x' into feat-integrate-messaging 2022-10-10 14:04:01 +13:00
Jake Barnby
608f1532a6
Merge remote-tracking branch 'origin/1.0.x' into feat-integrate-messaging
# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-10 14:01:59 +13:00
Damodar Lohani
8ddbde62c1 use project internal id 2022-10-09 06:45:46 +00:00
megatank58
d898ccd8e0
fix: correctly handle = in .env 2022-10-09 11:29:00 +05:30
sooraj
5958577a6e camel case update 2022-10-08 06:31:28 +05:30
sooraj
3a2d6da052 sanitized_url add in parse url 2022-10-07 06:11:38 +05:30
Sooraj S
81fc5ee6b3
Merge pull request #1 from appwrite/master
new
2022-10-06 09:01:55 +05:30
Vincent (Wen Yu) Ge
207941558f fix typo in email examples 2022-10-03 15:13:04 +00:00
Vincent (Wen Yu) Ge
3281b8bbd4 Add meaningful Phone number examples to specs 2022-10-03 15:06:44 +00:00
Matej Bačo
a883d3728f Allow teamId queries on listProjects 2022-10-03 07:16:49 +00:00
Jake Barnby
2bb8854f61
WIP integrate messaging library
(cherry picked from commit 9a25f77e3e7e76f6c93cc3ce1985f43426a0debf)

# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-03 13:28:30 +13:00
Torsten Dittmann
5d32ddb408 Merge branch '1.0.x' of https://github.com/appwrite/appwrite into chore-prepare-1-0-2 2022-09-30 14:36:53 +02:00
Torsten Dittmann
0c1222f0f5 Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x 2022-09-30 14:23:06 +02:00
Torsten Dittmann
fbbb150e86 Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region"
This reverts commit 2117fa53f0, reversing
changes made to c634d12ef4.
2022-09-30 14:22:11 +02:00
Torsten Dittmann
e0b9f57d85
Revert "Feat app region" 2022-09-30 12:32:58 +02:00
sooraj
f6c586986d sanitized url in url Validation 2022-09-30 15:58:56 +05:30
Torsten Dittmann
757a3f8651 chore: prepare 1.0.2 2022-09-30 12:27:26 +02:00
Torsten Dittmann
1b490233b6
Merge pull request #4038 from appwrite/fix-3949-migrate-audit-time
Fix migration for audit
2022-09-30 11:56:05 +02:00
Jake Barnby
6ac4d4f490
Handle response model union type rules 2022-09-30 19:59:20 +13:00
Jake Barnby
1fbcedec42
Move mapping functions to TypeMapper 2022-09-30 19:58:26 +13:00
Jake Barnby
f1429e8155
Move custom types to their own class 2022-09-30 19:51:27 +13:00
Steven Nguyen
c97fea37c0 Fix migration for audit
`time` attribute should be a DateTime type rather than int.
2022-09-29 19:15:54 +00:00
Jake Barnby
df651c3c78
Match class names instead of strings 2022-09-29 19:28:41 +13:00
Jake Barnby
b176929557
Sort schema 2022-09-29 19:27:57 +13:00
Jake Barnby
0471bf1c90
Only allow default values for optional params 2022-09-29 17:54:48 +13:00
Jake Barnby
73d0f033b8
Skip new models with no rules 2022-09-29 17:53:53 +13:00
Jake Barnby
e5b9e261c5
Upcase type names 2022-09-29 17:53:07 +13:00
Jake Barnby
6c81069b27
Custom type serialization fixes 2022-09-29 17:51:53 +13:00
Jake Barnby
5e1bb655dc
Fix scrypt algo response model rule default types 2022-09-29 16:54:01 +13:00
Eldad A. Fux
b575df867e
Merge pull request #3789 from appwrite/feat-app-region
Feat app region
2022-09-25 15:04:56 +03:00
Damodar Lohani
8c6ef5b26f pass region in constructors 2022-09-25 05:41:13 +00:00
Damodar Lohani
895e12c29b monthly period not supported 2022-09-25 02:08:42 +00:00
Damodar Lohani
4969ceadd4 add project internal id to the timeseries tats 2022-09-25 02:07:26 +00:00
Eldad A. Fux
80ce2b2464
Merge pull request #3906 from appwrite/fix-phone-secret-hash
fix: hash phone auth code
2022-09-24 17:49:52 +03:00
Damodar Lohani
651ccef328
correct env value 2022-09-23 14:35:50 +05:45
Matej Bačo
46c91899e7
Merge branch '0.16.x' into feat-improve-sms-e2e-tests 2022-09-23 08:23:29 +02:00
Christy Jacob
426f50c69c
Merge pull request #3852 from appwrite/fix-response-filters
Fix response filters
2022-09-23 11:28:34 +05:30
Damodar Lohani
5e6b8ec506 refactor counters to get sum in period only 2022-09-23 05:51:26 +00:00
Jake Barnby
63a4853563
Fix list complexity calculations 2022-09-23 15:53:25 +12:00
Jake Barnby
318bea760e
Fix defualt arg types nullability 2022-09-23 13:52:19 +12:00
Jake Barnby
eb818d15e0
Fix custom entity update 2022-09-23 13:49:36 +12:00
Jake Barnby
6e4bad5969
Fix custom entity delete 2022-09-23 13:46:39 +12:00
Christy Jacob
7abb426e3f fix: hash phone auth code 2022-09-23 03:55:17 +05:30
Damodar Lohani
aee87e3d01 fix stats users 2022-09-22 12:19:43 +00:00
Jake Barnby
8cd36b2721
Fix custom entity list 2022-09-22 22:48:22 +12:00
Jake Barnby
5f0f136e6e
Refactor methods for clarity 2022-09-22 20:59:47 +12:00
Damodar Lohani
80502ff937 collect counter data 2022-09-22 07:34:11 +00:00
Jake Barnby
2d1cd7cb50
Add queries validators 2022-09-22 18:54:58 +12:00
Krishna Agarwal
0ddd2f6c77
fixed typo on line 15 2022-09-21 22:53:36 +05:30
Damodar Lohani
4de148f783 new stats to count resources 2022-09-21 09:36:42 +00:00
Jake Barnby
8af0983274
Handle role validator 2022-09-21 21:12:23 +12:00
Jake Barnby
6aee9e0ddb
Update errors 2022-09-21 21:11:05 +12:00
Jake Barnby
6c9ac29f37
Fix attribute unpacking 2022-09-21 19:01:01 +12:00
Jake Barnby
5cefda4ff2
Fix key replacements 2022-09-21 18:24:47 +12:00
Jake Barnby
bf0b416183
Update permissions and queries for 1.0 2022-09-20 19:51:22 +12:00
Jake Barnby
fd37df5f9c
Handle datetime model rules 2022-09-20 19:24:54 +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
Steven Nguyen
2f08ec0926 Convert Document $collectionId in 0.15 response
Document $collection was renamed to $collectionId to match the naming
convention of referring to other resource IDs. This ensures backwards
compatibility.
2022-09-20 02:48:40 +00:00
Steven Nguyen
01f77fa993 Ensure empty datetimes are 0 in 0.15 response
Because empty datetimes are invalid, strtotime returned false so the
response was false rather than 0.
2022-09-20 02:48:40 +00:00
Damodar Lohani
e80e65946b Merge branch 'master' of https://github.com/appwrite/appwrite into feat-app-region 2022-09-19 12:01:56 +00:00
Matej Bačo
6e8a4cc97b Update sms mock to use request catcher 2022-09-19 08:09:48 +00:00
Torsten Dittmann
95d322dc36 feat: prepare 1.0.1 release 2022-09-14 21:03:00 +02:00
Torsten Dittmann
fab87c7f00 fix: migration for abuse time column 2022-09-14 19:40:03 +02:00
Torsten Dittmann
64926c7f4c fix: functions execute permissions on migration 2022-09-14 13:57:02 +02:00
Torsten Dittmann
bdd67b0127 fix: user migration not happening twice 2022-09-14 13:02:14 +02:00
Torsten Dittmann
89f18f36b5 fix: migration permissions fix 2022-09-14 12:19:52 +02:00
Torsten Dittmann
620d864d17 fix: migration prevent second password 2022-09-14 12:10:27 +02:00
Torsten Dittmann
78cd9ea71a chore: prepare 1.0.0 release 2022-09-14 11:00:13 +02:00
Torsten Dittmann
bb2b46cdc1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-migration-1.0.0 2022-09-14 10:26:08 +02:00
Torsten Dittmann
3df89e65ca
Merge pull request #3816 from appwrite/feat-consistent-parent-id
Update document model
2022-09-14 10:25:36 +02:00
Torsten Dittmann
9c59deca1d fix: create scheduleUpdatedAt attribute on migration 2022-09-14 10:21:32 +02:00
Torsten Dittmann
d0c3f52ab6 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-migration-1.0.0 2022-09-14 10:20:42 +02:00
Torsten Dittmann
f388f3801a Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-migration-1.0.0 2022-09-14 09:28:25 +02:00
Torsten Dittmann
e416f9b017 fix: new functions enabled index 2022-09-14 09:26:22 +02:00
Torsten Dittmann
5e5ca0ba16 adapt to review 2022-09-14 09:12:17 +02:00
Jake Barnby
696c4bfde3
Merge remote-tracking branch 'origin/0.16.x' into feat-grant-verified-dimension 2022-09-14 17:31:23 +12:00
Steven Nguyen
3da21ff2fc Update document model
1. Rename document.$collection to document.$collectionId
2. Add document.$databaseId
2022-09-14 00:53:37 +00:00
Christy Jacob
cdb54bcc72
Merge pull request #3697 from appwrite/feat-response-filters-0.16.x
Feat response and request filters 0.16.x
2022-09-14 02:52:07 +04:00
Steven Nguyen
041066520f Fix some sdk methods for V15 request filter 2022-09-13 21:28:23 +00:00
Steven Nguyen
2da7da0558 Remove response parse of log $createdAt and $updatedAt 2022-09-13 21:18:13 +00:00
Christy Jacob
4260d01bb9 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-migration-1.0.0 2022-09-14 02:38:14 +05:30
Steven Nguyen
8f67743834 Rename teams.getMemberships to teams.listMemberships in V15 request filter 2022-09-13 20:46:32 +00:00
Steven Nguyen
717abccd10 Fix V15 response format for functions and executions 2022-09-13 20:43:46 +00:00
Christy Jacob
554be364d6
Merge pull request #3755 from appwrite/feat-audits-label-desc-decoupling
audit event decoupling
2022-09-13 22:56:02 +04:00
Christy Jacob
efbe21d433 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into matej-qa-3 2022-09-13 18:21:44 +00:00
Torsten Dittmann
ae0919a3d5 fix: add role:member migration 2022-09-13 18:54:03 +02:00
Jake Barnby
381a26fa4c
Assign verified/unverified role to users 2022-09-14 00:44:55 +12:00
shimon
1d382cc542 small fix 2022-09-13 10:42:42 +03:00
shimon
b86f7689ec Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling 2022-09-13 10:29:16 +03:00
Steven Nguyen
7f0d4e6c36 Merge branch '0.16.x' into feat-response-filters-0.16.x 2022-09-12 22:21:52 +00:00
Steven Nguyen
1d7c25354a Update response filters for usage 2022-09-12 22:15:13 +00:00
Steven Nguyen
79b57cf696 Update response filters for list models 2022-09-12 19:07:08 +00:00
Torsten Dittmann
22038daa0e chore: remove old broken migrations 2022-09-12 16:20:53 +02:00
Torsten Dittmann
e0267da7ac fix: migrate variables 2022-09-12 16:06:05 +02:00
Torsten Dittmann
a7ef1367b8 chore: fix linter 2022-09-12 15:54:12 +02:00
Torsten Dittmann
75e80a210c fix: stats migration 2022-09-12 15:53:00 +02:00
Torsten Dittmann
704fd8693c fix: migrate executions and write permissions 2022-09-12 11:55:54 +02:00
Torsten Dittmann
184b1f2ddb Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-migration-1.0.0 2022-09-12 11:46:44 +02:00
Eldad A. Fux
ce73b44ccf
Merge pull request #3797 from appwrite/fix-usage-always-taking-fulltime
fix the latest time memory store
2022-09-11 15:01:30 +03:00
Matej Bačo
34dda74176 Update tests, fix bug 2022-09-11 08:31:40 +00:00
Steven Nguyen
71206a9886 Update V15 response filter and add tests 2022-09-10 01:00:20 +00:00
Steven Nguyen
668ebe4f41 Update V15 request filters for storage, teams, and users 2022-09-09 17:56:13 +00:00
Torsten Dittmann
21d40f4849 fix: qa 2022-09-09 19:50:05 +02:00
Torsten Dittmann
4822e326f2 add more logic 2022-09-09 14:44:04 +02:00
Christy Jacob
cb50220b60 feat: rename time attribute to duration 2022-09-09 16:02:04 +04:00
Torsten Dittmann
a059ec11e7 add some fixes 2022-09-09 11:38:54 +02:00
Matej Bačo
b41aaefc7e Implement 'enabled' attribute for functions 2022-09-09 08:49:18 +00:00
Damodar Lohani
87e3916568 fix the latest time memory store 2022-09-09 07:52:57 +00:00
Damodar Lohani
3beacf0263 add region to usage documents 2022-09-09 06:13:12 +00:00
Jake Barnby
7132e3a7f6
Assign member role for all of a users confirmed team memberships 2022-09-09 11:58:54 +12:00
Steven Nguyen
ddd15921a3 Update V15 request filters
Request filters are in place for the following services:
* account
* databases
* functions
* projects
2022-09-08 23:55:29 +00:00
Torsten Dittmann
b19b9d450f feat: migration of 1.0.0 2022-09-08 18:46:18 +02:00
shimon
834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
 Conflicts:
	app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Bradley Schofield
7d3829e35f Update V15.php 2022-09-08 12:33:20 +01:00
Bradley Schofield
80e60d9d95 Update V15.php 2022-09-07 11:26:22 +01:00
Torsten Dittmann
ee80bf7ca7 feat: introduce 1.0.0 migration 2022-09-07 10:43:05 +02:00
Jake Barnby
80d57521aa
Fix fileSecurity response model default 2022-09-07 18:49:48 +12:00
Jake Barnby
5eaabe316c
Fix fileSecurity response model type 2022-09-07 18:47:32 +12:00
Bradley Schofield
a04a968def Update permission to use permission class 2022-09-05 16:48:10 +01:00
Bradley Schofield
5294f86595 Run Linter 2022-09-05 13:43:36 +01:00
Bradley Schofield
8bc570b0a5 Merge branch '0.16.x' into feat-response-filters-0.16.x 2022-09-05 13:42:46 +01:00
Christy Jacob
ccabbc4fdf feat: update datetime descriptions 2022-09-05 01:41:26 +04:00
Christy Jacob
6df57b7975 feat: update descriptions 2022-09-05 01:33:52 +04:00
Christy Jacob
d5028e601e feat: update datetime description 2022-09-05 01:26:16 +04:00
shimon
f63c740917 decouple audits log from events 2022-09-04 11:45:53 +03:00
Jake Barnby
f0c61bc4a7
Fix bucket compression default 2022-09-04 16:51:19 +12:00
Jake Barnby
8639091d06
Fix attribute models 2022-09-03 11:19:20 +12:00
Bradley Schofield
b16053bbdf Merge branch '0.16.x' into fix-unaccepted-invitation-access 2022-08-31 18:29:38 +01:00
Christy Jacob
e5a9195e66
Merge pull request #3736 from appwrite/refactor-cache-date
Refactor cache date
2022-08-31 19:00:36 +02:00
Matej Bačo
6cd1b94935 Fix failing tests 2022-08-31 16:18:41 +00:00
Matej Bačo
a85a471d3b Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2 2022-08-31 13:33:18 +00:00
Matej Bačo
6600f08059 Fix open api test 2022-08-31 13:32:34 +00:00
Damodar Lohani
8fe365d66e Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 13:21:45 +00:00
shimon
f7da33a873 Merge branch '0.16.x' of github.com:appwrite/appwrite into refactor-cache-date 2022-08-31 16:09:42 +03:00
shimon
dab844308b dateTime bug fix in the deletes worker
dateTime small fix
2022-08-31 16:07:27 +03:00
Matej Bačo
dccb9b7291 Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2 2022-08-31 12:38:40 +00:00
Matej Bačo
d5997d92c3 Updated all UI components for new queries V2. introduced queries to listProjects 2022-08-31 12:30:16 +00:00
Damodar Lohani
7b5cee8da9 fix description to use markdown for links 2022-08-31 10:24:13 +00:00
Damodar Lohani
d647bdaf9e update compression attribute description 2022-08-31 09:55:55 +00:00
Matej Bačo
0897cd0fe4
Merge branch '0.16.x' into feat-variables-api 2022-08-31 09:37:47 +02:00
Matej Bačo
3fc2e70007 updateVariable 'key' param marked as required 2022-08-31 07:33:43 +00:00
Damodar Lohani
63f95c0a5c Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 02:55:26 +00:00
Damodar Lohani
77c72970e8 ZSTD compression test 2022-08-31 02:49:13 +00:00
Christy Jacob
fe8295c2ec Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-30 17:35:46 +00:00
Bradley Schofield
9b3e333134 Fix unaccepted invitations giving access to projects 2022-08-30 16:53:57 +01:00
Christy Jacob
7591f68970
Merge pull request #3702 from appwrite/feat-list-endpoints-queries
Feat: List endpoint queries
2022-08-30 14:56:09 +02:00
Jake Barnby
f0bce98d91
Update specs to use const datetime example 2022-08-30 21:38:27 +12:00
Christy Jacob
177354407a
Merge pull request #3689 from appwrite/feat-list-users-queries 2022-08-30 13:19:56 +04:00
Matej Bačo
b8f6393df6 PR review changes 2022-08-30 08:57:10 +00:00
Matej Bačo
2b3dc48bf1 PR review changes 2022-08-30 08:21:34 +00:00
Matej Bačo
951ed70fb0 Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-29 08:56:14 +00:00
Matej Bačo
889eaff418 Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-29 08:52:28 +00:00
Jake Barnby
44970cc628 Sync master 2022-08-28 11:01:46 +12:00
Christy Jacob
f6e7d00b1e Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-list-users-queries 2022-08-27 20:21:51 +00:00
Christy Jacob
25d9c8e501 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-27 20:03:15 +00:00
Jake Barnby
c531213a5f Doc updates 2022-08-27 15:19:00 +12:00
Matej Bačo
dca0b211f6 Implement queries into list variables 2022-08-26 13:38:39 +00:00
Matej Bačo
3b7ac045d7 Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api 2022-08-26 07:51:54 +00:00
Matej Bačo
7f0507473d Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-26 07:47:42 +00:00
Matej Bačo
281eb2fafe Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-26 07:40:35 +00:00
Jake Barnby
f904698d66 Add permissions doc links to model rule descriptions 2022-08-26 16:34:05 +12:00
Steven
60a4563908 Fix usage tests 2022-08-25 22:15:11 +00:00
Matej Bačo
78f65401e8 Attempt to fix usage tests 2022-08-25 14:56:15 +00:00
Matej Baco
8513bb2dbe Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-25 11:14:42 +02:00
Matej Baco
fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Jake Barnby
7159f9c187 Merge remote-tracking branch 'origin/origin/datetime-attributes' 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
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 20:53:52 +12:00
Matej Baco
c6e614d896 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-25 10:38:43 +02:00
fogelito
064d538023 Merge remote-tracking branch 'origin/origin/datetime-attributes' into origin/datetime-attributes 2022-08-25 11:14:48 +03:00
fogelito
c30189f903 Vincent Changes Apply 2022-08-25 11:14:27 +03:00
Shmuel Fogel
deb5164eb3
Update src/Appwrite/Utopia/Response/Model/Func.php
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:11:17 +03:00
Shmuel Fogel
26a2569b8e
Update src/Appwrite/Utopia/Response/Model/Func.php
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:11:08 +03:00
Jake Barnby
10b8b4b4f6 Format 2022-08-25 18:48:05 +12:00
Jake Barnby
292037f90b Fix datetime calculation 2022-08-25 18:47:19 +12:00
Jake Barnby
ec3c2628b1 Fix datetime calculation 2022-08-25 18:45:05 +12:00
Jake Barnby
9f3dd54198 Fix merge clobber 2022-08-25 18:27:55 +12:00
Jake Barnby
e7298b13b0 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/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:26:30 +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
Matej Bačo
756d0bbd5b Linter fix 2022-08-24 18:59:34 +00:00
Steven
fc38771d69 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-24 18:52:39 +00:00
Matej Bačo
b1dfd94d49 Add indexes for internal queries 2022-08-24 18:41:26 +00:00
Matej Bačo
65d09705ac Simplify class name 2022-08-24 18:25:15 +00:00
Matej Bačo
55a2e52764 Allow unindexed internal queries 2022-08-24 18:23:34 +00:00
Matej Bačo
cb6a186c5d PR review changes 2022-08-24 15:07:18 +00:00
Matej Bačo
b765ad603d Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-24 14:12:41 +00:00
Matej Bačo
4645fcd0c8 Fix tests 2022-08-24 10:31:47 +00:00
Matej Bačo
bd7395cb44 Bug fixing, upgrade tests to new syntax 2022-08-24 09:22:13 +00:00
Matej Bačo
01a57d91ad Fix listDocument queries validation 2022-08-23 16:33:08 +00:00
Matej Bačo
7fb74027d4 Upgrade listDocuments queries 2022-08-23 15:18:59 +00:00
Matej Bačo
11c8fccd88 PR review changes 2022-08-23 15:01:57 +00:00
Matej Bačo
531d57feff Upgrade listMemberships queries 2022-08-23 13:16:46 +00:00
Matej Bačo
2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo
e068bcdbc1 Upgrade listCollections queries 2022-08-23 12:30:28 +00:00
Matej Bačo
94acd32d69 Upgrade listDatabases queries 2022-08-23 09:40:17 +00:00
Matej Bačo
17e41eee1d Upgrade listExecutions queries 2022-08-23 09:26:34 +00:00
Matej Bačo
a92f96bf80 Upgrade listDeployments queries 2022-08-23 09:12:48 +00:00
Matej Bačo
1eee0baa28 Upgrade listFunctions queries 2022-08-23 09:02:06 +00:00
Matej Bačo
6c971f6ece Upgrade listTeams queries 2022-08-23 08:56:28 +00:00
Matej Bačo
d1f6cb31d6 Upgrade listFiles queries 2022-08-23 08:49:39 +00:00
Matej Bačo
6fcd3757fe Upgrade listBuckets queries 2022-08-23 08:37:55 +00:00
Matej Bačo
da73dc7fcb Fix users queries allowed params 2022-08-23 08:37:31 +00:00
Jake Barnby
e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Steven
66ff297103 Refactor Queries Validation 2022-08-22 19:16:20 +00:00
Christy Jacob
e09cb3a1cb feat: update queries constructor 2022-08-22 15:11:47 +00:00
Christy Jacob
464738274d feat: update queries constructor 2022-08-22 15:06:11 +00:00
Christy Jacob
cff0fd9476 feat: update queries constructor 2022-08-22 15:04:55 +00:00
Christy Jacob
0fd55cb13c feat: update queries constructor 2022-08-22 14:44:28 +00:00
Christy Jacob
3ceff5aa71 feat: update queries constructor 2022-08-22 14:37:35 +00:00
Christy Jacob
dd00c58b08 feat: remove queries 2022-08-22 14:14:40 +00:00
Christy Jacob
0304a57915 feat: remove queries 2022-08-22 14:12:52 +00:00
Christy Jacob
3fe22b7ed0 feat: update file structure 2022-08-22 14:10:10 +00:00
Christy Jacob
afa71bcaf3 feat: update file structure 2022-08-22 14:09:04 +00:00
Christy Jacob
228bedd6d0 feat: update file structure 2022-08-22 14:05:49 +00:00
Christy Jacob
b2b714f713 feat: update naming convention and folder structure 2022-08-22 13:48:35 +00: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
Jake Barnby
eb1476b28b Apply validator updates to OpenAPI3 2022-08-22 14:27:17 +12:00
Steven
2bde7aa02b Fix databases tests 2022-08-20 00:15:18 +00:00
Steven
146cb6a0d8 Fix list user logs tests 2022-08-19 23:31:02 +00:00
Steven
3890dea35b Add additional Validators for Queries 2022-08-19 23:20:22 +00:00
Steven
a5bc07c9e4 Merge branch 'feat-list-users-queries' into feat-list-user-logs-queries 2022-08-19 22:00:54 +00:00
Steven
c1cdad5566 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-19 14:50:50 +00:00
Bradley Schofield
0d81918685 Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-19 11:25:39 +01:00
Christy Jacob
7673fb44e5 feat: update default values 2022-08-19 10:03:54 +00:00
Christy Jacob
dbd7afeda0 feat: update default values 2022-08-19 09:58:11 +00:00
Bradley Schofield
7895ac6c40 Update Func.php 2022-08-19 10:57:59 +01:00
Christy Jacob
28d9e15980 feat: update response model 2022-08-19 09:45:36 +00:00
Christy Jacob
2a750eaa73 Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:32:22 +00:00
Matej Bačo
61ab41bf86 Implement status of oauth providers, and refactor response models 2022-08-19 09:21:51 +00:00
Christy Jacob
278afd77c0 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:20:08 +00:00
Jake Barnby
c1c3a7c7ae Remove redundant exception 2022-08-19 20:31:19 +12:00
Jake Barnby
cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12: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
Jake Barnby
66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
Steven
27f69e3c09 Consolidate List User Logs API params
Replace limit and offset params with a single queries param since the
Queries V2 change now allows for different types of queries.
2022-08-19 00:09:34 +00:00
Steven
f0d66985f7 Consolidate List Users API params
Replace search, limit, offset, cursor, cursorDirection, and orderType
params with a single queries param since the Queries V2 change now
allows for different types of queries.
2022-08-18 19:30:39 +00:00
Steven
753aebccab Create Appwrite Query Validator
The Appwrite Query Validator checks if the cursor value is a valid UID.
This is different than the cursor value in utopia-php/database because
the value in the database layer is expected to be a document.
2022-08-18 19:30:39 +00:00
Damodar Lohani
fdac3bfe4a missing functions stats 2022-08-18 01:45:55 +00: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
fogelito
c21b563614 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz
 Conflicts:
	app/controllers/general.php
	composer.json
	composer.lock
2022-08-17 21:04:23 +03:00
fogelito
5d99f7c3a6 after branch change to datetime attributes 2022-08-17 17:09:21 +03:00
Bradley Schofield
80ff661aeb Continue working on response filters 2022-08-17 14:08:09 +01: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
Damodar Lohani
a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
Bradley Schofield
407c150631 Merge branch '0.16.x' into feat-response-filters-0.16.x 2022-08-17 10:34:01 +01:00
Bradley Schofield
9f3ebe9956 Continue working on permission backporting 2022-08-17 10:33:35 +01: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
Christy Jacob
11ad9c8dd9 feat: update abuse library 2022-08-16 20:47:05 +00:00
Christy Jacob
4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00:00
Eldad A. Fux
69a4f51d58
Merge pull request #3656 from appwrite/feat-functions-console-logs
Functions Console Logs Capture
2022-08-16 23:23:53 +03:00
Eldad A. Fux
ccb8a1144c
Merge pull request #2747 from appwrite/feat-password-hash-algos
Password Hashing algos
2022-08-16 22:30:23 +03:00
Eldad A. Fux
e0abc972ff
Merge pull request #3681 from appwrite/feat-missing-phone-param
Changed provider name from phone to sms and added phone param to create endpoints
2022-08-16 21:01:54 +03:00
Torsten Dittmann
32b1e0db51 fix: remove unnecessary data 2022-08-16 13:58:29 +02:00
Torsten Dittmann
381374209a fix: models 2022-08-16 13:57:13 +02:00
Matej Bačo
ebb4d402b7 Linter fix 2022-08-16 11:41:49 +00:00
Matej Bačo
eaf9cd59e9 Fix OpenAPI3 nested anyOf/oneOf 2022-08-16 11:40:19 +00:00
Jake Barnby
5d84d6d43f Lint 2022-08-16 20:33:06 +12:00
Jake Barnby
bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby
39231f8cf9 Lint 2022-08-16 19:26:40 +12: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
Jake Barnby
f672269a8c Handle aggregates per resource type at the controller level 2022-08-16 17:54:44 +12:00
Damodar Lohani
94d9bb8a18 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-functions-console-logs 2022-08-16 04:42:03 +00:00
fogelito
f52d28e75f Auth tests 2022-08-15 22:18:37 +03:00