Commit Graph
17185 Commits
Author SHA1 Message Date
laf b516069c23 Added Font awesome to credits file 2015-03-28 14:21:51 +00:00
laf ffd8fa687d Merge commit '9e53021ef4f077d8d28ea95728ded4c93ef6b312' as 'lib/Font-Awesome' 2015-03-28 14:21:12 +00:00
laf 9e53021ef4 Squashed 'lib/Font-Awesome/' content from commit cf57b82
git-subtree-dir: lib/Font-Awesome
git-subtree-split: cf57b82bd994dfb20fc283ae35b8bf40d3cb133d
2015-03-28 14:21:12 +00:00
laf 8f5d6e8a94 Added code to rediscovery links and include device ids 2015-03-28 14:05:40 +00:00
laf 374107b812 Final bits to the map
Conflicts:
	html/css/styles.css
	html/includes/print-map.inc.php
2015-03-28 14:02:00 +00:00
laf 60138aded5 Added webui files for new map pages 2015-03-28 13:59:23 +00:00
laf 47c59ddf14 Updated to show map only if links exist
Conflicts:
	html/includes/print-menubar.php
2015-03-28 13:53:00 +00:00
laf 35db670c97 Squashed 'lib/vis/' content from commit 1d029ca
git-subtree-dir: lib/vis
git-subtree-split: 1d029cab7b527f3b292e95d550efbf784dac8699
2015-03-28 13:50:19 +00:00
laf 591c265a6f Merge commit '35db670c97cf708658d9b331d5bd55c0c21cf7bc' as 'lib/vis' 2015-03-28 13:50:19 +00:00
Daniel Preussker 808e9ea7f2 Merge pull request #671 from laf/tables
Implemented Jquery Bootgrid for table support
2015-03-28 10:41:17 +00:00
Paul Gear 133d115c3c Merge pull request #677 from paulgear/master
Trivial doc typo
2015-03-28 16:19:23 +10:00
Paul Gear 36d91609b5 Merge branch 'master' of git://github.com/librenms/librenms 2015-03-28 16:17:41 +10:00
Paul Gear b6bcf12548 Fix doc typo 2015-03-28 16:16:02 +10:00
Daniel Preussker 28f846afb6 Merge pull request #673 from laf/issue-672
Fixed the issue with ports constantly logging descr changes
2015-03-28 05:00:27 +00:00
Daniel Preussker 9fcfe02bff Merge pull request #676 from laf/issue-657
Shorten interface names into Fa, Gi, Te
2015-03-28 04:58:11 +00:00
Daniel Preussker 9a27bf6ac9 Merge pull request #675 from laf/issue-674
This is a proper fix for PR 623 + 625
2015-03-28 04:56:24 +00:00
laf e94c238588 Added some more examples 2015-03-27 22:22:11 +00:00
laf d5fe0a8050 Shorten interface names into Fa, Gi, Te 2015-03-27 21:42:23 +00:00
laf 6455f3924e This is a proper fix for PR 623 + 625 2015-03-27 20:13:41 +00:00
laf 36ec131633 Fixed the issue with ports constantly logging descr changes 2015-03-27 19:54:03 +00:00
laf f7a4fc68eb Fixing a scrut issue for xss 2015-03-27 16:59:58 +00:00
laf 79ae1acffa Updated tables to include other SQL queries in total count 2015-03-27 16:47:26 +00:00
laf 6207bae03a Switched to using Jquery Bootgrid for tables 2015-03-27 16:28:09 +00:00
laf 115bed5812 Merge commit 'fcbbaffce15ad99a8095616f55183ca39e0e16a7' as 'lib/jquery-bootgrid' 2015-03-27 09:02:55 +00:00
laf fcbbaffce1 Squashed 'lib/jquery-bootgrid/' content from commit 300dc3d
git-subtree-dir: lib/jquery-bootgrid
git-subtree-split: 300dc3d8618ed56e5e2e8754e1bb5ce7a2ff724e
2015-03-27 09:02:55 +00:00
Tyler Christiansen 57d51cb83f bring f5 version output in line with other standards 2015-03-26 22:50:35 -07:00
Daniel Preussker ae737d4017 Merge pull request #669 from supertylerc/feat/hipchat-alerts
add new hipchat transport for alerts
2015-03-27 05:45:31 +00:00
Tyler Christiansen a1003c8375 fix os var name 2015-03-26 22:13:21 -07:00
Tyler Christiansen 277270e5b7 add basic f5 support 2015-03-26 22:10:30 -07:00
Tyler Christiansen 005d92a200 fix formatting...markdown is a pain sometimes 2015-03-26 20:26:38 -07:00
Tyler Christiansen 9cc708695c fix formatting again 2015-03-26 20:24:47 -07:00
Tyler Christiansen 552c98555b fix formatting 2015-03-26 20:21:59 -07:00
Tyler Christiansen d6d2fa1920 add new hipchat transport for alerts 2015-03-26 20:18:15 -07:00
Dave Leaver 1659237628 Merge pull request #444 from MazeMap/master
On becoming visible, markers retain their original opacity.
2015-03-27 11:28:54 +13:00
Paul Gear 8512ef74ae Merge pull request #659 from laf/issue-laf-152
Added basic Ubiquiti Wireless support
2015-03-26 23:20:01 +10:00
Iván Sánchez Ortega 13c6aff4b6 Unit tests for the "remember opacity" functionality 2015-03-26 11:30:01 +01:00
Iván Sánchez Ortega a861842edc Merge branch 'master' of https://github.com/Leaflet/Leaflet.markercluster 2015-03-26 10:01:34 +01:00
Dave Leaver 3d3f0020e1 Merge pull request #466 from weftio/polyline-options-attempt2
Spiderleg Polyline options - attempt - 2
2015-03-26 12:57:32 +13:00
Mike Atlas fa487f5bb7 polyline styling options - attempt 2 2015-03-25 19:18:07 -04:00
Mike Atlas c40768b917 Merge pull request #1 from Leaflet/master
get up to date with latest markercluster
2015-03-25 19:12:23 -04:00
Neil Lathwood b01c7051dc Merge pull request #664 from Rosiak/PollLog1
Add Polling Information Page
2015-03-25 21:38:28 +00:00
Daniel Preussker 09260011f2 Merge pull request #663 from laf/install-docs
Updated install docs - specifically cron setup
2015-03-25 21:06:23 +00:00
Rosiak c8f15119d1 Add Polling Information Page 2015-03-25 22:05:51 +01:00
Daniel Preussker a0bfb6da9e Merge pull request #662 from laf/docs
Update README file
2015-03-25 21:04:49 +00:00
Daniel Preussker 139c9d65e1 Merge pull request #660 from laf/issue-658
Added OS to the default discovery modules
2015-03-25 21:02:12 +00:00
Daniel Preussker e4a8694d42 Merge pull request #661 from laf/issue-laf-153
Removed old debug line!
2015-03-25 21:01:16 +00:00
laf 590a4321cf Updated install docs to specify copying librenms.cron rather than symlink 2015-03-25 20:42:19 +00:00
laf e99c300b02 Couple of small syntax updates 2015-03-25 20:37:10 +00:00
laf 437d0395a1 Updated README file 2015-03-25 20:33:10 +00:00
laf 88775be882 Removed old debug line! 2015-03-25 19:48:55 +00:00