mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 14:18:27 +01:00
cb000a1f72
commit 9c2061ca147cb5227130d4edb53d10342fc9e9ad
Merge: 6f4d2b0b2 f3640e874
Author: Lucas Bartholemy <lucas@bartholemy.com>
Date: Mon Feb 14 18:18:30 2022 +0100
Merge branch 'fix/5553-multiple-users-with-emailRequired-disabled' of https://github.com/KeudellCoding/humhub into KeudellCoding-fix/5553-multiple-users-with-emailRequired-disabled
commit f3640e874ec4f43c819fafd12d5a610828437f99
Author: KarlKeu00 <47644344+KarlKeu00@users.noreply.github.com>
Date: Mon Feb 14 17:17:57 2022 +0100
Undo some unnecessary changes
commit 34839b8dab975f7ef2887d1354bcce40381e94bd
Merge: 84033c092 3a02b7a44
Author: KarlKeu00 <47644344+KarlKeu00@users.noreply.github.com>
Date: Mon Feb 14 17:08:49 2022 +0100
Merge branch 'fix/5553-multiple-users-with-emailRequired-disabled' of https://github.com/KeudellCoding/humhub into fix/5553-multiple-users-with-emailRequired-disabled
commit 84033c092f5b805c1e1c06c671f848f56118f7c9
Author: KarlKeu00 <47644344+KarlKeu00@users.noreply.github.com>
Date: Mon Feb 14 17:08:18 2022 +0100
No need for random emails, fix regarding HForm
commit 3a02b7a44c88528f32b325fc816c9f02ed6ef3e2
Merge: 9d235b0ee 12ea7da5b
Author: KarlKeu00 <47644344+KarlKeu00@users.noreply.github.com>
Date: Mon Feb 14 12:05:59 2022 +0100
Merge branch 'develop' into fix/5553-multiple-users-with-emailRequired-disabled
commit 9d235b0eec694f30ad8e7e35ac2afa1025196a04
Author: KarlKeu00 <47644344+KarlKeu00@users.noreply.github.com>
Date: Sun Feb 13 14:52:31 2022 +0100
Improved support of the emailRequired property
44 lines
627 B
Plaintext
44 lines
627 B
Plaintext
assets/*
|
|
!assets/.gitignore
|
|
|
|
protected/runtime/*
|
|
!protected/runtime/.gitignore
|
|
|
|
node_modules
|
|
|
|
protected/config/local/*
|
|
!protected/config/local/.gitignore
|
|
|
|
uploads/files/*
|
|
!uploads/files/.gitignore
|
|
!uploads/files/.htaccess
|
|
|
|
uploads/profile_image/*
|
|
!uploads/profile_image/banner
|
|
!uploads/profile_image/.gitignore
|
|
|
|
uploads/profile_image/banner/*
|
|
!uploads/profile_image/banner/.gitignore
|
|
|
|
.htaccess
|
|
nbproject
|
|
.idea/*
|
|
.gitmodules
|
|
.vscode
|
|
|
|
themes/*
|
|
!themes/HumHub
|
|
|
|
favicon.ico
|
|
/.settings
|
|
/.buildpath
|
|
/.project
|
|
/protected/vendor/
|
|
|
|
**/tests/codeception/_support/_generated/**
|
|
|
|
**/tests/codeception/_output/**
|
|
/.php_cs.cache
|
|
|
|
.DS_Store
|