Commit graph

4318 commits

Author SHA1 Message Date
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
Dylan Araps
e4d3ad1f42 general: Add back Makefile. 2018-05-04 19:52:08 +10:00
Dylan Araps
a46e43a816 docs: Keep full changelog in repo. 2018-05-04 18:23:33 +10:00
Dylan Araps
22a43204fc docs: update 2018-05-04 17:51:53 +10:00
Dylan Araps
5bad6ea5d9 docs: update 2018-05-04 17:40:33 +10:00
Dylan Araps
c57da4cf72 docs: update 2018-05-04 17:29:52 +10:00
Dylan Araps
ac5bc01f6a docs: update 2018-05-04 17:29:06 +10:00
Dylan Araps
1a3c8638e1 docs: update 2018-05-04 17:05:13 +10:00
Dylan Araps
ffd711a4ea docs: update 2018-05-04 17:02:31 +10:00
Dylan Araps
736b45a9ed docs: Initial CONTRIBUTING.md 2018-05-04 16:59:21 +10:00
Dylan Araps
4f4f237395 version: bump 2018-05-04 16:36:01 +10:00
Dylan Araps
1d65ec4e96
Merge pull request #965 from dylanaraps/one
Distribute neofetch as a single executable.
2018-05-04 06:31:57 +00:00
Dylan Araps
881094f1d6 misc: whitespace 2018-05-04 16:25:05 +10:00
Dylan Araps
7d57ba0247 docs: CHANGELOG.md 2018-05-04 16:22:05 +10:00
Dylan Araps
881ae1f226 docs: CHANGELOG.md 2018-05-04 16:19:14 +10:00
Dylan Araps
48402232e9 misc: whitespace. 2018-05-04 15:58:48 +10:00
Dylan Araps
a4b39b5b69 travis: Add back line length enforcement. 2018-05-04 12:01:55 +10:00
Dylan Araps
2384e6f7b9 docs: update 2018-05-04 11:46:55 +10:00
Dylan Araps
d49e6ca7d7 travis: Fix command. 2018-05-04 09:35:28 +10:00
Dylan Araps
5a8b2405f5 misc: whitespace 2018-05-04 09:18:52 +10:00
Dylan Araps
b3af154dc5 general: Move ascii art back to the bottom. 2018-05-04 09:11:22 +10:00
Dylan Araps
308a4bab01 Merge branch 'one' of github.com:dylanaraps/neofetch into one 2018-05-04 08:58:23 +10:00
Dylan Araps
2fd328aeca general: Move ascii art back to fix merge conflicts. 2018-05-04 08:57:35 +10:00
Dylan Araps
f31f2a40f0 general: Added missing ascii 2018-05-04 08:57:34 +10:00