Thom Seddon
d2dd3e256f
Fix URL path to ajax_form.php for testing alerts
2016-03-23 09:43:34 +00:00
Neil Lathwood
bcafac560c
Merge pull request #3237 from xbeaudouin/cumulus
...
Basic Cumulus Linux support
2016-03-18 10:33:38 +00:00
Neil Lathwood
6b896d0cb7
Merge pull request #3239 from richardlawley/billing-search
...
Convert bills list to Bootgrid
2016-03-17 21:09:10 +00:00
Xavier Beaudouin
571ee1631a
Add cumulus icon
2016-03-16 16:07:51 +01:00
Daniel Preussker
57339c4221
Merge pull request #3221 from ekoyle/add_web_html_email_option
...
Add web config option for HTML emails
2016-03-16 14:44:51 +00:00
Neil Lathwood
c9fabd4654
Merge pull request #3246 from Rosiak/issue-3245
...
Deliberant WiFi Discovery
2016-03-16 11:50:46 +00:00
Paul Gear
f90e7baa31
Merge pull request #3252 from laf/issue-3131
...
Updated alerts query to retrieve sysName for function use
2016-03-16 11:07:13 +10:00
laf
4cbeb18af5
Updated alerts query to retrieve sysName for function use
2016-03-16 00:56:58 +00:00
Neil Lathwood
150ee45452
Merge pull request #3240 from richardlawley/issue-1967
...
Add Interface at bill create screen
2016-03-15 23:23:01 +00:00
Eldon Koyle
6a53bcf688
Add web config option for HTML emails
2016-03-15 16:55:27 -06:00
Rosiak
29fd3fb569
Initial Commit
2016-03-15 18:11:09 +01:00
Neil Lathwood
2d2f56c3dc
Merge pull request #3224 from Rosiak/issue-3029
...
Basic Develop Ineo Printer Support
2016-03-15 10:01:33 +00:00
Richard Lawley
4500c2a3ba
Fix dates shown in history view
2016-03-15 08:11:42 +00:00
Richard Lawley
b2c015b58c
Add Interface at bill create screen
2016-03-14 19:18:53 +00:00
Richard Lawley
0e5b413d05
Include Notes field on Bills list
2016-03-14 16:35:23 +00:00
Richard Lawley
cbb8699fb8
Convert table to bootgrid
2016-03-14 16:30:55 +00:00
Neil Lathwood
dbf7d30538
Merge pull request #3219 from richardlawley/increase-alert-suggestions
...
Increase rule suggestions to 20
2016-03-13 20:11:00 +00:00
Neil Lathwood
f79979f3f6
Merge pull request #3216 from richardlawley/billing-search
...
Implement Billing Search
2016-03-13 20:09:32 +00:00
Neil Lathwood
240ffe55af
Merge pull request #3178 from Ultra2D/api-ldap
...
API access when using LDAP authentication
2016-03-13 20:06:35 +00:00
Rosiak
9b4eb5c497
Basic Develop Ineo Printer Support
...
#3029
2016-03-11 23:40:44 +01:00
Rosiak
9776f56aa1
Add Canon pic
...
#3078
2016-03-11 23:11:24 +01:00
Richard Lawley
b89fa295a5
Increase rule suggestions to 20
2016-03-11 08:51:24 +00:00
Richard Lawley
c35afb1e1c
Implement Billing Search
2016-03-10 18:11:39 +00:00
Ultra2D
12a3b305ed
API access when using LDAP authorization
2016-03-10 14:48:01 +01:00
Neil Lathwood
d996a7af3c
Merge pull request #3195 from richardlawley/issue-3151
...
Historical Billing Graphs use correct values for 95th line
2016-03-10 12:50:09 +00:00
Ultra2D
d63744c32c
Only use get_user if it exists
2016-03-10 08:17:09 +01: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
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
Daniel Preussker
4ce1b43692
Updated UI again
2016-03-09 21:01:02 +01:00
Daniel Preussker
1a59171ccc
Updated UI
2016-03-09 19:21:11 +01: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
972429838b
Redirect to edit page afer add bill
2016-03-09 08:26:32 +00:00
Richard Lawley
069c06716e
Make billing graphs take times from bill_hist_id and use that for 95th
2016-03-08 21:43:10 +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
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
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
Neil Lathwood
fdd9ab0a05
Merge pull request #3184 from richardlawley/overlib-tweak
...
Overlib Style Tweak
2016-03-08 00:33:19 +00: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
Richard Lawley
b250b862d1
Overlib Style Tweak
2016-03-07 21:25:01 +00:00
Ultra2D
322053c827
API access when using LDAP authentication
2016-03-07 14:07:51 +01:00
