Skip to content
New issue

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

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

Already on GitHub? # to your account

New meta-options #26

Merged
merged 21 commits into from
Apr 20, 2016
Merged

Conversation

maxkoryukov
Copy link
Owner

No description provided.

maxkoryukov and others added 20 commits February 4, 2016 23:07
* upgraded (NOT TESTED) config/_meta, parse and compile tokens (DRAFT)
Two options: HTTP_PROXY and HTTP_BASE are converted from OptionInternal to appropriate types, and now they are visible, and accessible for configuring through WebUI
Conflicts:
	data/interfaces/default/css/font-awesome.min.css
	data/interfaces/default/fonts/FontAwesome.otf
	data/interfaces/default/fonts/fontawesome-webfont.eot
	data/interfaces/default/fonts/fontawesome-webfont.svg
	data/interfaces/default/fonts/fontawesome-webfont.ttf
	data/interfaces/default/fonts/fontawesome-webfont.woff
	data/interfaces/default/fonts/fontawesome-webfont.woff2
… origin url of proxy (when HP works behind proxy)

see #rembo10#2616
@coveralls
Copy link

Coverage Status

Coverage increased (+0.3%) to 16.891% when pulling 43c5ac1 on feature/hidden-opt-ext-meta into 8b94362 on feature/hidden-opt-pr.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.3%) to 16.891% when pulling 511a0ee on feature/hidden-opt-ext-meta into 8b94362 on feature/hidden-opt-pr.

@maxkoryukov maxkoryukov merged commit ee55c3c into feature/hidden-opt-pr Apr 20, 2016
@maxkoryukov maxkoryukov deleted the feature/hidden-opt-ext-meta branch April 20, 2016 02:33
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants