2828 Commits

Author	SHA1	Message	Date
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	ef6d7b9565	Fixed some scrut issues labelled Major	2015-07-15 22:04:19 +01:00
Daniel Preussker	1f68d19c0d	Merge pull request #1440 from laf/changepasswd ... Added ability to update users passwords	2015-07-15 22:05:25 +02:00
laf	fac3751938	Rebased	2015-07-15 20:52:43 +01:00
Daniel Preussker	5f8c4dd3d7	Merge pull request #1455 from laf/network-map-sql ... Network map sql update + fix for duplicate links	2015-07-15 21:34:35 +02:00
Daniel Preussker	d621af6aad	Merge pull request #1454 from alangregory/temperature ... Updated Design for better mobile view	2015-07-15 21:33:33 +02:00
laf	08ae68bc58	fixed a couple of issues	2015-07-15 20:20:53 +01:00
laf	4c39421787	Network map sql update + fix for duplicate links	2015-07-15 20:09:20 +01:00
Alan Gregory	f09fcfca29	Updated Design for better mobile view	2015-07-15 15:52:05 -03:00
Job Snijders	d8693f05ae	Fix coding style part 2	2015-07-15 11:04:22 +02:00
laf	3142d5ee25	set width 100% for network map	2015-07-14 13:15:59 +01: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
laf	a81e5b636f	Default to only two days performance data but data picker available	2015-07-13 21:45:40 +01:00
laf	0436e3c483	Added ability to update users passwords	2015-07-13 17:21:07 +01:00
Rosiak	8f54b612ec	Adjust code to Best Practice ... - Adjust the code I’ve introduced to Scrut and general Best Practice	2015-07-13 16:08:03 +02:00
Job Snijders	fa0d021fec	Remove empty file	2015-07-11 16:12:35 +02:00
Job Snijders	76636702d7	Remove empty file	2015-07-11 16:12:35 +02:00
Job Snijders	ebd0f6fc35	Apply "Squiz" code style on old (pre-2014) files	2015-07-11 16:12:35 +02:00
Paul Gear	51ff0df11b	Really allow dividing as well as multiplying	2015-07-11 18:15:15 +10:00
Paul Gear	249707e2c6	Show agent execution time in seconds ... Because a graph that shows a value of 1.25k milliseconds doesn't make a lot of sense.	2015-07-11 18:15:15 +10:00
Paul Gear	c3adf36d88	Allow dividing as well as multiplying	2015-07-11 18:15:15 +10:00
Paul Gear	5ea6762f20	phpcbf run	2015-07-11 18:15:15 +10:00
Paul Gear	ef9049464a	Merge pull request #1402 from willjones/issue-1396 ... Add Meraki support	2015-07-10 22:02:03 +10:00
Daniel Preussker	7560d5dc57	Merge pull request #1411 from laf/issue-1289 ... Fixes a number of user permission issues	2015-07-10 09:51:31 +00:00
Paul Gear	1e508e9bf6	Merge pull request #1412 from laf/issue-1403 ... Added running status for bgp peers	2015-07-10 13:33:56 +10:00
Daniel Preussker	25b19babbb	Merge pull request #1413 from laf/issue-1398 ... Re-enabled the remove search link for devices!	2015-07-08 12:20:51 +00:00
Daniel Preussker	0dfd0dfb0f	Merge pull request #1353 from laf/issue-1348 ... Now save the connection value selected and remove when not needed	2015-07-08 12:17:48 +00:00
laf	dd32e01113	Re-enabled the remove search link for devices!	2015-07-08 00:22:36 +01:00
laf	88c838ca23	Added running status for bgp peers	2015-07-08 00:07:39 +01:00
laf	a044782420	Final updates to fix user perms for ipv4/ipv6 and mac search	2015-07-07 23:59:13 +01:00
laf	9a43454700	Fixed mac user perm queries	2015-07-07 23:34:56 +01:00
laf	fba1e6933a	removed debug	2015-07-07 23:28:00 +01:00
laf	3ed8d261a7	Fixed arp search page user perm queries	2015-07-07 23:26:03 +01:00
laf	b1a052f357	Some permission updates for non-admin users	2015-07-07 23:18:57 +01:00
willjones	7ab690f45e	Meraki Logo. Source = Meraki Partner Portal	2015-07-06 21:49:13 +01:00
Will Jones	93c0e8ae9c	Delete meraki.png	2015-07-06 21:37:18 +01:00
willjones	016b759858	Added Meraki OS discovery and polling	2015-07-06 21:17:50 +01:00
Tony Ditchfield	23fdc03ded	Added load and state icons from silkicons set	2015-07-05 20:58:56 +01:00
Travis Hegner	67257f868b	Merge remote-tracking branch 'upstream/master' into datepicker	2015-07-02 15:30:00 -04:00
Travis Hegner	6314aaddd4	removing commented code	2015-07-02 15:12:42 -04:00
Travis Hegner	6878e380b3	using moment.js since we have it anyway	2015-07-02 15:10:49 -04:00
Travis Hegner	d3aea6757b	trying a more universal (perhaps not standard) format	2015-07-02 15:05:05 -04:00
Travis Hegner	01e4a6650e	putting the T back with Z this time	2015-07-02 14:59:11 -04:00
Travis Hegner	0ab00ba0fb	debug output	2015-07-02 14:55:42 -04:00
Travis Hegner	0fbcc0d1b6	ff failing to parse	2015-07-02 14:54:36 -04:00