281 Commits (3a74fc4aba79be9e888f0b2de2c1d88ecacaa559)
 

Author SHA1 Message Date
Chris Guillott 3a74fc4aba Merge branch 'master' of https://github.com/i3/i3lock 8 years ago
Bownairo 9c8ae8b5d1 Change input slices to be exactly pi/3 in size instead of slightly more (#107) 8 years ago
Chris Guillott 148e2e48f8 Merge pull request #15 from timrydefalk/update_readme 8 years ago
Tim Rydefalk eee0e536ed Add missing dependency to apt-get command 8 years ago
Chris Guillott f174907a07 Merge branch 'master' of https://github.com/i3/i3lock 8 years ago
Nicolò Balzarotti 7504e16527 Add Enter on C-m (#103) 8 years ago
Chris Guillott ac1bfe00a3 Update README.md 8 years ago
Chris Guillott db3e169243 Merge pull request #12 from evilbulgarian/master 8 years ago
evilbulgarian 404bd743ae Update Makefile 8 years ago
evilbulgarian 2a1546aa74 fix destdir prefix for mandir.. 8 years ago
Chris Guillott ef003b76c2 update changelog to include clock version # 8 years ago
Chris Guillott 18a9572482 Add clock functionality and swap default time/date format strings 8 years ago
Chris Guillott 5e1de46792 also narrow the new keystroke width 8 years ago
Chris Guillott 5a5741bc22 add example lock script 8 years ago
Chris Guillott e4301604e5 add custom time formatter strings 8 years ago
Chris Guillott 158623508a add basic clock feature 8 years ago
Chris Guillott ee0f50de06 add debug make target 8 years ago
Chris Guillott 970bdb5810 upstream merge 8 years ago
eplanet d2130092cf Display error message when locking failed (#99) 8 years ago
Chris Guillott 87ba982a18 also fix my gitignore lol 8 years ago
Chris Guillott 16006c60b8 merge upstream 8 years ago
eplanet 1c97a84847 Displaying locking message when grabbing the pointer/keyboard. (#88) 8 years ago
Chris Guillott c8e1aece73 Merge pull request #8 from i3/master 8 years ago
Diogo Ferreira fd2215b0f0 i3lock: Stop leaking the image_path dup. (#93) 8 years ago
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 9 years ago
Florian Zipperle cca7d4e6c3 Removed obsolete inactivity timeout (#84) 9 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