Commit graph

1898 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
shimon
0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Eldad Fux
6f74c565e8 Fixed docblock 2022-08-15 09:55:37 +03:00
Steven
6b618a5824 Merge branch 'origin/datetime-attributes' into feat-datetime-attributes-with-database-query-update 2022-08-15 01:45:56 +00:00
Damodar Lohani
6824d23dfe fix collections create metrics table name 2022-08-15 01:10:57 +00:00
Eldad Fux
f88a64df1c Fix for linter 2022-08-14 22:01:58 +03:00
Eldad Fux
9b897629ba Fixed code generator 2022-08-14 21:57:23 +03:00
Eldad Fux
22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux
98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
shimon
ab27e0a74d some fixes 2022-08-14 18:01:34 +03:00
Eldad Fux
53b60c9244 Fix for linter 2022-08-14 17:22:51 +03:00
Eldad Fux
b36c24c508 Decouple Auth code from SMS provider adapter 2022-08-14 17:19:58 +03:00
fogelito
74ae43b092 global const for TYPE_DATETIME_EXAMPLE change value 2022-08-14 16:56:55 +03:00
Eldad Fux
1da208ad10 Fix adapter name 2022-08-14 16:53:19 +03:00
Eldad Fux
25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Eldad A. Fux
d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions
Simplify Exception Creation
2022-08-14 15:27:52 +03:00
Damodar Lohani
5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00:00
fogelito
9b9f2fe428 global const for TYPE_DATETIME_EXAMPLE 2022-08-14 13:27:07 +03:00
Damodar Lohani
89b2234c17 update stdout and stderr description 2022-08-14 09:29:46 +00:00
Christy Jacob
fb81627b83 feat: update exception class 2022-08-14 12:49:19 +05:30
Christy Jacob
a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Christy Jacob
c2f7cd6d19 feat: remove logger as an entity 2022-08-14 11:06:04 +05:30
Christy Jacob
c6f0b14e92 feat: address issues on init.php 2022-08-14 11:05:25 +05:30
shimon
02f57cd69d Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.lock
2022-08-13 18:45:29 +03:00
Christy Jacob
8b23dcd69e fix: update constructor, remove account entity, add missing ID error 2022-08-13 20:14:04 +05:30
Eldad A. Fux
ba239de8be
Merge branch '0.16.x' into fix-unit-tests 2022-08-13 12:28:33 +03:00
shimon
e8a2e30bb5 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup 2022-08-13 10:35:54 +03:00
Eldad Fux
3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00