1461 Commits

Author	SHA1	Message	Date
Louis Rossouw	9fb2c0d674	Implement configurable network map parameters.	2015-07-29 01:17:08 +02:00
Paul Gear	064f374160	Merge pull request #1501 from laf/issue-1334-new ... New overview page and new map	2015-07-26 14:33:34 +10:00
Paul Gear	b46132cc5a	Merge pull request #1498 from laf/issue-1467 ... Updated edit ports page to use bootstrap	2015-07-26 14:22:48 +10:00
Paul Gear	52f160549b	Merge pull request #1407 from laf/smokeping ... Smokeping improvement + script to generate config	2015-07-26 14:21:29 +10:00
Daniel Preussker	b48e12a749	Merge pull request #1528 from laf/issue-1461 ... Updates to improve map quality	2015-07-24 10:16:56 +00:00
laf	4ad3b8e99d	Fixed attaching templates to rules	2015-07-24 10:53:52 +01:00
laf	9aa3f2cca5	Fixed creating new template straight after deleting one	2015-07-24 10:28:18 +01:00
laf	0c5aedc1c4	Fixed deleting alert templates	2015-07-24 10:06:12 +01:00
laf	b5538d8ef6	Fixed scrut issue	2015-07-23 21:44:28 +01:00
laf	0b93725029	Updated to use new table name	2015-07-23 18:41:41 +01:00
laf	0f05b1a322	Fixed common.php	2015-07-23 17:51:24 +01:00
Rosiak	fff6ddb5e3	Fix issue-1503 ... - Add SysName to device overview page	2015-07-22 17:22:06 +02:00
root	0a88c386b0	Add 'puredn' ldap authentication	2015-07-21 20:56:48 +03:00
laf	031a818c77	Removed references to location override	2015-07-20 16:52:33 +01:00
laf	fbec75a265	Mapping should be complete	2015-07-20 15:59:44 +01:00
laf	57540aacbc	Added search and sorting support	2015-07-20 14:03:09 +01:00
laf	c579805292	Updated edit ports page to use bootstrap	2015-07-20 13:55:35 +01:00
Neil Lathwood	cac95d3581	Merge pull request #1486 from spinza/fixzeromac ... Ignore links based on 'unreal' mac addresses.	2015-07-19 22:03:08 +01:00
Louis Rossouw	b9cb02057a	Ignore links based on 'unreal' mac adresses.	2015-07-19 22:54:16 +02:00
laf	59990d2258	Initialise arrays needed for merge	2015-07-19 21:45:56 +01:00
Neil Lathwood	e948db4e8c	Revert "Ignore links based on 'unreal' mac addresses."	2015-07-19 22:04:18 +01:00
Louis Rossouw	00bbd02b1d	Ignore links based on 'unreal' mac adresses.	2015-07-19 21:08:11 +02:00
laf	dde4ac0db6	Initial work on tooltips	2015-07-19 18:52:39 +01:00
laf	5d5d3b470d	Updates to improve map quality	2015-07-19 17:59:08 +01:00
Daniel Preussker	6efe5b086c	Merge pull request #1370 from travishegner/lazyload ... Lazyload	2015-07-18 22:02:13 +02:00
Daniel Preussker	18c2b57cbe	Merge pull request #1472 from laf/issue-1468 ... Fixed clicking anywhere now takes you to where you should go	2015-07-18 22:01:25 +02:00
Daniel Preussker	2170af6a48	Merge pull request #1470 from laf/network-map-updates ... Network map updates	2015-07-18 22:00:36 +02:00
laf	bfa3d432a3	Fixed clicking anywhere now takes you to where you should go	2015-07-18 18:27:24 +01:00
laf	92dfc7ff42	Linked alert rule name to alert rules page	2015-07-18 17:30:55 +01:00
laf	9092f2729d	Removed duplicate array	2015-07-18 17:18:31 +01:00
laf	c4dbe18437	Sorting duplicate links	2015-07-18 17:07:37 +01:00
laf	5633e6a005	Try and stop reverse links	2015-07-18 17:03:01 +01:00
laf	31f174c7b1	Docs + some variable changes	2015-07-18 16:15:57 +01:00
laf	87321516be	Some small changes	2015-07-18 15:59:19 +01:00
laf	137fbf593c	Updated physics and sql query	2015-07-18 15:48:07 +01:00
Rosiak	ef23f47b6d	Change submenu entry name ... - Device -> Network	2015-07-17 13:05:25 +02:00
Rosiak	8d09a66f80	Minor corrections ... - Made some changes according to f0o’s recommendation	2015-07-17 11:17:22 +02:00
Rosiak	eb87668d07	Availability-map ... - Availability-map - Maps submenu - Remove old network-map menu entry	2015-07-17 00:36:29 +02:00
Clint Armstrong	b5e8998c70	apply lazyload patch	2015-07-16 12:42:58 -04:00
Clint Armstrong	3edce4d7e1	remove checks for options that socket does not use	2015-07-16 11:11:11 -04:00
Clint Armstrong	721455a0d7	don't override the socket option	2015-07-16 11:10:32 -04:00
laf	6ec525c222	Formatting + scrut updates	2015-07-16 16:01:51 +01:00
laf	ef6d7b9565	Fixed some scrut issues labelled Major	2015-07-15 22:04:19 +01:00
laf	7eed295897	Rebased	2015-07-15 20:46:04 +01:00
laf	4c39421787	Network map sql update + fix for duplicate links	2015-07-15 20:09:20 +01:00
Job Snijders	d8693f05ae	Fix coding style part 2	2015-07-15 11:04:22 +02:00
laf	746f918a8a	More map updates	2015-07-14 13:11:54 +01:00
laf	dfcf5c912a	Updated where queries	2015-07-14 12:15:05 +01:00
laf	69c2b35212	Added restriction for device_id	2015-07-14 12:13:46 +01:00
laf	eb2f0d7a54	More network map updates	2015-07-14 11:47:42 +01:00