1
0
Fork 0
mirror of synced 2024-07-06 15:11:21 +12:00
Commit graph

1007 commits

Author SHA1 Message Date
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 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
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
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
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
Jake Barnby 7c34387d22 Update specs + console SDK 2022-08-15 16:39:30 +12:00
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
Damodar Lohani 8fdec117cd fix usage params 2022-08-14 12:04:49 +00:00
Damodar Lohani e26e2e44cc fix usage attributes 2022-08-14 12:03:21 +00: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
Damodar Lohani d9745b3477 fix execution list UI 2022-08-14 09:23:41 +00: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
Jake Barnby 68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Jake Barnby c6c5ce0619 Fix create file permissions not resetting after create 2022-08-13 23:51:26 +12:00
Jake Barnby a44e9f2c09 Add bucket/file permissions comps 2022-08-13 21:02:32 +12:00
Jake Barnby 0cd1b232ed Fix hidden forms 2022-08-13 21:01:33 +12:00
Jake Barnby 62200eda9e Pull secondary form into matrix component to allow multiple in the same page 2022-08-13 19:47:04 +12:00
Jake Barnby 3c8acac758 Show permission block for documents if document security is enabled 2022-08-13 18:34:47 +12:00
Jake Barnby c66a1991d8 Make permissions matrix reusable 2022-08-13 18:33:11 +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 d2b9102f84 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
2022-08-13 00:54:27 +12:00
Jake Barnby f278517276 Validate permission role input exists 2022-08-12 23:44:27 +12:00
Jake Barnby 76f86c74ad Allow updating existing permission rows 2022-08-12 22:37:52 +12:00
Jake Barnby 770c08725f Add role suggestions 2022-08-12 14:59:44 +12:00
Jake Barnby 1234cc8152 Styling 2022-08-12 14:59:11 +12:00
Bradley Schofield 072755ce7d Rename users page to Authentication 2022-08-12 02:41:31 +01:00
Jake Barnby 0226478c63 Add cast from csv to array 2022-08-12 13:05:54 +12:00
Jake Barnby a5e6c04cb0 Working permission row addition and removal 2022-08-12 01:22:39 +12:00
Damodar Lohani 13f915cc77 UI update 2022-08-11 08:25:44 +00:00
Jake Barnby 531247deb4 Collection UI updates 2022-08-10 22:23:53 +12:00
Damodar Lohani 9002bbe77e update response format 2022-08-10 09:50:05 +00:00
Damodar Lohani c7d6d38ab7 update UI to include logs 2022-08-10 07:24:13 +00:00
Bradley Schofield 2215e4db49 Add Parent Database ID to collection and documents 2022-08-09 17:18:43 +01:00
Torsten Dittmann d9c7bbd3d2 fix: scripts for filters and charts 2022-08-09 16:05:34 +02:00
Damodar Lohani 1b1ba985a9 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-08 02:18:49 +00:00
Christy Jacob 78d02f50af
Merge pull request #3180 from Aragur/feat-XXX-authentik-oauth
feat: Add authentik as a OAuth provider
2022-08-05 13:06:05 +05:30
Jake Barnby 1ab86c9331 Role reference updates 2022-08-03 16:17:49 +12:00
Jake Barnby 4520114780 Refactor storage to use new permissions 2022-08-02 21:19:15 +12:00
Torsten Dittmann bd550f8a1e feat: ui for datetime attribute 2022-07-28 14:38:54 +02:00
Damodar Lohani 9461a70784 fix function name 2022-07-18 07:12:15 +00:00
Damodar Lohani b6cc0471c5 fix UI 2022-07-18 06:36:53 +00:00
Damodar Lohani ada00948c5 functions usage 2022-07-18 06:30:51 +00:00
Matej Bačo 1616f15a40 Fix database dates 2022-07-11 08:40:58 +00:00
Simon 92a43a5930 Merge branch 'appwrite:master' into feat-XXX-authentik-oauth 2022-07-06 11:02:59 +02:00
Torsten Dittmann f8d3bd7da3 fix(ui): redirect after deleting collection 2022-06-30 17:40:16 +02:00
Torsten Dittmann 46d4525c45
Merge pull request #3467 from aadarshadhakalg/master
fix: typo in database create success alert message
2022-06-30 10:55:19 +02:00
Torsten Dittmann 1b9f6ba58e fix(ui): document link 2022-06-29 16:44:24 +02:00
Torsten Dittmann 54bd8507bc fix: ui delete document redirect 2022-06-29 15:46:00 +02:00
Aadarsha Dhakal c72f8f6499 fix: typo in database create success alert message 2022-06-29 18:30:27 +05:45