1
0
Fork 0
mirror of synced 2024-08-04 13:01:45 +12:00
Commit graph

157 commits

Author SHA1 Message Date
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
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
Torsten Dittmann
d9c7bbd3d2 fix: scripts for filters and charts 2022-08-09 16:05:34 +02:00
Jake Barnby
8ced769fae Update console SDK 2022-08-04 16:47:24 +12:00
Simon
92a43a5930 Merge branch 'appwrite:master' into feat-XXX-authentik-oauth 2022-07-06 11:02:59 +02:00
Matej Bačo
1fd5ae2991 QA bug fixes 2022-06-10 12:41:31 +00:00
Matej Bačo
116e51b006 Finish gitlab custom hostname 2022-06-10 12:03:51 +00:00
Matej Bačo
9ebdbc58da WIP: Gitlab OAuth custom endpoint 2022-06-10 10:03:30 +00:00
Simon
af599ceba8 Add authentik as a OAuth provider 2022-05-05 15:07:32 +02:00
Tanay Pant
7a884f5b50
Merge branch 'master' into feat-okta-oauth 2022-04-26 16:10:54 +02:00
Christy Jacob
9bf5babe4a
Merge pull request #3048 from appwrite/feat-auth0-oauth
Feat: Create Auth0 OAuth Adapter
2022-04-26 16:29:06 +03:00
Tanay Pant
56c184eff3 Add field for custom authorization server ID 2022-04-26 12:15:42 +02:00
Tanay Pant
8942610219 Fix typo 2022-04-23 23:29:26 +02:00
Tanay Pant
e0a8ef8b3a Create Okta OAuth Adapter 2022-04-23 20:14:32 +02:00
Eldad A. Fux
0d3abf0809
Merge pull request #3057 from appwrite/fix-project-logo
Fix: Project Logo
2022-04-10 17:13:06 +03:00
Matej Bačo
7d2a867b5e Fixed project logo missing 2022-04-04 11:17:41 +00:00
Christy Jacob
b06a887d85 feat: update Microsoft OAuth Adapter 2022-04-02 16:12:31 +03:00
adityaoberai
ee46e14103 Create Auth0 OAuth Adapter 2022-04-01 16:04:56 +05:30
Damodar Lohani
9ef42eb84f fix project logo upload 2022-02-28 08:47:30 +00:00
Damodar Lohani
21dc234a94 Merge branch '0.13.x' into feat-storage-buckets 2022-01-31 15:37:08 +05:45
Simon Trockel
45635cdbcc Rework Apple Custom Oauth Form 2022-01-22 23:13:16 +01:00
Simon Trockel
8233881c44 feat: Generic custom Oauth provider form 2022-01-22 19:31:40 +01:00
Simon Trockel
9922a6d6cf feat: Makes Microsoft OAuth Provider configureable 2022-01-17 00:46:12 +01:00
Damodar Lohani
2239e4a5e6 Merge branch 'feat-s3-integration' into feat-refactor-storage-resource 2022-01-07 15:47:38 +05:45
Damodar Lohani
ba82839128 Merge branch 'master' into feat-storage-buckets 2022-01-06 13:11:23 +05:45
Torsten Dittmann
b344b51af7 fix: uid validator text 2021-12-29 18:09:21 +01:00
Damodar Lohani
4cd8f05f69 fixes to files collection 2021-12-23 15:18:44 +05:45
Damodar Lohani
99fd943f3c Merge branch 'feat-database-indexing' into feat-storage-buckets 2021-12-19 12:26:16 +05:45
Torsten Dittmann
6f19652ab8 fix: disable animation from charts 2021-12-16 11:27:19 +01:00
Damodar Lohani
6f31a3de09 Merge branch 'feat-storage-buckets' into feat-sb-uis 2021-12-08 14:25:59 +05:45
Torsten Dittmann
f04cb72cfb Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-main-rebase 2021-12-01 14:19:41 +01:00
Dmitriy Danilov
3eabd83309
Merge branch 'master' into some-typos-fixes 2021-11-28 09:22:19 -05:00
Damodar Lohani
8ece11d28e Merge branch 'feat-storage-buckets' into feat-sb-uis 2021-11-26 10:22:30 +05:45
Torsten Dittmann
e1539639ec fix(ui): charts 2021-11-25 10:07:34 +01:00
Damodar Lohani
e7f7ce0e70 Merge branch 'feat-storage-buckets' into feat-sb-uis 2021-11-25 13:41:12 +05:45
Damodar Lohani
283c55ccc3 fix chartjs tooltip config 2021-11-19 11:32:02 +05:45
Torsten Dittmann
60c6f85b89 fix charts hover 2021-11-18 13:10:02 +01:00
Torsten Dittmann
0fc1812604 Merge branch 'feat-database-indexing' of https://github.com/appwrite/appwrite into feat-db-refactor-ui-fixes 2021-11-18 11:34:53 +01:00
Torsten Dittmann
f2eb6ae317 fix(ui): logs pagination 2021-11-18 11:33:42 +01:00
Damodar Lohani
1abd4a8ac6 chart updated for consistency 2021-11-18 11:24:21 +05:45
Torsten Dittmann
d099b0133c Merge branch 'master' of https://github.com/appwrite/appwrite into feat-database-indexing 2021-11-17 11:39:03 +01:00
Damodar Lohani
3f32e39227 WIP 2021-11-15 11:49:43 +05:45
Damodar Lohani
810eeb3583 Merge branch 'master' into feat-sb-uis-chartjs-upgrade 2021-11-15 10:55:14 +05:45
Damodar Lohani
2d63458b4f fix date 2021-11-12 15:39:43 +05:45
Damodar Lohani
b965b2a146 update charts styling 2021-11-12 15:32:39 +05:45
Damodar Lohani
57f0de5fdd CRUD chart theme 2021-11-12 11:00:15 +05:45
Torsten Dittmann
1c96af3311 fix(ui): multiple arrays on document 2021-11-10 10:43:51 +01:00
Damodar Lohani
654a88a95d update storage usage charts 2021-11-09 15:09:06 +05:45
Torsten Dittmann
244cd28f5a fix(ui): fix typos and replace * role 2021-11-02 16:15:30 +01:00
Torsten Dittmann
535f433817 fix(ui): pre-select value for enum 2021-10-29 15:50:17 +02:00