Commit Graph
4831 Commits
Author SHA1 Message Date
Paul Gear 226ddb51ea Allow matching HP switches like "HP A5120-24G SI Switch Software Version 5.20" 2015-04-14 19:55:22 +10:00
Neil Lathwood 2d30a0c943 Merge pull request #800 from Rosiak/master
Minor APC Polling Changes
2015-04-13 22:46:43 +01:00
Søren Rosiak 8fd0889e13 APC InfraStruxure Detection
- Just basic s/n & hw detection
2015-04-13 23:29:04 +02:00
Søren Rosiak a15180333a Minor APC Polling Changes
- Add InRow Serial ID
- Convert from OID to MIB names
2015-04-13 23:11:27 +02:00
Neil Lathwood 4739254fbe Added hardware / serial number support 2015-04-13 21:53:05 +01:00
laf 18b4dcb136 More work on maintenance 2015-04-13 17:48:49 +01:00
Daniel Preussker c899769ca8 Merge pull request #797 from laf/devices-platform
Added new function to tidy up for bootgrid output
2015-04-13 15:12:00 +00:00
laf 4ba3e9519c Merge commit '65c3d1bf3868ad3e1caec9fc77021735df53f989' into issue-711 2015-04-13 15:48:29 +01:00
laf 65c3d1bf38 Squashed 'html/js/datetime/' changes from 5b3fc61..e750af7
e750af7 Update README.md
805bcc3 Update CONTRIBUTING.md
613a583 Update CONTRIBUTING.md
31e50cc Update bootstrap-datetimepicker-build.less
d004434 Merge pull request #891 from Eonasdan/development
adc8a68 fixes #867
8e16324 fixing locale formatting
dfe5657 patch #752
b2a71de fixes #874
d00e39d version bump
762a90d couple of fixes
d072d92 added keepInvalid
8eae1a4 Fixes and some new features
7f7dff4 Merge pull request #802 from zpaulovics/development
28699b6 Merge pull request #818 from mcarepa/improv-picker-placement
0abdcb1 Merge pull request #828 from ahmader/development
a9744c5 Merge pull request #831 from admackin/development
86b49cb Update package.json
ea501fa Fixes #793
0c5ad39 quick typo fixs
1cff47b picker placement conditions updated
6d245c9 version bump
a4e7201 fixes and new features
a865edf Revert "flipping events again"
78e28f5 Revert "tests"
b7ae1e3 Fixed the options handling for componets
197647d tests
8d0fef8 flipping events again
8daa2b2 fix for #794
0221cb4 Merge pull request #778 from davidrojo/iss777
c11f3be Merge pull request #789 from comerc/patch-5
159d29e Update bootstrap-datetimepicker.js
b545f2a Fixed coding style
19b485a Fixed coding style
6066555 Update CONTRIBUTING.md
1b2fe6e Update CONTRIBUTING.md
8d5b40a Fixes #777
37d8ce1 fix for #760
1cae292 fix for #761
499f619 fixing less
557b657 updating to v4
d9560b3 Update CONTRIBUTING.md
29b397d Update README.md
29cd87f Update bower.json
fc56ea1 fixes #664
4c74e82 Merge pull request #635 from PeterDaveHello/patch-1
d756797 fix indent in package.json

git-subtree-dir: html/js/datetime
git-subtree-split: e750af7a4a65870030056a83fd1b52fc7b343246
2015-04-13 15:48:29 +01:00
laf 47a3663be6 updating to use date 2015-04-13 15:46:38 +01:00
laf fa52fdc986 Added new function to tidy up for bootgrid output 2015-04-13 15:32:39 +01:00
Neil Lathwood 2b6cddec2e Merge pull request #796 from f0o/issue-795
Re-Added SQL rule generation
2015-04-13 14:35:30 +01:00
f0o 23a01ab24e Re-Added SQL rule generation lost at b79b0b0d8f
solves #795
2015-04-13 13:21:30 +00:00
Daniel Preussker 60305782c3 Merge pull request #793 from laf/version-fix
Filtered out new lines to not break webui
2015-04-13 11:28:57 +00:00
laf c95488f73f Swapped if check 2015-04-13 12:11:12 +01:00
laf ba1e9e6c5f Filtered out new lines to not break webui 2015-04-13 11:47:25 +01:00
Daniel Preussker 62833b2f0f Merge pull request #792 from SaaldjorMike/typo-2
Fixed wrong name in debug popup
2015-04-13 10:16:58 +00:00
Daniel Preussker a415c77882 Merge pull request #791 from paulgear/master
Add proxy support for callback stats
2015-04-13 10:15:49 +00:00
Mike Rostermund 778865e639 Fixed wrong name in debug popup 2015-04-13 03:12:01 -07:00
Paul Gear cd70aecc97 Fix cut & paste errors 2015-04-13 20:04:41 +10:00
Paul Gear 26564c6b19 Move & rename curl proxy function 2015-04-13 19:51:16 +10:00
Paul Gear 2cbe6ea464 Try to remember which language I'm coding in... 2015-04-13 19:45:41 +10:00
laf 76a3425358 Append mib directory 2015-04-13 10:39:12 +01:00
Paul Gear 93eab16e5a Add proxy support to callback function 2015-04-13 19:37:12 +10:00
Paul Gear 7ac743723d Keep syntax checker happy 2015-04-13 19:35:25 +10:00
laf 42acccd3fb started on schedule maintenance section 2015-04-13 10:18:15 +01:00
Daniel Preussker b4bae93b9f Merge pull request #788 from laf/label-width
Fixed label width on devices screen
2015-04-12 19:04:46 +00:00
laf 3d12e4f550 Fixed label width on devices screen 2015-04-12 20:02:57 +01:00
Daniel Preussker 609876018a Merge pull request #786 from laf/changelog
Updated changelog 12/04/15
2015-04-12 16:54:47 +00:00
laf f3a0f29b56 spelling mistake 2015-04-12 17:45:19 +01:00
Neil Lathwood 4e4aeee1b9 Merge pull request #787 from f0o/issue-741
Fix missing link to errored or ignored ports
2015-04-12 17:43:15 +01:00
f0o e25f91f311 Fixed menubar condition 2015-04-12 16:00:09 +00:00
f0o 36c9f845bf Fix missing link to errored or ignored ports 2015-04-12 15:56:54 +00:00
laf 027861aec2 Updated changelog 12/04/15 2015-04-12 16:40:48 +01:00
Daniel Preussker 199b5ef643 Merge pull request #785 from laf/login-debug
Stopped logging being output if user not logged in
2015-04-12 15:34:50 +00:00
laf 325deafdd8 Stopped logging being output if user not logged in 2015-04-12 16:27:55 +01:00
Neil Lathwood 6e1e7308b5 Merge pull request #780 from f0o/object-cache
New global Object Cache
2015-04-12 16:19:50 +01:00
Neil Lathwood cea734939b Merge pull request #784 from f0o/alerting-hotfix
honour alert_rules.disabled
2015-04-12 15:47:11 +01:00
f0o c94784f3dd honour alert_rules.disabled 2015-04-12 14:37:26 +00:00
Daniel Preussker 6520bb9aa0 Merge pull request #782 from laf/alert-log-alter
Added alter statement to add index to alert_log table
2015-04-12 14:12:48 +00:00
Daniel Preussker 8d30b22839 Merge pull request #783 from laf/default-page
updated the query for the alert log
2015-04-12 14:12:20 +00:00
laf cb702577fc updated the query for the alert log 2015-04-12 15:09:32 +01:00
laf eb20bc787e Added alter statement to add index to alert_log table 2015-04-12 14:57:51 +01:00
Neil Lathwood ec1c9009a5 Added logging and also missing mib in polller 2015-04-12 13:57:31 +01:00
f0o f55d57372b New global Object Cache 2015-04-12 11:22:43 +00:00
Daniel Preussker ee83c02d8b Merge pull request #779 from laf/bootgrid-loading
Fixed loading.... issue when no data returned
2015-04-12 10:48:45 +00:00
laf 71f5f22387 Fixed loading.... issue when no data returned 2015-04-12 11:47:21 +01:00
Daniel Preussker ae990df631 Merge pull request #778 from laf/callback
Updated sql statement
2015-04-12 10:37:35 +00:00
laf 4d66de4b00 Updated sql statement 2015-04-12 11:37:15 +01:00
Daniel Preussker d2bb7d7137 Merge pull request #761 from laf/bootgrid-devices
Updated the devices page to use bootgrid
2015-04-12 10:26:18 +00:00