Neil Lathwood
33710fa4c0
Merge pull request #3191 from geordish/issue-3183
...
The SQL query that was being generated was messed up. I've attempted …
2016-03-09 21:36:00 +00:00
David Bell
d8042920d2
Merge branch 'master' of https://github.com/geordish/librenms into issue-3183
2016-03-09 21:03:08 +00:00
David Bell
39aaf84c74
Changing to a simpler fix suggested by @ekoyle
2016-03-09 21:01:47 +00:00
Neil Lathwood
3983705ba3
Merge pull request #3194 from richardlawley/update-billing-ui
...
Update Billing UI
2016-03-09 20:35:29 +00:00
Neil Lathwood
aa0a59b526
Merge pull request #3204 from murrant/hpilo
...
Check the sysObjectID before trying to detect ILO temp sensors.
2016-03-09 20:34:03 +00:00
Neil Lathwood
8f5e18e02f
Merge pull request #3207 from murrant/avtech
...
Fixes for Avtech
2016-03-09 20:27:20 +00:00
Neil Lathwood
dccb84ec69
Merge pull request #3200 from richardlawley/issue-3181
...
Import Notifications with Original Date/Time
2016-03-09 20:21:39 +00:00
Neil Lathwood
1bdd21c74d
Merge pull request #3201 from richardlawley/issue-3197
...
Add sysName for top-interfaces with force_ip_to_sysname for normal user
2016-03-09 20:18:30 +00:00
Neil Lathwood
e121dc4cbb
Merge pull request #3205 from librenms/f0o-service-update
...
Update services SQL
2016-03-09 20:16:21 +00:00
Daniel Preussker
4ce1b43692
Updated UI again
2016-03-09 21:01:02 +01:00
Tony Murray
eb9281ff10
Fixes for Avtech
...
Trim quotes from description
Correct sensor type
Allow sensor id of 0
Correct indexes for sensors
2016-03-09 12:34:29 -06:00
Daniel Preussker
1a59171ccc
Updated UI
2016-03-09 19:21:11 +01:00
Daniel Preussker
4a79348759
Update services SQL
2016-03-09 18:30:59 +01:00
Tony Murray
55002aced1
Check the sysObjectID before trying to detect ILO temp sensors.
2016-03-09 10:02:53 -06:00
Richard Lawley
8fbcdfc62b
Remove unnecessary array reverse
2016-03-09 12:47:11 +00:00
Richard Lawley
60bb400202
Add sysName for top-interfaces with force_ip_to_sysname for normal user
2016-03-09 12:41:10 +00:00
Richard Lawley
572fc207c1
Import Notifications with Original Date/Time
2016-03-09 12:24:39 +00:00
Richard Lawley
972429838b
Redirect to edit page afer add bill
2016-03-09 08:26:32 +00:00
Søren Rosiak
6199d36936
Merge pull request #3187 from pblasquez/patch-2
2016-03-08 22:03:51 +01:00
Søren Rosiak
0479006fdc
Merge pull request #3153 from laf/issue-3146
2016-03-08 22:01:07 +01:00
Neil Lathwood
47b87e959e
Merge pull request #3138 from f0o/minor-alerting-addons
...
Minor alerting addons
2016-03-08 21:00:37 +00:00
Søren Rosiak
1cba002b94
Merge pull request #3168 from laf/oxidized-os
2016-03-08 22:00:05 +01:00
Neil Lathwood
56caedbaff
Merge pull request #3188 from geordish/issue-1674
...
Corrected inserting ' into overide syslocation string
2016-03-08 20:54:35 +00:00
Neil Lathwood
6a64ab6035
Merge pull request #3177 from geordish/fix-smokeping-aggregate
...
Corrected aggregate graph on smokeping page
2016-03-08 20:52:46 +00:00
Richard Lawley
fca483439e
Remove Edit link if not admin
2016-03-08 19:12:15 +00:00
Richard Lawley
bd640ebc08
Update History Page to match
2016-03-08 18:45:55 +00:00
Richard Lawley
9f136c06de
Update Billing UI to match rest of app
2016-03-08 18:21:29 +00:00
David Bell
6b4d58558f
Fix for admin users
2016-03-08 15:28:19 +00:00
David Bell
a09d3143f5
Can't push to an empty array
2016-03-08 15:22:02 +00:00
David Bell
0d8ba52a73
I agree to the conditions of the Contributor Agreement
...
contained in doc/General/Contributing.md.
2016-03-08 15:04:44 +00:00
David Bell
f381adad45
The SQL query that was being generated was messed up. I've attempted to refactor the way the query gets generated. Not 100% certain this is the best way to go about it
2016-03-08 14:56:25 +00:00
Neil Lathwood
03b8cc0c1b
Merge pull request #3189 from khobbits/patch-2
...
Stop double escaping port notes
2016-03-08 14:32:14 +00:00
Robert (KHobbits)
6e4eb4cf43
Stop double escaping port notes
2016-03-08 12:14:27 +00:00
David Bell
a33d16dafa
Corrected inserting ' into overide syslocation string
2016-03-08 11:18:33 +00:00
pblasquez
02ca54b9a5
Update Configuration.md
2016-03-07 19:03:17 -08:00
Neil Lathwood
fdd9ab0a05
Merge pull request #3184 from richardlawley/overlib-tweak
...
Overlib Style Tweak
2016-03-08 00:33:19 +00:00
Paul Gear
16f7f92780
Merge pull request #3185 from geordish/fix-rrd-graphs
...
Fix rrd graphs
2016-03-08 09:16:57 +10:00
David Bell
96c9a9ad60
Update generic_multi_seperated.inc.php
...
This fixes the syntax of the area statement.
Was previously producing
AREA:outbits1_neg#c0a060:STACK
Should be producing
AREA:outbits1_neg#c0a060::STACK
(Blank legend item)
2016-03-07 21:45:56 +00:00
David Bell
6aa8d1d741
Merge pull request #1 from librenms/master
...
syncing with master
2016-03-07 21:42:20 +00:00
Richard Lawley
b250b862d1
Overlib Style Tweak
2016-03-07 21:25:01 +00:00
Neil Lathwood
65a75c77e4
Merge pull request #3157 from bitcoredotorg/patch-3
...
Clean up centos install docs
2016-03-07 17:51:53 +00:00
bitcoredotorg
463cec398e
Update Installation-(RHEL-CentOS).md
2016-03-07 08:50:38 -05:00
David Bell
d2db4a4af2
Corrected aggregate graph on smokeping page
2016-03-07 11:40:47 +00:00
Neil Lathwood
5e57a026e9
Merge pull request #3142 from xbeaudouin/pktj
...
Gandi Packet Journey support.
2016-03-07 10:15:13 +00:00
Xavier Beaudouin
597204d764
Update the discovery of pktj as @murrant suggested.
2016-03-07 10:22:49 +01:00
Neil Lathwood
fbe7fb077f
Merge pull request #3169 from murrant/roomalert4e
...
Add support for Avtech RoomAlert 4E
2016-03-06 21:11:17 +00:00
Neil Lathwood
a1cf6ac00f
Merge pull request #3122 from marcodc/patch-2
...
Update Acknowledgement.md
2016-03-06 21:09:48 +00:00
Neil Lathwood
d066935775
Merge pull request #3111 from marcodc/patch-1
...
malaysia map - malaysia.js
2016-03-06 21:09:29 +00:00
Neil Lathwood
03d8345b47
Merge pull request #3176 from laf/changelog
...
Updated Changelog 06.03.16
2016-03-06 20:59:57 +00:00
laf
0eb1645fee
Updated Changelog 06.03.16
2016-03-06 20:59:15 +00:00
Neil Lathwood