laf
|
689f404d47
|
Updated footer link to use variable
|
2015-03-31 17:45:28 +01:00 |
|
Daniel Preussker
|
7fdd267bfc
|
Merge pull request #698 from Rosiak/master
Fix BGP Internal Icon
|
2015-03-31 17:26:08 +02:00 |
|
Neil Lathwood
|
70ca7f9a43
|
Merge pull request #696 from paulgear/master
Add separate Makefile entries for subtree merges
|
2015-03-31 14:05:12 +01:00 |
|
Søren Rosiak
|
debf396081
|
Fix BGP Internal Icon
- Make black instead of white, icon is not visible when white.
|
2015-03-31 15:03:39 +02:00 |
|
Paul Gear
|
f4fa655846
|
Merge branch 'master' of git://github.com/librenms/librenms
|
2015-03-31 22:34:12 +10:00 |
|
Paul Gear
|
1c4326111f
|
Split out subtree merges into their own Makefile entries
|
2015-03-31 22:34:04 +10:00 |
|
Neil Lathwood
|
6b2e11dca7
|
Merge pull request #682 from laf/font-awesome-2-lib
Added Font awesome to lib via subtree
|
2015-03-31 13:32:25 +01:00 |
|
Paul Gear
|
dc5cfda4ad
|
Merge pull request #683 from laf/font-awesome-2-webui
WebUI update to support dark / light theme - dark is default
|
2015-03-31 22:25:56 +10:00 |
|
Daniel Preussker
|
3db6596330
|
Merge pull request #690 from laf/issue-666
Made poller message box a link to /poll-log/
|
2015-03-31 14:14:47 +02:00 |
|
Daniel Preussker
|
a62256311a
|
Merge pull request #691 from laf/issue-667
Updated ipsec polling to clean up data and check before inserting
|
2015-03-31 14:14:06 +02:00 |
|
laf
|
089de7bab3
|
Chaged default to light theme
|
2015-03-31 12:22:35 +01:00 |
|
laf
|
97471cd79d
|
Updated to only change main navbar icon colors
|
2015-03-31 12:17:41 +01:00 |
|
Daniel Preussker
|
3d4284eed0
|
Merge pull request #689 from laf/issue-688
Fix for maps now working when devices hostname != the same in the links table
|
2015-03-31 09:41:51 +02:00 |
|
Daniel Preussker
|
f5e7e504b4
|
Merge pull request #692 from laf/changelog
Updated changelog 29/03/2015
|
2015-03-31 09:39:22 +02:00 |
|
laf
|
d8915b260e
|
Updated font-awesome to use subtree
|
2015-03-30 12:22:25 +01:00 |
|
laf
|
65f82ba00e
|
Adding files for final font-awesome PR
|
2015-03-30 12:22:24 +01:00 |
|
laf
|
24ac018114
|
Initial font awesome work
|
2015-03-30 12:21:59 +01:00 |
|
laf
|
d27a324dce
|
Updated changelog 29/03/2015
|
2015-03-29 21:22:42 +01:00 |
|
laf
|
240b6c7598
|
Updated ipsec polling to clean up data and check before inserting
|
2015-03-29 20:43:35 +01:00 |
|
laf
|
9ecaa7590b
|
Made poller message box a link to /poll-log/
|
2015-03-29 12:30:52 +01:00 |
|
laf
|
0da3cb8996
|
Fix for maps now working when devices hostname != the same in the links table
|
2015-03-29 02:11:55 +01:00 |
|
Daniel Preussker
|
c7d262d2b1
|
Merge pull request #684 from laf/docs
Updated contributing doc
|
2015-03-28 15:48:33 +00:00 |
|
Daniel Preussker
|
4929fbbcc9
|
Merge pull request #687 from f0o/issue-686
Map-Hotfix
|
2015-03-28 15:41:45 +00:00 |
|
f0o
|
8f46e730db
|
Added JS
|
2015-03-28 15:40:53 +00:00 |
|
laf
|
0ad1dac9bb
|
Updated contributing doc
|
2015-03-28 14:53:30 +00:00 |
|
Daniel Preussker
|
1b4274bb54
|
Merge pull request #681 from laf/issue-581-web
New maps code
|
2015-03-28 14:46:52 +00:00 |
|
Daniel Preussker
|
f0b12351fe
|
Merge pull request #680 from laf/issue-581-code
Added code to rediscovery links and include device ids
|
2015-03-28 14:46:39 +00:00 |
|
Daniel Preussker
|
a73925be29
|
Merge pull request #679 from laf/issue-581-vis
Added vis subtree
|
2015-03-28 14:46:32 +00:00 |
|
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
|
591c265a6f
|
Merge commit '35db670c97cf708658d9b331d5bd55c0c21cf7bc' as 'lib/vis'
|
2015-03-28 13:50:19 +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 |
|
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 |
|