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.

Sign up for GitHub

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

Jump to bottom

New meta-options #26

Merged
merged 21 commits into from
Apr 20, 2016
Merged

New meta-options #26

merged 21 commits into from
Apr 20, 2016

Conversation

maxkoryukov
Copy link
Owner

No description provided.

maxkoryukov and others added 20 commits February 4, 2016 23:07
@maxkoryukov
Scrutinizer integration
400b30c
@maxkoryukov
pip for scrutinizer
4af7539
@maxkoryukov
scrutinizer badge in readme
c19006a
@maxkoryukov
Merge pull request #17 from maxkoryukov/feature/scrutinizer
ec530f7 
Feature/scrutinizer
@maxkoryukov
Merge pull request #18 from maxkoryukov/feature/hidden-opt-2
ec3afb1 
Feature/hidden opt 2
@maxkoryukov
Merge pull request #21 from maxkoryukov/feature/hidden-opt-pr
8cf8c54 
Feature/hidden-opt-pr
@maxkoryukov
Merge pull request #22 from maxkoryukov/feature/hidden-opt-pr
a9356a6 
DOC: upgraded docs in /locale
@maxkoryukov
Merge branch 'feature/hidden-opt-pr'
481deb9
@maxkoryukov
Merge branch 'feature/hidden-opt-pr'
8642ff5
@maxkoryukov
Merge branch 'master' of https://github.com/maxkoryukov/headphones
a7ffd47
@maxkoryukov
UPG: hidden-opt - now you could hide some items from dropdown lists
3bab482 
* upgraded (NOT TESTED) config/_meta, parse and compile tokens (DRAFT)
@maxkoryukov
Merge branch 'feature/hidden-opt-ext-meta'
603a111 
Conflicts:
	README.md
@maxkoryukov
UPG: extended HTTP settings of HP are moved to advanced tab
cf0068a 
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
@maxkoryukov
Merge branch 'feature/hidden-opt-ext-meta' and fix #25
f5f1865
@maxkoryukov
UPG: Font Awesome 4.6.1
d7b91da
@maxkoryukov
Merge branch 'feature/font-awesome-4.6.1'
080d8a8 
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
@maxkoryukov
FIX: an opprotunity to set HTTP-header, used by CherryPy to determine…
99f7613 
… origin url of proxy (when HP works behind proxy)

see #rembo10#2616
@maxkoryukov
pep8
bebaf62
@maxkoryukov
Merge branch 'feature/hidden-opt-ext-meta'
2035cd1
@maxkoryukov
FIX: fixed template (OptionSwitch douple caption) and fixed tests for…
43c5ac1 
… _meta in config
@maxkoryukov maxkoryukov self-assigned this Apr 20, 2016
@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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@maxkoryukov maxkoryukov

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maxkoryukov @coveralls