357 Commits (84eb1c3cce9ba7494d6a62efd8409494ad08b182)
 

Author SHA1 Message Date
Chris Guillott cbd454e493 Merge branch 'master' of https://github.com/i3/i3lock 8 years ago
koebi 17b7b77893 unlock automatically after authentication failure (#90) 8 years ago
Chris Guillott 1ebdc36c5b upstream again 8 years ago
Vasilij Schneidermann 893aff1bd0 Set font face (#89) 8 years ago
Chris Guillott 6e63604fff merge upstream 8 years ago
eplanet 0d111aaede Added version files for release tarball. Fixes #40 (#86) 8 years ago
Chris Guillott 38a70376f2 resolve merge conflict with upstream 8 years ago
Florian Zipperle cca7d4e6c3 Removed obsolete inactivity timeout (#84) 8 years ago
Chris Guillott 70d2648639 Merge remote-tracking branch 'upstream/master' 9 years ago
Michael Stapelberg 679fb57acc i3lock.1: use signal names without SIG prefix (Thanks rodfersou) 9 years ago
Chris Guillott 36146964d8 Merge pull request #6 from boatrite/zb-update-readme 9 years ago
Zach Boatrite 81689fea57 Add specific apt-get command to install dependencies in Ubuntu 9 years ago
Chris Guillott 2e8c3fd291 Merge upstream commits 9 years ago
Michael Stapelberg 619c791a20 update CHANGELOG 9 years ago
Michael Stapelberg ce1c5cecc0 clang-format-3.5 9 years ago
Michael Stapelberg a5c6b2653e add CONTRIBUTING.md 9 years ago
Chris Guillott de6bea2603 Merge pull request #4 from i3/master 9 years ago
Christoph Ruegge 463d38fed6 Add support for `xss-lock --transfer-sleep-lock' (#75) 9 years ago
martin 402254b575 Flush xcb connection after opening fullscreen window (#74) 9 years ago
Chris Guillott 63a4c23ec6 Merge pull request #3 from i3/master 9 years ago
Karl Tarbe 9a7604bb35 Allow CTRL+J as enter and CTRL+H as backspace (#72) 9 years ago
Chris Guillott c27e4c092c Merge pull request #2 from joeythesaint/optional-xkbcompose 9 years ago
Joe MacDonald 3afa2b710f compose: make usage of xkbcompose optional 9 years ago
Chris Guillott b2c32475a0 Merge pull request #1 from meskarune/master 9 years ago
meskarune c0fbddcd09 changed package so it creates an i3lock binary instead of i3lock-color as they are direct replacements 9 years ago
Chris Guillott b332ce611b update help/makefile/man page 9 years ago
Chris Guillott ed326ee463 add option for single-display unlock indicator 9 years ago
Chris Guillott 177024ddc0 Update README.md 9 years ago
Chris Guillott 3aee980f30 Update README.md 9 years ago
Chris Guillott 7fb899bcd5 expose separator color for theming + bug fix 9 years ago
Chris Guillott fdaf1b22d8 update .gitignore to include i3lock-color instead of i3lock 9 years ago
Chris Guillott 5a2a6e4f61 Merge branch 'master' of github.com:Arcaena/i3lock-color 9 years ago
Chris Guillott cf522a301f add a couple options for drawing the line color 9 years ago
Chris Guillott 003c2d16a7 I accidentally a word, somehow. 9 years ago
Chris Guillott 986608a1fb update makefile so you can have i3lock-color installed alongside i3lock 9 years ago
Chris Guillott 0a05fc0778 have I mentioned I'm bad at markdown? 9 years ago
Chris Guillott bf8099d387 I'm _really_ bad at markdown 9 years ago
Chris Guillott 0a3fa50db5 I am bad at markdown. 9 years ago
Chris Guillott 6a72f6b6aa Add a disclaimer that I didn't write the original i3lock-color; I just patched his commits back in 9 years ago
Chris Guillott 1beed9bc16 make the readme prettier; add To-do 9 years ago
Chris Guillott 34c2d5e1a3 patch in i3lock-color commits 9 years ago
Michael Stapelberg 59705b05b5 Show unlock indicator if password was entered during PAM verification 9 years ago
Michael Stapelberg 0bdc0c644d Eat XKB_KEY_Delete and XKB_KEY_KP_Delete (Thanks bebehei) 9 years ago
Michael Stapelberg cc73d88aea Remove libxkbfile dependency from README.md/comments 9 years ago
Michael Stapelberg b181e3137b use trusty, install libxkbcommon-dev from wily 9 years ago
Michael Stapelberg d15cb5978e travis: install clang-format-3.5 from llvm repository 9 years ago
Michael Stapelberg 688d49d5b8 fix pam_securetty: set PAM_TTY to getenv("DISPLAY") 9 years ago
Michael Stapelberg 929e541fb7 Remove DPMS support in favor of a wrapper script and xset(1). 9 years ago
Michael Stapelberg c5bb1d55e0 Merge pull request #24 from ixjlyons/timeout-doc 10 years ago
Kenneth Lyons d91c20a9f2 Indicate that the --inactivity-timeout option takes an argument. 10 years ago