Commit graph

1244 commits

Author SHA1 Message Date
Dylan
95c744f0f8 Merge Windows and Linux uptime blocks since they're the same 2016-03-26 22:46:07 +11:00
Dylan
58e833cd10 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-26 22:37:25 +11:00
Dylan
cee91eac31 Changelog 2016-03-26 22:33:22 +11:00
Dylan
3584ebcf76 Fix issues with Puppy Linux 2016-03-26 22:32:31 +11:00
Dylan Araps
9b5cf28793 Merge pull request #175 from dylanaraps/memory_legacy
Rewrite memory function to work on older linux kernel versions.
2016-03-26 22:31:25 +11:00
Dylan
8311d3f2e3 Cleanup distro detection 2016-03-26 22:13:03 +11:00
Dylan
7c62ff2d26 Fix incorrect colors in travis ascii art 2016-03-26 19:16:03 +11:00
Dylan
967e8eca8b More travis output improvements 2016-03-26 19:14:27 +11:00
Dylan
ed469eee06 Travis output improvementS 2016-03-26 19:12:33 +11:00
Dylan
2dcf3247ee Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-26 19:03:23 +11:00
Dylan
98ed313f79 Remove whitespace from travis logo 2016-03-26 18:55:21 +11:00
Dylan Araps
4a0e8cfc4e Merge pull request #183 from dawidd6/patch-1
added License badge to README
2016-03-26 18:53:45 +11:00
Dawid
ee7e9c746d added License badge to README 2016-03-26 08:30:48 +01:00
Dylan
edd3e2abaf Small change to travis ascii 2016-03-26 15:30:39 +11:00
Dylan
54652b36f9 Turns out that travis doesn't highlight over newlines 2016-03-26 15:27:54 +11:00
Dylan
fb0820c15c Changelog 2016-03-26 15:23:03 +11:00
Dylan
e10e666e27 Travis use custom ascii art 2016-03-26 15:22:48 +11:00
Dylan
424d6e6c0b Added Travis CI ascii art 2016-03-26 15:22:24 +11:00
Dylan
bdfeb7c3a3 Travis, fix a hang on OSX 2016-03-26 14:52:30 +11:00
Dylan
c3087251e7 Revert make prefix 2016-03-26 14:47:19 +11:00
Dylan
5870546e3b Travis use prefix on OSX 2016-03-26 14:45:24 +11:00
Dylan
bf44887c9c Remove bash prefix from travis 2016-03-26 14:39:47 +11:00
Dylan
f5212bd2bf Add an OSX test to travis 2016-03-26 14:32:06 +11:00
Dylan
5a4a4cb147 Travis don't use color blocks 2016-03-26 14:24:13 +11:00
Dylan
c015b7eda5 Changelog 2016-03-26 14:22:44 +11:00
Dylan
1442216ded Fix '+' sign in date output 2016-03-26 14:22:10 +11:00
Dylan
f2253afbfa Fix travis overlap 2016-03-26 14:20:28 +11:00
Dylan
98313547e9 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-26 14:17:24 +11:00
Dylan
16d904654a Use test mode with travis 2016-03-26 14:16:27 +11:00
Dylan Araps
1cad428a93 Merge pull request #182 from iandrewt/patch-2
Add Travis-CI status to README
2016-03-26 14:15:23 +11:00
Andrew Titmuss
94c97336b9 Add Travis-CI status to README 2016-03-26 14:14:33 +11:00
Dylan
6d0ef7d9e5 Changelog 2016-03-26 14:13:43 +11:00
Dylan
51d773dc52 Move cursor to bottom in test mode 2016-03-26 14:13:02 +11:00
Dylan
70b59ac1ef Fix refresh_rate output 2016-03-26 13:56:58 +11:00
Dylan
f153e8d2e4 Add a quicker timeout for terminals that support it 2016-03-26 13:53:54 +11:00
Dylan
3e7e62a528 Re-enable color blocks for travis 2016-03-26 13:45:43 +11:00
Dylan
fe2c6e1e49 Fix integer error 2016-03-26 13:44:03 +11:00
Dylan
5d4212853c Fix hang with travis 2016-03-26 13:41:49 +11:00
Dylan
dfc89b8cfc Don't print color blocks when using travis 2016-03-26 13:36:29 +11:00
Dylan
1133cc01cf Use sudo with makefile 2016-03-26 12:15:17 +11:00
Dylan
87d104414b Travis, use makefile 2016-03-26 12:13:31 +11:00
Dylan
b23f1097d1 Fix travis error' 2016-03-26 12:07:21 +11:00
Dylan
d0e0bfcdad Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-26 12:05:03 +11:00
Dylan
220f7f5c0d Add travis yml file 2016-03-26 12:03:25 +11:00
Dylan Araps
869d3c0c7c Merge pull request #181 from iandrewt/refresh_rate
fixed if statement for linux resolution
2016-03-26 11:56:28 +11:00
Andrew Titmuss
044ee72619 fixed if statement for linux resolution 2016-03-26 11:49:43 +11:00
Dylan Araps
ae87921865 Merge pull request #180 from iandrewt/patch-1
Changelog
2016-03-26 11:44:46 +11:00
Andrew Titmuss
f5f922970e Changelog
added note about Google Play Music Desktop Player
2016-03-26 11:42:55 +11:00
Dylan
24cd06d038 Changelog 2016-03-26 11:39:33 +11:00
Dylan Araps
d8fa3824e4 Merge pull request #160 from iandrewt/refresh_rate
display refresh rate after each monitor (optional)
2016-03-26 11:38:07 +11:00