1
0
Fork 0
mirror of synced 2024-07-04 06:00:53 +12:00
Commit graph

275 commits

Author SHA1 Message Date
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 9693c6e941 Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x 2022-08-12 21:44:36 +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
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
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 2d6dcf976a Merge branch 'master' into feat-XXX-authentik-oauth 2022-05-18 10:25:38 +02:00
Torsten Dittmann 3990ef7fa2 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.14.x 2022-05-08 17:15:25 +02: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
Torsten Dittmann 82d30ebc35 fix(ui): increase alert time 2022-04-22 14:21:04 +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
Torsten Dittmann 6452cae2c7 fix: force reload to console 2022-03-03 12:31:35 +01:00
Matej Bačo 24457d0c79 Manual QA fixes 2022-03-01 11:09:34 +00:00
Damodar Lohani 9ef42eb84f fix project logo upload 2022-02-28 08:47:30 +00:00
Torsten Dittmann c99c1ccfe6 fix: prevent side reload 2022-02-21 20:00:19 +01: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 24c803e7d9 Merge branch 'feat-storage-buckets' into feat-s3-integration 2022-01-16 18:09:09 +05:45
Damodar Lohani 4a37d402df Merge branch 'master' into feat-storage-buckets 2022-01-16 17:18:43 +05:45
Eldad Fux bd05401c37 Fixed version check with https://appwrite.io 2022-01-13 17:58:47 +02:00
Eldad Fux 95313ec122 Check version from appwrite.io 2022-01-13 13:10:05 +02: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
Damodar Lohani ddcd6558fe Merge branch 'feat-storage-buckets' into feat-sb-uis 2021-12-03 11:13:42 +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
Torsten Dittmann b55c5a2660 fix(ui): elements issue 2021-12-01 12:56:40 +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
Torsten Dittmann f68ab29184 fix(ui): error messages from exception 2021-11-23 11:07:07 +01:00
Damodar Lohani 283c55ccc3 fix chartjs tooltip config 2021-11-19 11:32:02 +05:45