aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorLines
2017-08-03Merge pull request #1300 from emersion/patch-1Drew DeVault-1/+1
2017-08-03Fix typo in debug logemersion-1/+1
2017-07-31Merge pull request #1294 from 4e554c4c/swaylock_sizeDrew DeVault-10/+28
2017-07-31Allow swaylock indicator size to be configurableCalvin Lee-10/+28
2017-07-26Remove test clipboard codeDrew DeVault-8/+0
2017-07-24Merge pull request #1288 from johalun/master-securityconf-freebsdDrew DeVault-0/+7
2017-07-24security: enabled ipc on freebsdJohannes Lundberg-0/+7
2017-07-20Merge pull request #1285 from tobiasblass/fix_non_dbus_buildDrew DeVault-2/+2
2017-07-20[swaybar] fix non-dbus buildTobias Blass-2/+2
2017-07-16Merge pull request #1283 from 4e554c4c/memory_leakDrew DeVault-1/+9
2017-07-16Fix memory leaks in swaybar trayCalvin Lee-1/+9
2017-07-14Merge pull request #1279 from 4e554c4c/bad_itemsDrew DeVault-2/+12
2017-07-13Fix name validation in sni_watcher.cCalvin Lee-2/+12
2017-07-13Merge pull request #1276 from 4e554c4c/bad_itemsDrew DeVault-5/+16
2017-07-13Don't trust SNI names, fixes #1274Calvin Lee-5/+16
2017-07-12Merge pull request #1272 from ascent12/pointer-fixDrew DeVault-44/+42
2017-07-12Use WLC v2 pointer interfaceScott Anderson-44/+42
2017-07-11Merge pull request #1271 from johalun/master-securityconf-freebsdDrew DeVault-0/+16
2017-07-11Add secucity config for FreeBSD.Johannes Lundberg-0/+16
2017-07-10Merge pull request #1270 from tobiasblass/bindsym_use_after_freeDrew DeVault-2/+3
2017-07-10fix use-after-free bugTobias Blass-2/+3
2017-07-08Merge pull request #1265 from johalun/master-freebsdDrew DeVault-5/+5
2017-07-08Adjust _XOPEN_SOURCE value for build on FreeBSD and fix pointer comparison er...Johannes Lundberg-5/+5
2017-07-04Make asciidoc (and man pages) optionalDrew DeVault-37/+53
2017-07-03Merge pull request #1256 from lheckemann/doc-pngDrew DeVault-0/+8
2017-07-03swaybg: check that background can be loadedLinus Heckemann-0/+8
2017-07-03Merge pull request #1259 from Hummer12007/patch-4Drew DeVault-0/+1
2017-07-03Disable -Wunused-result diagnosticHummer12007-0/+1
2017-07-03Merge pull request #1258 from refacto/fix_zsh_completionDrew DeVault-1/+1
2017-07-03Fix zsh completion for _swaylockazarus-1/+1
2017-07-01Merge pull request #1255 from Hummer12007/policyDrew DeVault-9/+9
2017-07-01Do not add empty policiesMykyta Holubakha-6/+6
2017-07-01permit.c: check for NULL pointer dereferenceMykyta Holubakha-3/+3
2017-07-01Merge pull request #1254 from nyorain/masterDrew DeVault-0/+40
2017-07-01Add the 'clipboard' command to set the clipboardnyorain-0/+40
2017-06-29Revert "swaybar: Group child processes for signalling"Drew DeVault-2/+1
2017-06-26Fix #1252Drew DeVault-0/+6
2017-06-23Merge pull request #1251 from Hummer12007/iconsDrew DeVault-9/+5
2017-06-23Handle getline failure in icon theme parsingMykyta Holubakha-9/+5
2017-06-19Merge pull request #1244 from her001/swaylock-man-correctionsDrew DeVault-5/+6
2017-06-18Correct swaylock man page description of -i and -cAndrew Conrad-5/+6
2017-06-17Merge pull request #1241 from Blajda/ffmpeg-optsDrew DeVault-4/+20
2017-06-17FFmpeg options for swaygrabDavid Blajda-4/+20
2017-06-15Merge pull request #1238 from her001/backgrounds_dirDrew DeVault-3/+3
2017-06-14Install wallpapers in DATADIR/backgrounds/swayAndrew Conrad-3/+3
2017-06-14Merge pull request #1199 from SirCmpwn/server-decoration0.14-rc1Drew DeVault-6/+198
2017-06-14Merge branch 'master' into server-decorationDrew DeVault-138/+2929
2017-06-14Merge pull request #1234 from 4e554c4c/trayDrew DeVault-61/+2747
2017-06-14Merge branch 'master' into trayDrew DeVault-1/+3
2017-06-14Force focus on unmanaged views during pointer testDrew DeVault-3/+14