Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Including preset curl options by default #1197

Merged
merged 1 commit into from Dec 1, 2018
Merged

Including preset curl options by default #1197

merged 1 commit into from Dec 1, 2018

Conversation

joncrain
Copy link
Contributor

@joncrain joncrain commented Dec 1, 2018

Putting this one against wip. Sorry about that!

@bochoven bochoven merged commit e1e3399 into munkireport:wip Dec 1, 2018
bochoven added a commit that referenced this pull request Dec 18, 2018
* Release version 3.3.1.

* Bumping to v3.3.2 for development.

* Remove detectx remnants

Fixes #1193

* Update network authentication

* Add app.php

* Fixing the Listing title (#1194)

* Removing unnecessary data (#1195)

* Fixing the Listing title (#1194)

* Removing unnecessary data

* Including preset curl options by default (#1197)

* Move part of index.php to boostrap/app.php

* More config changes no more config.php

* Move config functions to config_helper

* Clean up DEFINES

* Update unit.php

* Fix fatal

* Fix SQlite db conf

* Update ConfigTest.php

* Update app.php

Add disk_report as default module

* Update ConfigTest.php

Remove module specific test

* Move around auth config

* Move config to app, fix local config add users.yml

* Allow for custom dashboards

* Update Dashboard.php

remove debug code

* Config changes (#1201)

* More config changes no more config.php

* Move config functions to config_helper

* Clean up DEFINES

* Update unit.php

* Fix fatal

* Fix SQlite db conf

* Update ConfigTest.php

* Update app.php

Add disk_report as default module

* Update ConfigTest.php

Remove module specific test

* Move around auth config

* Move config to app, fix local config add users.yml

* Allow for custom dashboards

* Update Dashboard.php

remove debug code

* Bump minor version to 4

* Update .env.example

Remove module settings

* Change default dashboard behaviour

* Add encryption key to app.php

* Remove warranty_helper from core

* Add auth unavailable page

* Add create local user

* Fix migrate.php (#1203)

Use new config system

* Create migrate_local_users

* Update READMEs for users and dashboards

* Change behaviour of help_url

* Allow multiple directories for local users

* Multiple dashboard support + hotkeys

* Update Dashboard

Fix default

* Update dashboards

* Add define(KISS) to migrate_local_users

* Cleanup roles

* Config to env (#1205)

* Initial config_to_env script

* Update config_to_env

* Use YAML for conversions

* Update config_to_env.yml

* Change SAML mappings

* Update .env.example

* Update config conversion script

* Update Dashboard.php

Fix filesystem calls

* Added local users config info to .env.example and README.md (#1204)

* Added and changed german localization

* fixed typo. Thanks to Arjen for noticing!

* Added more fields that I missed, sorry!

* Added more fields that I missed, sorry!

* Hopefully fixed my git issues... Don´t do lunch and git afterwards :-)

* More fields added

* Added to german translations

* Added german translation files for Fonts/Fan_temps/firmware_escrow

* Added german translation to the Applications Module

* Added to german translation for Caching module

* Changed german translation for the Certificates module

* Added german translation for DetectX module

* Changed/Added german translations for the displays module

* Added german translation to Extensions module

* Added german tranaltion for Firmware-Module

* Added german translation for GPU module

* Added german translation to Homebrew module

* Add german translation to Homebrew-Info Module

* Added "LOCAL" Authentication example to .env.example

* Added .env config info to README.md

* Update config_to_env.yml

Add more conversions

* Cleanup config helper

* Add convert dashboard and fix mode

* Add executable bit to migrate users

* Delete migrate_local_users

* Add user creation script to conver script

* Add some info to CHANGELOG

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Fix AuthSaml

* Fix AuthSAML

* Fix db connection options

* Add support for connection options

* Update auth.php

* Use hosts for adldap2

* Up adldap2 for docker

* Add onelogin/php-saml and adladap2 to the dependencies

* Update db.php

Fix sqlite connection

* Add certs directory

* Add cert file support to SAML

* Add gsx vars to conversion yml

* Add more conversion items

* Move config directories to local directory

* Change configs to use /local directory

* Add more conversion items

* Add local/module_configs

* Add convertnetworks to config_to_env

* Add conversion for ip_ranges

* Allow for widgets to receive data

* Allow for override widget name

* Add support for LOCAL_DIRECTORY_PATH

* Update CHANGELOG

* Upate web.config

Allow for rewrites

* Update ad.php

Add more connection options

* Update AuthAD.php

Change domain controllers to hosts

* Fix AuthAD

* Bump version to 4.0.0

* Update CHANGELOG

* Release version 4.0.0.

* Bumping to v4.0.1 for development.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants