Toni Cunyat
|
d1bea37236
|
I agree to the conditions of the Contributor Agreement contained in doc/CONTRIBUTING.md
|
2014-11-03 16:55:01 +01:00 |
|
Neil Lathwood
|
9a3d5bc560
|
Merge pull request #333 from laf/issue-laf-80
Updated arp search page to use new MySQL pagination
|
2014-10-30 10:26:04 +00:00 |
|
Neil Lathwood
|
c4e7da9f10
|
Merge pull request #332 from laf/issue-laf-77
Added function to generate pagination for mysql results
|
2014-10-30 10:25:56 +00:00 |
|
laf
|
fd3ecdf42f
|
Updated arp search page to use new MySQL pagination
|
2014-10-29 18:34:26 +00:00 |
|
laf
|
9eafe9af2a
|
Added function to generate pagination for mysql results
|
2014-10-29 18:30:42 +00:00 |
|
Neil Lathwood
|
b3d9bf03a4
|
Merge pull request #331 from laf/issue-laf-78
Moved the placement of datetimer picker js library in index.php
|
2014-10-29 11:11:13 +00:00 |
|
laf
|
db7b613cb7
|
Moved the placement of datetimer picker js library in index.php
|
2014-10-29 10:48:18 +00:00 |
|
Paul Gear
|
2d4217995e
|
Merge pull request #309 from laf/issue-laf-55
Removed --no-edit for git pull, not a valid command before git 1.7.10
|
2014-10-28 08:44:13 +10:00 |
|
Paul Gear
|
8ab0bcb324
|
Remove unused jqplot functions (was PR#306)
|
2014-10-28 08:39:19 +10:00 |
|
Paul Gear
|
f7821198da
|
Updated graphs page to use bootstrap datetimepicker PR#306
- Separated from removal of jqplot code
- Merge remote-tracking branch 'laf/issue-laf-52'
Conflicts:
html/index.php
|
2014-10-28 08:37:49 +10:00 |
|
Paul Gear
|
ce62a1d324
|
Merge pull request #329 from laf/issue-laf-76
Added link to changelog
|
2014-10-28 07:58:21 +10:00 |
|
Paul Gear
|
2fbdfe4cfd
|
Integrate moment PR#308
|
2014-10-28 07:47:52 +10:00 |
|
Paul Gear
|
736888ee8a
|
Integrate bootstrap datetimepicker PR#308
|
2014-10-28 07:46:08 +10:00 |
|
laf
|
3ede85267b
|
Added changelog as a hyperlink on version number as well
|
2014-10-27 21:03:59 +00:00 |
|
laf
|
ede8c1d888
|
Added link to changelog
|
2014-10-27 20:55:48 +00:00 |
|
Paul Gear
|
99341e5a90
|
Documentation refresh with focus on contribution guidelines
|
2014-10-28 06:53:25 +10:00 |
|
Paul Gear
|
24e20bb847
|
Merge commit 'a07849b73a0c73c2bcee75d4e1649db239a8b93f' as 'html/js/moment'
|
2014-10-28 05:59:36 +10:00 |
|
Paul Gear
|
a07849b73a
|
Squashed 'html/js/moment/' content from commit d5ff2cf
git-subtree-dir: html/js/moment
git-subtree-split: d5ff2cfc0000010c37cc5ebe75a5905c943368e4
|
2014-10-28 05:59:36 +10:00 |
|
Paul Gear
|
75c4ce4edb
|
Genericise Makefile and do not ignore it
|
2014-10-28 05:56:36 +10:00 |
|
Paul Gear
|
0d704de9b0
|
Merge commit 'cc43b3595b596d50b7891ad8cbf0830c5c92f609' as 'html/js/datetime'
|
2014-10-25 09:38:01 +10:00 |
|
Paul Gear
|
cc43b3595b
|
Squashed 'html/js/datetime/' content from commit 5b3fc61
git-subtree-dir: html/js/datetime
git-subtree-split: 5b3fc61571b126116aafbcd5cb1a7aefb41f9d42
|
2014-10-25 09:38:01 +10:00 |
|
Paul Gear
|
f7892d0c5a
|
A little note for later
|
2014-10-25 09:16:20 +10:00 |
|
Paul Gear
|
b5136b444c
|
Remove unused function; make it clearer that _json_format is not used in PHP 5.4 & later
|
2014-10-25 09:16:07 +10:00 |
|
Paul Gear
|
208ac0b104
|
Merge remote-tracking branch 'laf/issue-laf-47'
|
2014-10-25 08:49:28 +10:00 |
|
Paul Gear
|
0131e8e7c3
|
Fix example community string
|
2014-10-25 08:44:51 +10:00 |
|
Paul Gear
|
1a5544116f
|
Use $() consistently; fail if dirname or cd fails
|
2014-10-25 08:41:53 +10:00 |
|
Paul Gear
|
70bb420fe7
|
Use consistent spacing
|
2014-10-25 08:40:42 +10:00 |
|
Paul Gear
|
5564a581da
|
Merge pull request #328 from laf/issue-laf-72
Fixes the fact daily.sh does not run outside of the install directory
|
2014-10-24 08:38:51 +10:00 |
|
laf
|
aa5d7f488c
|
Fixes the fact daily.sh does not run outside of the install directory
|
2014-10-23 21:39:16 +01:00 |
|
Paul Gear
|
d8b0d8224a
|
Merge pull request #324 from laf/issue-laf-69
Added additional text to email alerts that will show icmp or snmp when a down alert is generated
|
2014-10-22 22:03:48 +10:00 |
|
Paul Gear
|
fd1d972640
|
Merge pull request #323 from laf/issue-laf-68
Added options for fping to retry and timeout
|
2014-10-22 22:02:56 +10:00 |
|
Paul Gear
|
5f08c36043
|
Merge pull request #321 from laf/issue-laf-66
Added stripslashes to fix formatting issues
|
2014-10-22 21:59:20 +10:00 |
|
Paul Gear
|
a4be1a8501
|
Merge pull request #320 from laf/issue-laf-65
poll-device.php is no longer used / needed.
|
2014-10-22 21:58:45 +10:00 |
|
Paul Gear
|
39ed79c7e4
|
Merge pull request #318 from laf/issue-laf-64
Updated transport list to be generated from $config values
|
2014-10-22 21:58:07 +10:00 |
|
Paul Gear
|
69c3d926ff
|
Merge pull request #315 from laf/issue-laf-58
Added the ability to call the api for a list of endpoints
|
2014-10-22 21:46:34 +10:00 |
|
Paul Gear
|
2832872c87
|
Merge pull request #314 from laf/issue-laf-60
Added names to all the relevant api routes
|
2014-10-22 21:42:30 +10:00 |
|
Paul Gear
|
15392ecf40
|
Merge pull request #313 from laf/issue-laf-61
Added a response code when things are ok - oops
|
2014-10-22 21:37:39 +10:00 |
|
Paul Gear
|
90c41ff650
|
Merge pull request #312 from laf/issue-laf-59
Removed trailing slash from v0 part of the uri
|
2014-10-22 21:37:17 +10:00 |
|
Paul Gear
|
9bf617b586
|
Merge pull request #310 from laf/issue-laf-54
Updated authToken response code to be 401
|
2014-10-22 21:34:21 +10:00 |
|
Neil Lathwood
|
def6adb73d
|
Merge pull request #327 from laf/issue-laf-71
Updated disabled field to readonly as this stops submission of that field
|
2014-10-22 11:40:00 +01:00 |
|
laf
|
2b9341e773
|
Updated disabled field to readonly as this stops submission of that field
|
2014-10-22 11:17:25 +01:00 |
|
Neil Lathwood
|
bb1a63635b
|
Merge pull request #316 from laf/issue-laf-62
Changed graphs using yearh to year
|
2014-10-20 20:29:50 +01:00 |
|
Neil Lathwood
|
b713306441
|
Merge pull request #325 from laf/issue-laf-70
Fixed issues with using web installer due to variable name change
|
2014-10-18 19:42:19 +01:00 |
|
Neil Lathwood
|
3f0ec58844
|
Fixed issues with using web installer due to variable name change
|
2014-10-18 18:21:04 +00:00 |
|
Paul Gear
|
71a3eb1c76
|
Merge pull request #301 from laf/issue-laf-46
Added authlog purge + improved efficiency of clearing out large syslog tables
|
2014-10-18 18:43:27 +10:00 |
|
laf
|
d77553f962
|
Added additional text to email alerts that will show icmp or snmp when a device goes down
|
2014-10-16 23:03:58 +01:00 |
|
laf
|
d8904d866c
|
Added options for fping to retry and timeout
|
2014-10-16 21:52:35 +01:00 |
|
Neil Lathwood
|
e903748e1d
|
Added stripslashes to fix formatting issues
|
2014-10-11 19:35:34 +00:00 |
|
Neil Lathwood
|
b351dcfd0f
|
poll-device.php is no longer used / needed.
|
2014-10-11 17:19:33 +00:00 |
|
Neil Lathwood
|
4a19553e31
|
Merge pull request #319 from laf/issue-laf-67
Moved the Add Host button as it was hidden on snmp v1/v2c options
|
2014-10-11 18:15:15 +01:00 |
|