Jake Barnby
|
a320e220c3
|
Console fixes
|
2022-08-26 15:34:26 +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
|
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
|
7993e7e232
|
update console sdk
|
2022-08-17 09:59:47 +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 |
|
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 |
|
Matej Bačo
|
44310876d2
|
build JS
|
2022-08-16 10:45:08 +00:00 |
|
Matej Bačo
|
f10cf58ec3
|
Update console sdk
|
2022-08-16 10:42:21 +00:00 |
|
Jake Barnby
|
7c34387d22
|
Update specs + console SDK
|
2022-08-15 16:39:30 +12:00 |
|
Jake Barnby
|
bb46d950df
|
Handle permissions quotes
|
2022-08-15 13:04:14 +12:00 |
|
Jake Barnby
|
d5a1872f93
|
Spec + dist + lock update
|
2022-08-15 12:21:11 +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 |
|
Eldad Fux
|
98fc8669e1
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos
|
2022-08-14 19:23:30 +03:00 |
|
Damodar Lohani
|
07ace68d75
|
latest spec and sdk
|
2022-08-14 11:59:40 +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 |
|
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
|
bfa4abbf87
|
Dist update
|
2022-08-13 21:07:25 +12:00 |
|
Jake Barnby
|
9a488d1d8c
|
Fix create file permissions
|
2022-08-13 21:07:17 +12:00 |
|
Jake Barnby
|
7da5f3a04d
|
Fix hardcoded permission types
|
2022-08-13 21:07:07 +12:00 |
|
Christy Jacob
|
4be3f23757
|
fix: merge conflict
|
2022-08-13 13:31:27 +05:30 |
|
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
|
5c6cb2a422
|
Test fixes
|
2022-08-13 00:49:57 +12:00 |
|
Jake Barnby
|
5799bf2d62
|
Transform delete key on input as well as output
|
2022-08-12 23:44:47 +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
|
1234cc8152
|
Styling
|
2022-08-12 14:59:11 +12:00 |
|
Jake Barnby
|
0226478c63
|
Add cast from csv to array
|
2022-08-12 13:05:54 +12:00 |
|
Jake Barnby
|
3e17d9398b
|
Fix raw permission removal
|
2022-08-12 12:26:58 +12:00 |
|
Jake Barnby
|
a5e6c04cb0
|
Working permission row addition and removal
|
2022-08-12 01:22:39 +12:00 |
|
Jake Barnby
|
531247deb4
|
Collection UI updates
|
2022-08-10 22:23:53 +12:00 |
|
Jake Barnby
|
25e893f712
|
Revert sdk-generator to master
|
2022-08-10 18:02:23 +12: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 |
|
Bishwajeet Parhi
|
93466d9a66
|
resized image 100x100
|
2022-08-05 16:12:00 +00:00 |
|
Bishwajeet Parhi
|
3f15035c1a
|
Merge branch 'appwrite:master' into feat-disqus-Oauth-provider
|
2022-08-05 21:24:19 +05:30 |
|
Matej Bačo
|
6c21723ecb
|
Merge branch 'appwrite:master' into shiftra
|
2022-08-05 13:32:06 +02: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
|
e01560ab89
|
Merge remote-tracking branch 'origin/fix-console-sdk' into refactor-permissions-inc-console-fix
# Conflicts:
# composer.json
# composer.lock
# public/dist/scripts/app-all.js
# public/dist/scripts/app-dep.js
# public/scripts/dependencies/appwrite.js
|
2022-08-05 18:51:09 +12:00 |
|
Damodar Lohani
|
34794d2554
|
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-usage-updates
|
2022-08-04 06:03:39 +00:00 |
|
Jake Barnby
|
8ced769fae
|
Update console SDK
|
2022-08-04 16:47:24 +12:00 |
|
Torsten Dittmann
|
28db040e57
|
fix: console sdk
|
2022-08-02 12:21:31 +02:00 |
|
Matej Bačo
|
8c825d477f
|
Merge commit '8d99860c55cff4ab1291a51ee5b6c7900641e1eb' into shiftra
|
2022-08-01 04:37:30 +00:00 |
|
Torsten Dittmann
|
7b95c46cf5
|
Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api
|
2022-07-28 14:40:45 +02:00 |
|
Torsten Dittmann
|
bd550f8a1e
|
feat: ui for datetime attribute
|
2022-07-28 14:38:54 +02:00 |
|
Steven
|
723c6f5436
|
Fix incorrect databases links
|
2022-07-26 23:16:47 +00:00 |
|
Steven
|
f5514c4fea
|
Fix incorrect storage links
|
2022-07-26 23:16:32 +00:00 |
|
Matej Bačo
|
dbccf39a9f
|
Merge branch 'master' into feat-password-hash-algos
|
2022-07-25 12:37:07 +00:00 |
|
Torsten Dittmann
|
5b73561aba
|
sync: with master
|
2022-07-25 12:17:08 +02:00 |
|