1
0
Fork 0
mirror of synced 2024-06-29 19:50:26 +12:00
Commit graph

698 commits

Author SHA1 Message Date
Matej Bačo 6b5a0cbd4f Fix bug after merge comflict 2022-08-29 08:49:00 +00:00
Christy Jacob 793fbff7f5 feat: update dependencies 2022-08-27 20:23:20 +00:00
Jake Barnby cab456aaff Update database, audit, abuse 2022-08-27 22:09:49 +12:00
Jake Barnby 7f007c2ff4 Lock update 2022-08-27 15:24:12 +12:00
Matej Bačo 78f65401e8 Attempt to fix usage tests 2022-08-25 14:56:15 +00:00
Jake Barnby 31bd5cbeda Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/tasks/maintenance.php
2022-08-26 00:10:11 +12:00
Jake Barnby 51e6d024ab Lock update 2022-08-25 23:30:54 +12:00
fogelito ddabb540c1 fix maintenance.php setDatetime 2022-08-25 12:57:59 +03:00
Jake Barnby e0a1f4b8fe Database test updates 2022-08-25 01:32:52 +12:00
Jake Barnby e989735e89 Remove permissions processor 2022-08-23 13:42:25 +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
fogelito 04844b180b composer updates 2022-08-17 21:15:25 +03:00
shimon a4c0d89d55 sync with 0.16 2022-08-17 11:19:31 +03:00
Christy Jacob d2305a7900 feat: update abuse library 2022-08-16 20:45:55 +00:00
Jake Barnby 7626a0c121 Update lock 2022-08-16 23:38:17 +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
Damodar Lohani e59f00fcd0 update runtime package 2022-08-16 04:37:54 +00:00
Jake Barnby 5870e6367c Update abuse lib 2022-08-15 19:50:20 +12:00
Steven 6b618a5824 Merge branch 'origin/datetime-attributes' into feat-datetime-attributes-with-database-query-update 2022-08-15 01:45:56 +00:00
Jake Barnby d5a1872f93 Spec + dist + lock update 2022-08-15 12:21:11 +12:00
Jake Barnby 613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Jake Barnby 9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
fogelito 00e64e3518 datetime tests fixes 2022-08-14 13:10:32 +03:00
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Jake Barnby 9e02c26908 Update libs 2022-08-14 15:35:00 +12:00
Jake Barnby 2ca2f4e135 Update audits 2022-08-14 03:17:18 +12:00
Jake Barnby 70758927cd Test fixes 2022-08-14 02:55:15 +12:00
Jake Barnby ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12:00
Christy Jacob 4be3f23757 fix: merge conflict 2022-08-13 13:31:27 +05:30
Jake Barnby fc119ecd98 Fix abuse 2022-08-13 13:31:31 +12:00
Christy Jacob 9693c6e941 Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x 2022-08-12 21:44:36 +05:30
Jake Barnby 09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Jake Barnby 5c6cb2a422 Test fixes 2022-08-13 00:49:57 +12:00
Jake Barnby 1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
Jake Barnby 25e893f712 Revert sdk-generator to master 2022-08-10 18:02:23 +12:00
Jake Barnby 216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
Jake Barnby e2cf49aefd Update sdk-generator 2022-08-08 23:00:26 +12:00
Bishwajeet Parhi 999962d161 add comments denoting return type and parameters if any 2022-08-05 16:09:38 +00:00
Jake Barnby 54b07a9446 Handle document/file level security in collections layer 2022-08-04 16:20:11 +12:00
Jake Barnby d9f0ece812 Remove new properties from DB level 2022-08-04 12:08:16 +12:00
Torsten Dittmann 28db040e57 fix: console sdk 2022-08-02 12:21:31 +02:00
Damodar Lohani ce7d98ff1f framework released 2022-08-02 01:15:56 +00:00
Damodar Lohani a4eafa5c66 composer update 2022-07-27 06:00:21 +00:00
Damodar Lohani 11ea71f7b9 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-hooks-implementation 2022-07-27 05:59:52 +00:00
Damodar Lohani 9e2cc6bb21 new framework version fixes the issues 2022-07-25 11:50:24 +00:00
Torsten Dittmann 5b73561aba sync: with master 2022-07-25 12:17:08 +02:00