Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-21 07:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
12418 commits 1261 branches 495 tags 506 MiB
Commit graph

1951 commits

Author SHA1 Message Date
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
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
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
Jake Barnby
e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Jake Barnby
eb1476b28b Apply validator updates to OpenAPI3 2022-08-22 14:27:17 +12: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
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
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
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
Jake Barnby
b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
shimon
0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Jake Barnby
33970276b2 Self review 2022-08-15 19:20:10 +12:00
Eldad Fux
6f74c565e8 Fixed docblock 2022-08-15 09:55:37 +03:00
Jake Barnby
86f209800a Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes 
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/AttributeDatetime.php
 2022-08-15 16:43:47 +12:00