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

Merge master #354

Merged
merged 27 commits into from
Feb 17, 2017
Merged

Merge master #354

merged 27 commits into from
Feb 17, 2017

Conversation

mathstuf
Copy link
Member


I don't have WebKit2 dev packages on my laptop; abusing Travis for testing.

GSI2017 and others added 27 commits January 21, 2017 19:59
I'd like to suggest these colors for the default config. Especially the
**Ins** mode is otherwise easily overlooked.
makes the status bar slightly lighter on the eye in Ins mode
This avoid regexp madness and also allows to treat uzbl @< expands as
quoted strings that go untouched by the EM
Build a wheel from the uzbl python package during `make` with version
information pulled from `misc/hash.sh`. This is later installed using
pip which avoids touching the dist directory as root.
defined contrast-rich colors for the status bar
* added/improved basic VIM-style key bindings

* updated key-bindings according to team preferences (refs uzbl#200)

* made DuckDuckGo binding use HTTPS (refs uzbl#200)
Expand what is considered simple strings that don't need to be quoted in
the event manager.
Build event-manager python wheel
uzbl-browser: don't clobber files which already exist
* master: (22 commits)
  uzbl-browser: don't clobber files which already exist
  Fix zoom bindings
  Resolve overlapping keybindings
  added/improved basic VIM-style key bindings (uzbl#200)
  Build event-manager python wheel
  Fix command prompt binding
  Give special treatment to @-expands with escaping
  Fix select all binding
  Implement argument splitting as lex/parse in EM
  Don't quote simple strings that don't need it
  Extract duplicated code to new function
  Bypass ronudtrip to uzbl when sending event from key binding
  Lint fixes in bind plugin
  Bypass roundtrip when sending event from on_event handler
  Keep on_event commands as tuple of strings
  Lint fixes in on_event plugin
  Add tox configuration for running EM tests
  added basic README.md explaining GTK styling marked UI text (refs uzbl#338)
  set solarized base2 background color for Ins mode (refs uzbl#338)
  reenabled cursor_style and hint_style (refs uzbl#338)
  ...
@mathstuf mathstuf self-assigned this Feb 16, 2017
@mathstuf mathstuf requested a review from keis February 16, 2017 20:58
@mathstuf mathstuf added the next label Feb 16, 2017
@mathstuf mathstuf merged commit f994763 into uzbl:next Feb 17, 2017
@mathstuf mathstuf deleted the merge-master branch February 17, 2017 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants