Commit Graph

5193 Commits

Author SHA1 Message Date
Dylan Araps 63ae8994e2 Merge branch 'master' of github.com:dylanaraps/neofetch 2018-05-17 13:07:34 +10:00
Dylan Araps 225d9cea1a docs: update 2018-05-17 13:06:53 +10:00
Dylan Araps a31e656f82
Merge pull request #984 from MindTooth/final_kitty_fix
RFC: kitty: This got to be the last fix...
2018-05-17 02:47:33 +00:00
Dylan Araps 156136121a Merge branch 'master' of github.com:dylanaraps/neofetch 2018-05-17 12:36:55 +10:00
Dylan Araps 85d3150d13 docs: update 2018-05-17 12:36:19 +10:00
Dylan Araps 57cd8e3cc5 docs: update 2018-05-17 12:36:03 +10:00
Dylan Araps 5f8d6e06cc
Merge pull request #989 from mstraube/song-vlc
song: add support for vlc
2018-05-14 05:15:48 +00:00
Michael Straube a62c3d2029 song: add support for vlc 2018-05-14 07:08:59 +02:00
Dylan Araps 01ec03720b
Merge pull request #982 from mstraube/deepin-music
song: fix deepin-music
2018-05-13 21:54:21 +00:00
Dylan Araps b74c7a63d3
Merge pull request #983 from mstraube/song-dbus
song: simplify get_song_dbus
2018-05-13 21:53:05 +00:00
Dylan Araps 293633d5ab
Merge pull request #987 from mstraube/audacious
song: audacious: remove audtool, closes #986
2018-05-13 21:51:51 +00:00
Dylan Araps a8446133f0
Merge pull request #988 from mstraube/year
general: update copyright year
2018-05-13 21:51:30 +00:00
Michael Straube 33fbed0b14 general: update copyright year 2018-05-13 11:06:22 +02:00
Michael Straube bd0e62d5f3 song: audacious: remove audtool, closes #986 2018-05-12 13:54:42 +02:00
Andrew Titmuss 71104d7e25
Merge pull request #985 from mstraube/song-example
song: update song_shorthand example
2018-05-12 19:35:14 +10:00
Michael Straube 8513b62259 song: update song_shorthand example 2018-05-12 10:56:03 +02:00
Birger J. Nordølum 7e4ec9f09d
kitty: This got to be the last fix... 2018-05-11 22:41:30 +02:00
Michael Straube 670161e13a song: simplify get_song_dbus 2018-05-11 19:22:34 +02:00
Michael Straube 358006dd92 song: fix deepin-music 2018-05-11 18:37:37 +02:00
Dylan Araps f1aa74f144
Merge pull request #981 from MindTooth/style_fix
kitty: style tweaks on regex
2018-05-10 20:56:24 +00:00
Birger J. Nordølum f93da07f36
kitty: style tweaks on regex 2018-05-10 14:32:48 +02:00
Dylan Araps 965940f57e
Merge pull request #980 from mstraube/sayonara
song: add support for sayonara
2018-05-10 07:21:26 +00:00
Michael Straube 1480b833b0 song: add support for sayonara 2018-05-10 09:14:39 +02:00
Dylan Araps 94bf52ecd4 misc: Fix travis 2018-05-10 09:58:46 +10:00
Dylan Araps 8dc25c3ae5
Merge pull request #977 from MindTooth/fix_kitty_regression
kitty: fix regression in regex
2018-05-09 23:56:28 +00:00
Dylan Araps ece335dd94 Merge branch 'master' of github.com:dylanaraps/neofetch 2018-05-10 09:56:19 +10:00
Dylan Araps f882c48685 docs: update 2018-05-10 09:56:01 +10:00
Dylan Araps 158173b3c7
Merge pull request #979 from dylanaraps/song_format
song: Added song_format.
2018-05-09 23:48:15 +00:00
Dylan Araps 7d259e8ef9 song: Added song_format. 2018-05-10 08:52:06 +10:00
Dylan Araps b5a2323144 song: Added song_format. 2018-05-10 08:49:05 +10:00
Dylan Araps e8ac76dc57
Merge pull request #837 from dylanaraps/song-album
Add Album to the Song function
2018-05-09 22:35:33 +00:00
Dylan Araps e54f324595
Merge pull request #978 from mstraube/song-album
song: fix audacious album
2018-05-09 22:00:39 +00:00
Michael Straube ccced8d997 song: fix audacious album
fallback to get_song_dbus() when song_shorthand is on
audtool won't work due to the '-' separator in it's output
2018-05-09 16:07:04 +02:00
Birger J. Nordølum a7c6745507
kitty: fix regression in regex 2018-05-09 14:15:24 +02:00
Dylan Araps b6f0460b35 song: Better splitting. 2018-05-09 21:23:10 +10:00
Andrew Titmuss acd4c84614
fix merge conflict in song_album 2018-05-09 20:48:40 +10:00
Andrew Titmuss 94a2bf6ec0
Merge pull request #976 from dylanaraps/song_album3
Fix issues with album addition to get_song
2018-05-09 20:20:57 +10:00
Dylan Araps cfcd6fff17 song: Fix separator when printed. 2018-05-09 18:28:17 +10:00
Dylan Araps 3ece779d47 song: Fix issues with splitting. 2018-05-09 18:26:31 +10:00
Dylan Araps a5f5be869c
Merge pull request #973 from MindTooth/tweak_kitty_regex
tweak kitty font regex
2018-05-08 23:35:18 +00:00
Andrew Titmuss d8436768a0
Merge pull request #885 from mstraube/song-album
song: add album for some players
2018-05-08 20:37:33 +10:00
Dylan Araps 859dc69b20 wm: Detect 2bwm manually 2018-05-07 12:26:42 +10:00
Birger J. Nordølum f765caa038
Tweak kitty font regex 2018-05-06 14:28:38 +02:00
Dylan Araps 8fe3130cbe gtk: Fix config file read order. Closes #972 2018-05-06 16:16:27 +10:00
Dylan Araps a9c4db2b54 docs: update 2018-05-05 09:01:24 +10:00
Dylan Araps 862a4c96db docs: update 2018-05-05 08:59:09 +10:00
Dylan Araps 5dbc0a2748 docs: update 2018-05-05 08:58:40 +10:00
Dylan Araps 6d003b2f2a docs: update 2018-05-05 08:57:17 +10:00
Dylan Araps 01721da481 docs: update 2018-05-05 08:54:11 +10:00
Dylan Araps 27df891ab9 docs: update 2018-05-05 08:51:29 +10:00