38a70376f2
resolve merge conflict with upstream
9 years ago
cca7d4e6c3
Removed obsolete inactivity timeout ( #84 )
* Removed obsolete inactivity timeout
9 years ago
70d2648639
Merge remote-tracking branch 'upstream/master'
9 years ago
679fb57acc
i3lock.1: use signal names without SIG prefix (Thanks rodfersou)
see #32
9 years ago
36146964d8
Merge pull request #6 from boatrite/zb-update-readme
Add specific apt-get command to install dependencies in Ubuntu
9 years ago
81689fea57
Add specific apt-get command to install dependencies in Ubuntu
9 years ago
2e8c3fd291
Merge upstream commits
ya
9 years ago
619c791a20
update CHANGELOG
9 years ago
ce1c5cecc0
clang-format-3.5
Not sure why travis didn’t warn about this on the PR. The only reference
to the PR I can find is https://travis-ci.org/i3/i3lock/builds/130470377
9 years ago
a5c6b2653e
add CONTRIBUTING.md
…so that people know we don’t want to extend i3lock’s image handling.
related to #81 , #68 , #31
9 years ago
de6bea2603
Merge pull request #4 from i3/master
Merge upstream commits
9 years ago
463d38fed6
Add support for `xss-lock --transfer-sleep-lock' ( #75 )
Add support for `xss-lock --transfer-sleep-lock'
9 years ago
402254b575
Flush xcb connection after opening fullscreen window ( #74 )
We need to ensure that the window handle is valid, i. e. the window is
actually created and accessible, before returning.
This is necessary because we immediately fork after returning, and the
child process opens its own X11 connection and expects the window handle
to be valid.
Fixes #46
9 years ago
63a4c23ec6
Merge pull request #3 from i3/master
Allow CTRL+J as enter and CTRL+H as backspace (#72 )
9 years ago
9a7604bb35
Allow CTRL+J as enter and CTRL+H as backspace ( #72 )
fixes #71
9 years ago
c27e4c092c
Merge pull request #2 from joeythesaint/optional-xkbcompose
compose: make usage of xkbcompose optional
9 years ago
3afa2b710f
compose: make usage of xkbcompose optional
Older versions of libxkbcommon-dev (in Debian / Ubuntu) don't provide
xkbcommon-compose.h and the accompanying API. Detect whether the header
file is present when building and if not, revert to the behaviour prior to
ef3ef30400
9 years ago
b2c32475a0
Merge pull request #1 from meskarune/master
changed package so it creates an i3lock binary instead of i3lock-colo…
9 years ago
c0fbddcd09
changed package so it creates an i3lock binary instead of i3lock-color as they are direct replacements
9 years ago
b332ce611b
update help/makefile/man page
9 years ago
ed326ee463
add option for single-display unlock indicator
9 years ago
177024ddc0
Update README.md
yeah I'm bad at readmes
9 years ago
3aee980f30
Update README.md
9 years ago
7fb899bcd5
expose separator color for theming + bug fix
I did a double take, apparently he messed up a copy/paste.
9 years ago
fdaf1b22d8
update .gitignore to include i3lock-color instead of i3lock
9 years ago
5a2a6e4f61
Merge branch 'master' of github.com:Arcaena/i3lock-color
9 years ago
cf522a301f
add a couple options for drawing the line color
9 years ago
003c2d16a7
I accidentally a word, somehow.
9 years ago
986608a1fb
update makefile so you can have i3lock-color installed alongside i3lock
9 years ago
0a05fc0778
have I mentioned I'm bad at markdown?
9 years ago
bf8099d387
I'm _really_ bad at markdown
I blame 8ams.
Many, many thanks to @eBrnd for his original work on i3lock-color.
9 years ago
0a3fa50db5
I am bad at markdown.
9 years ago
6a72f6b6aa
Add a disclaimer that I didn't write the original i3lock-color; I just patched his commits back in
9 years ago
1beed9bc16
make the readme prettier; add To-do
9 years ago
34c2d5e1a3
patch in i3lock-color commits
9 years ago
59705b05b5
Show unlock indicator if password was entered during PAM verification
fixes #51
9 years ago
0bdc0c644d
Eat XKB_KEY_Delete and XKB_KEY_KP_Delete (Thanks bebehei)
fixes #50
9 years ago
cc73d88aea
Remove libxkbfile dependency from README.md/comments
It has not been in use since commit 7eb43aeabd
9 years ago
b181e3137b
use trusty, install libxkbcommon-dev from wily
9 years ago
d15cb5978e
travis: install clang-format-3.5 from llvm repository
Ubuntu utopic disappeared from archive.ubuntu.com, it’s EOL.
9 years ago
688d49d5b8
fix pam_securetty: set PAM_TTY to getenv("DISPLAY")
fixes #43
9 years ago
929e541fb7
Remove DPMS support in favor of a wrapper script and xset(1).
fixes #32
10 years ago
c5bb1d55e0
Merge pull request #24 from ixjlyons/timeout-doc
Indicate that the --inactivity-timeout option takes an argument.
10 years ago
d91c20a9f2
Indicate that the --inactivity-timeout option takes an argument.
10 years ago
105a86dc57
update CHANGELOG
10 years ago
5b7ee05581
makefile: s/README/README.md/
10 years ago
a0ac8cd87d
Merge pull request #14 from ony/master
Make pkg-config configurable
10 years ago
a02789367c
Make pkg-config configurable
10 years ago
8a49effade
Merge pull request #13 from Airblader/feature-12
Only redraw the screen if the unlock indicator is actually used.
10 years ago
b4c97bddf7
Only redraw the screen if the unlock indicator is actually used.
fixes #12
10 years ago
Chris Guillott