mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:librenms/librenms

Browse Source 
Conflicts:
	html/index.php
This commit is contained in:
Tyler Christiansen
2013-10-28 14:34:01 -07:00
parent 6cd1bad907 08bd6a7d32
commit a11813d999
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1 +1,3 @@
Makefile Makefile
archives
patches

13
README.md
View File

@@ -50,7 +50,16 @@ See `INSTALL.md` for details.
Contributing Contributing
------------ ------------
Clone the repo and file bug reports and pull requests here. You can participate in the project by:
Join the [librenms-project][1] mailing list to post questions and suggestions. - Joining the [librenms-project][1] mailing list to post questions and
suggestions.
- Cloning the [repo][2] and filing bug reports and pull requests on github.
- Talking to us on [Twitter][3] or [IRC][4].
- Improving the [wiki][5].
[1]: https://groups.google.com/forum/#!forum/librenms-project "LibreNMS" [1]: https://groups.google.com/forum/#!forum/librenms-project "LibreNMS"
[2]: https://github.com/librenms/librenms
[3]: https://twitter.com/librenms
[4]: irc://irc.freenode.net/##librenms
[5]: https://github.com/librenms/librenms/wiki

8
TODO.md
View File

@@ -1,8 +0,0 @@
Current priorities
------------------
- Identify major functionality gaps
- Integrate community patches
- Get a community wiki up and running
- Get a logo. Replace Observium branding.

5
html/index.php
View File

@@ -268,10 +268,9 @@ $runtime_end = utime(); $runtime = $runtime_end - $runtime_start;
$gentime = substr($runtime, 0, 5); $gentime = substr($runtime, 0, 5);
echo('<br /> <br /> <br /> <br /> <div id="footer">' . (isset($config['footer']) ? $config['footer'] : '')); echo('<br /> <br /> <br /> <br /> <div id="footer">' . (isset($config['footer']) ? $config['footer'] : ''));
echo('<br />Powered by <a href="http://www.observium.org" target="_blank">Observium ' . $config['version']); echo('<br />Powered by <a href="https://github.com/librenms/librenms" target="_blank">LibreNMS ' . $config['version']);
echo('</a>. Copyright &copy; 2006-2012 by Adam Armstrong. All rights reserved.'); echo('</a>. Copyright &copy; '. date("Y"). ' by the LibreNMS Contributors.<br/>LibreNMS is <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, released under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU GPLv3</a>.');
echo('</a>. Copyright &copy; 2006-'. date("Y"). ' by the LibreNMS Contributors. All rights reserved.');
if ($config['page_gen']) if ($config['page_gen'])
{ {