Florian Bruhin
66e0812ab6
Merge branch 'neeasade-master'
2015-10-19 05:18:43 +02:00
Florian Bruhin
de4ee92b56
Update docs.
2015-10-19 05:18:30 +02:00
Florian Bruhin
9f11990efc
Rename scrollbar.padding/scrollbar.width.
2015-10-19 05:15:52 +02:00
Florian Bruhin
4f10e553a8
Merge branch 'master' of https://github.com/neeasade/qutebrowser into neeasade-master
2015-10-18 23:08:05 +02:00
Florian Bruhin
a88962fa98
tox: Update pytest-travis-fold to 1.0.1.
2015-10-18 22:26:25 +02:00
Nathan Isom
d326cc050e
correct style string, file modeline.
2015-10-18 14:11:22 -05:00
Nathan Isom
ec3cafc293
resolve merge conflicts and merge branch scrollbar.
2015-10-18 11:42:56 -05:00
Florian Bruhin
9c68a928ea
Merge branch 'neeasade-templatemagic'
2015-10-18 18:22:16 +02:00
Florian Bruhin
86ee53a7e6
Regenerate authors.
2015-10-18 18:22:09 +02:00
Florian Bruhin
82dfec6a18
Merge branch 'templatemagic' of https://github.com/neeasade/qutebrowser into neeasade-templatemagic
2015-10-18 18:20:41 +02:00
Nathan Isom
e92a7495c4
keep bg/fg test.
2015-10-18 10:41:15 -05:00
Nathan Isom
9b5c0075b9
Move min-height to correctly fix bug, edit colors to match https://github.com/The-Compiler/qutebrowser/pull/1021 .
2015-10-17 19:31:47 -05:00
Nathan Isom
f1b9a3408f
Remove fontdict test, edit register stylesheet test to match new font result.
2015-10-17 19:23:48 -05:00
Florian Bruhin
d862821552
Merge branch 'meles5-jinja'
2015-10-17 19:05:26 +02:00
Florian Bruhin
c29562d769
Regenerate authors.
2015-10-17 19:05:15 +02:00
Florian Bruhin
b22fbe3993
Update changelog.
2015-10-17 19:05:03 +02:00
Florian Bruhin
c8346a11fc
Merge branch 'jinja' of https://github.com/meles5/qutebrowser into meles5-jinja
2015-10-17 19:04:36 +02:00
meles5
78c57ad416
Fixed AppVeyor test
2015-10-17 18:43:14 +02:00
meles5
2398762e85
Fix tests
2015-10-17 18:29:13 +02:00
meles5
ff4c002096
A few changes
2015-10-17 17:33:05 +02:00
Nathan Isom
6391da4f6f
Forgot font changes.
2015-10-16 12:02:57 -05:00
Nathan Isom
b18549bbed
Remove fontdict wrapper
2015-10-16 11:42:46 -05:00
Florian Bruhin
0400945ac4
Raise exception when a stylesheet is unparsable.
2015-10-16 18:26:34 +02:00
Nathan Isom
869e2d9127
missed one.
2015-10-16 11:18:25 -05:00
Nathan Isom
9b8b2130ef
remove deprecated test.
2015-10-16 10:59:02 -05:00
Nathan Isom
09b18fbc68
edit colordict to match.
2015-10-16 10:55:17 -05:00
Nathan Isom
2a11adc8ac
initial replace pass.
2015-10-16 10:52:02 -05:00
Nathan Isom
27db1ad891
fix scrollbar not showing up error, change test_get_stylesheet a bit.
2015-10-16 09:56:31 -05:00
Florian Bruhin
743c3b1e26
Fix broken UrlType member.
2015-10-16 06:53:07 +02:00
Florian Bruhin
24dc166e1f
tests: Use extend=True for qt_log_ignore marks.
...
This should finally resolve the warning flakiness on OS X.
2015-10-16 06:24:29 +02:00
Florian Bruhin
71e6c38065
tox: Update to pytest-qt 1.8.0.
...
- pytest.mark.qt_log_ignore now supports an extend parameter that will extend
the list of regexes used to ignore Qt messages (defaults to False).
- Fixed internal error when interacting with other plugins that raise an error,
hiding the original exception.
2015-10-16 06:20:07 +02:00
Florian Bruhin
4bb1a37cf1
Rename travis fold name.
2015-10-15 22:22:28 +02:00
Florian Bruhin
309be9b057
Use travis_fold on ci_install.py.
2015-10-15 21:46:24 +02:00
Florian Bruhin
619f47ee1d
tox: Add pytest-travis-fold
2015-10-15 21:40:17 +02:00
Nathan Isom
57d8ebfb83
not hardcode width/padding values.
2015-10-15 14:06:16 -05:00
Nathan Isom
19c27a04e5
Add completion scrollbar settings.
2015-10-15 13:18:32 -05:00
Nathan Isom
0e186487f5
Revert "Don't pass config to stylesheets."
...
This reverts commit dc0e8b4626
2015-10-15 12:36:24 -05:00
Florian Bruhin
ebd576d98f
Merge branch 'neeasade-url-color'
2015-10-15 18:35:56 +02:00
Florian Bruhin
5c85dd22b4
Update docs and changelog.
2015-10-15 18:34:56 +02:00
Florian Bruhin
91ce3ed672
Merge branch 'url-color' of https://github.com/neeasade/qutebrowser into neeasade-url-color
2015-10-15 18:32:47 +02:00
meles5
326757917c
Fixed windows support (Windows test couldn't work)
2015-10-15 17:39:31 +02:00
Florian Bruhin
5f8ea6dc16
Use the official way to get Trusty on Travis.
...
See http://blog.travis-ci.com/2015-10-14-opening-up-ubuntu-trusty-beta/
2015-10-15 08:22:21 +02:00
Nathan Isom
6843e9c413
typo in configdata.py.
2015-10-14 13:37:24 -05:00
Nathan Isom
4876bdf7ce
style.
2015-10-14 13:34:41 -05:00
Nathan Isom
e78b00cce2
Fix configdata.py typos, use scheme from url.
2015-10-14 13:22:28 -05:00
Nathan Isom
d7d4c232d0
Initial shot at issue #691
2015-10-14 13:10:24 -05:00
Florian Bruhin
26596316c6
Pin some more dependencies in tox.ini.
...
This hard-pins everything except for the main [testenv].
2015-10-14 18:28:39 +02:00
Florian Bruhin
ab099ea6ea
Fix another spelling mistake.
2015-10-14 07:02:50 +02:00
Florian Bruhin
36b7db0672
Regenerate authors.
2015-10-14 07:02:14 +02:00
Florian Bruhin
62fa2811e3
Merge branch 'master' of https://github.com/shaggytwodope/qutebrowser
2015-10-14 07:02:04 +02:00
