Jake Barnby cb4a256d5f Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes ... # 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 # composer.lock # public/dist/scripts/app-all.js # public/dist/scripts/app-dep.js # public/dist/scripts/app.js # public/dist/styles/default-ltr.css # public/dist/styles/default-rtl.css # public/scripts/dependencies/appwrite.js		2022-08-15 12:05:52 +12:00
..
dependencies	Revert sdk-generator to master	2022-08-10 18:02:23 +12:00
services	Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes	2022-08-15 12:05:52 +12:00
views	Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes	2022-08-15 12:05:52 +12:00
app.js	Upgrded chart comp	2020-05-12 23:15:36 +03:00
events.js	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
filters.js	fix: scripts for filters and charts	2022-08-09 16:05:34 +02:00
init.js	fix: console sdk	2022-08-02 12:21:31 +02:00
permissions-matrix.js	Fix hardcoded permission types	2022-08-13 21:07:07 +12:00
routes.js	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
upload-modal.js	Fix create file permissions	2022-08-13 21:07:17 +12:00