1
0
Fork 0
mirror of synced 2024-07-03 21:50:34 +12:00
Commit graph

7069 commits

Author SHA1 Message Date
Christy Jacob f09cce93ee feat: use datetime filters for acessedAt 2022-08-19 09:37:35 +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
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 399df17a3d Fix application reference 2022-08-19 20:49:13 +12:00
Jake Barnby c1c3a7c7ae Remove redundant exception 2022-08-19 20:31:19 +12:00
Jake Barnby e4392bdbfb Merge fixes
(cherry picked from commit 24875e352d)
2022-08-19 17:12:20 +12:00
Jake Barnby 24875e352d Merge fixes 2022-08-19 17:05:39 +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 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
Jake Barnby 9819088563 Lint 2022-08-19 16:05:00 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12: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
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 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
shimon 73095a325e addressing comments 2022-08-17 16:02:01 +03:00
shimon 9cdb67a661 addressing comments 2022-08-17 14:09:15 +03:00
shimon e94c7eba83 more audit labels on users new routes 2022-08-17 13:01:16 +03:00
shimon 835ef0ffc1 small fix 2022-08-17 12:25:47 +03: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
shimon 88f6a67802 sync with 0.16 2022-08-17 10:36:38 +03:00
shimon cc887beae9 sync with 0.16 2022-08-17 10:32:42 +03:00
shimon 2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2022-08-17 10:05:37 +03:00
Jake Barnby 163782d4cd Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	composer.lock
#	public/dist/scripts/app-all.js
#	public/dist/scripts/app-dep.js
#	public/dist/scripts/app.js
2022-08-17 15:34:41 +12:00
Jake Barnby f36f176849 Role helper usage 2022-08-17 15:11:49 +12: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 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
Matej Bačo 7a1dfbfb8d Fix passwordUpdate time for non-pass users 2022-08-16 15:56:54 +00:00
shimon 1abd57567f linter fix 2022-08-16 18:02:17 +03:00
shimon 7ad7d1807e fill gaps from merge 2022-08-16 17:56:05 +03:00
Matej Bačo 7d9f973c62 Fix escaping, write tests for stdout/stderr, upgrade runtimes to V2 2022-08-16 14:49:08 +00:00
shimon 5d284b8c27 fill gaps from merge 2022-08-16 16:20:35 +03:00
Matej Bačo 2814a6f680 Linter fix 2022-08-16 13:03:38 +00:00
Matej Bačo 3088535806 Added phone number to UsersAPI createUser + tests 2022-08-16 13:02:28 +00:00
Christy Jacob 51cb03a93e feat: linter fix 2022-08-16 17:58:30 +05:30
Jake Barnby b09aaabd14 Fix teams exception 2022-08-17 00:14:22 +12:00
Matej Bačo 1e96f8c3d9 Revert changes regarding AccountAPI createAccount 2022-08-16 12:05:46 +00:00
Matej Bačo eaf9cd59e9 Fix OpenAPI3 nested anyOf/oneOf 2022-08-16 11:40:19 +00:00
shimon de42895096 fill gaps from merge 2022-08-16 14:27:50 +03:00
Jake Barnby e3ec275a51 Cleaner permission checks 2022-08-16 23:26:38 +12:00
Matej Bačo f10cf58ec3 Update console sdk 2022-08-16 10:42:21 +00:00
shimon beaad6c49d fill gaps from merge 2022-08-16 13:19:38 +03:00
shimon 923a741c5a 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-16 12:47:51 +03:00
Jake Barnby 1aa36b6b2c Simplify permission checks 2022-08-16 21:08:14 +12:00
Jake Barnby 326220762e Exception fixes 2022-08-16 21:07:30 +12:00
shimon 8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03:00
Jake Barnby 5d84d6d43f Lint 2022-08-16 20:33:06 +12:00