1
0
Fork 0
mirror of synced 2024-08-21 05:02:07 +12:00
Commit graph

12261 commits

Author SHA1 Message Date
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
Shmuel Fogel
c04734048f
Update app/controllers/api/databases.php
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:05:01 +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
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
Christy Jacob
b24aec82e7
Merge pull request #3458 from appwrite/feat-usage-updates
New usage stats
2022-08-23 08:55:41 +05:30
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
Damodar Lohani
77958b465e update database usage params label 2022-08-21 02:10:21 +00:00
Damodar Lohani
6af467398b update usage labels 2022-08-21 02:04:52 +00:00
Damodar Lohani
c5a8e470c5 update usage labels to match audits labels pattern 2022-08-21 02:03:19 +00:00
Damodar Lohani
2205ecd9c6 null safety checks 2022-08-20 11:20:31 +00:00
Jake Barnby
e4392bdbfb Merge fixes
(cherry picked from commit 24875e352d)
2022-08-19 17:12:20 +12:00
Jake Barnby
5f990ecb6d Fix imports 2022-08-19 16:28:40 +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
Damodar Lohani
db9faebcc9
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-18 16:04:19 +05:45
Damodar Lohani
7c2ecaec4b correct function status 2022-08-18 05:13:30 +00:00
Damodar Lohani
e63e79d3f9 linter fix 2022-08-18 01:50:55 +00:00
Damodar Lohani
acd5dfc23f update functions test 2022-08-18 01:49:41 +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
Damodar Lohani
b28d3ce302 fix usage test 2022-08-18 00:36:25 +00:00
Damodar Lohani
4d482ebb81 fix accounts PR 2022-08-18 00:31:56 +00:00
Christy Jacob
70f0483f97
Merge pull request #3652 from appwrite/feat-audits-label 2022-08-17 21:29:35 +05:30
shimon
d1aa3fea4f sync with 0.16 2022-08-17 18:03:53 +03:00
shimon
a2af9fef2d sync with 0.16 2022-08-17 17:57:56 +03:00
shimon
0abd8c4108 Merge remote-tracking branch 'origin/feat-audits-label' into feat-audits-label 2022-08-17 17:33:01 +03: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
Christy Jacob
f52bfacf0e
Update tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php 2022-08-17 19:25:42 +05:30
Eldad A. Fux
837336e90f
Merge pull request #3491 from appwrite/feat-file-cache-cleanup
cache cleanup
2022-08-17 16:44:23 +03:00
shimon
73095a325e addressing comments 2022-08-17 16:02:01 +03:00
shimon
bb4390e089 addressing comments 2022-08-17 14:18:22 +03:00
shimon
4b062ca76d addressing comments 2022-08-17 14:11:34 +03:00
Damodar Lohani
c0119e6a0d fix formatting 2022-08-17 11:10:17 +00:00
shimon
9cdb67a661 addressing comments 2022-08-17 14:09:15 +03:00
Damodar Lohani
6b11fa26ce rename and remove unused param 2022-08-17 10:55:01 +00:00
Damodar Lohani
d4f02402bd Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 10:38:16 +00:00
Damodar Lohani
fca655a48d function usage test 2022-08-17 10:36:30 +00:00
Damodar Lohani
0d97580361 fix usage params in execution 2022-08-17 10:13:50 +00:00
shimon
e94c7eba83 more audit labels on users new routes 2022-08-17 13:01:16 +03:00
Damodar Lohani
7993e7e232 update console sdk 2022-08-17 09:59:47 +00:00
Damodar Lohani
4b43847bd8 update latest spec 2022-08-17 09:57:36 +00:00
shimon
4729444622 fix 2022-08-17 12:52:50 +03: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
shimon
835ef0ffc1 small fix 2022-08-17 12:25:47 +03:00
shimon
a4c0d89d55 sync with 0.16 2022-08-17 11:19:31 +03:00