Commit Graph

224 Commits

Author SHA1 Message Date
mdtrooper 350f653d47 Set initial status colors for the nodes. 2016-04-05 14:50:04 +02:00
mdtrooper 8bb0e5e194 Working in the networkmap nodes. 2016-04-05 13:19:02 +02:00
mdtrooper e6fbb6d41d Starting to set the aspect to networkmap node. 2016-04-04 20:21:36 +02:00
mdtrooper b9000bb285 Starting with the fictional point. 2016-04-04 13:43:05 +02:00
mdtrooper ee431b369d Starting with the title of interfaces in the arrows. 2016-03-23 15:47:05 +01:00
mdtrooper 11c75259d3 Working in the paint arrows A-M-M-A 2016-03-21 17:03:14 +01:00
mdtrooper 800756b9ac Working in the arrows A-M-A 2016-03-21 15:34:33 +01:00
mdtrooper 4f4f8538a4 Some changes for arrows. 2016-03-18 16:58:50 +01:00
mdtrooper 135ae1dd16 Mixed the networkmap level 2 and level 3 2016-03-18 16:19:33 +01:00
Arturo Gonzalez 3a4f0ef9cd New maps in progress... (Fixed error) 2016-03-18 08:57:52 +01:00
Arturo Gonzalez 527c7d0edc New maps in progress... (networkmap arrows use system) 2016-03-18 08:50:12 +01:00
Arturo Gonzalez 3e313c8c43 New maps in progress... (Works in the fantastic arrows... thx mdtrooper) 2016-03-17 17:42:54 +01:00
mdtrooper 9ee921f9c1 Move the styles to the pandora.css 2016-03-09 11:45:48 +01:00
mdtrooper aefff3041f Merge branch 'develop' into feature/new_networkmap
Conflicts:
	pandora_console/include/constants.php
2016-03-09 11:15:17 +01:00
mdtrooper d9c813969c Working in the selection. 2016-03-09 11:11:14 +01:00
Arturo Gonzalez 92afe7614d New maps in progress... (Node context menu tests) 2016-03-08 15:40:11 +01:00
mdtrooper 1b60dbb7ad https://bugzilla.mozilla.org/show_bug.cgi?id=1254159 2016-03-08 15:37:20 +01:00
mdtrooper b6aba10c9b Fixed some things in the arrows. 2016-03-07 14:51:58 +01:00
Arturo Gonzalez ab1d7f99fc New maps in progress... (Fixing arrow position) 2016-03-07 11:05:31 +01:00
Arturo Gonzalez c75929d840 New maps in progress... (Fixing arrow position) 2016-03-07 10:48:03 +01:00
mdtrooper aa8ce714d8 Fixed the cached svgs. 2016-03-04 15:20:27 +01:00
mdtrooper ba17caf0ec Some fixes in the arrows. 2016-03-03 15:38:15 +01:00
mdtrooper c6f65455e7 Some fixes in the arrows. 2016-03-03 15:08:05 +01:00
Arturo Gonzalez 437d7b539f Fixed error in tree view (meta and strict user with tags). Ticket3437 2016-03-02 15:25:40 +01:00
mdtrooper 834d3c3e5b Some work in the new networkmaps 2016-03-01 16:37:10 +01:00
mdtrooper 78bf99e9f0 Some changes 2016-02-25 16:18:14 +01:00
mdtrooper 6d7286ec6f Fixed the last commit. 2016-02-24 14:12:07 +01:00
mdtrooper 6c037e0ef7 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap
Conflicts:
	pandora_console/include/class/Map.class.php
	pandora_console/include/javascript/map/MapController.js
2016-02-24 14:06:24 +01:00
mdtrooper b345467fa0 Some work on the drag and drop 2016-02-24 13:59:39 +01:00
Arturo Gonzalez cccce11f79 New maps in progress... (get node data) 2016-02-24 13:04:38 +01:00
Arturo Gonzalez bd736ea598 New maps in progress... (get node data) 2016-02-24 11:45:08 +01:00
Arturo Gonzalez fcc42ce5a3 New maps in progress... (new ajax and class files for nodes) 2016-02-24 10:00:01 +01:00
mdtrooper 5f7eee5bc8 Fixed the zoom controller, thanks to R.Novoa 2016-02-23 16:48:58 +01:00
mdtrooper e2b8870afe Working in the home zoom button 2016-02-23 09:33:49 +01:00
mdtrooper 967aac57ef Starting to working in the zoom bar controller. 2016-02-22 18:54:19 +01:00
mdtrooper 952dd081ab Restore the code before the testing svg. 2016-02-22 17:17:03 +01:00
mdtrooper c66445d3a5 Change the code for testing the svg bug. 2016-02-22 17:14:18 +01:00
mdtrooper d12eb3f8ea Add tiny improvement 2016-02-22 13:18:54 +01:00
mdtrooper e7b664dd63 Some changes that we need. 2016-02-22 13:02:06 +01:00
mdtrooper 646a90211e Some changes needs for the zoom. 2016-02-22 12:05:28 +01:00
Arturo Gonzalez 400620a11f New maps in progress... (tooltipster css files added) 2016-02-22 11:48:42 +01:00
mdtrooper 0b8ec4a89d Added another library (jquery.svg.js) for to fix jquery bug (the pretty jquery can not work with "svg dom"...I love it). 2016-02-19 13:17:18 +01:00
mdtrooper 1d936ad230 First version of scroll and pan of new networkmap but it is buggy. 2016-02-18 16:51:03 +01:00
mdtrooper 5659589e01 Fixed the bug in the generation nodes. 2016-02-18 16:49:11 +01:00
Arturo Gonzalez b20828c85d New maps in progress... (Added css reference to TOOLTIPSTER!) 2016-02-18 15:33:24 +01:00
mdtrooper 8e7103e097 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap 2016-02-18 11:07:13 +01:00
Arturo Gonzalez 42e962c5ed New maps in progress. Added tooltip plugin to test. 2016-02-18 10:51:33 +01:00
mdtrooper 6dbf6e18f2 Working in the new networkmap. 2016-02-17 18:31:46 +01:00
mdtrooper fb3b4d8a6f Some fixes, thanks Arturo. 2016-02-17 15:36:44 +01:00
mdtrooper c5f6259fce Working in the new networkmaps. 2016-02-17 12:25:03 +01:00
Arturo Gonzalez dc051c0c09 Thanks god for strict acl. Ticket#3391 2016-02-16 18:06:46 +01:00
Arturo Gonzalez daae8b9088 Fixed problem in tree view with parent nodes and permissions. Ticket#3388 2016-02-16 16:21:21 +01:00
mdtrooper 69774bc4e2 Some changes to upload 2016-02-15 12:15:16 +01:00
mdtrooper 9d2c2049cf Some debug traces for the jobmate for the next monday. 2016-02-12 17:22:44 +01:00
mdtrooper 37b0e972b3 Working in the actual filters with the old generation method. 2016-02-12 16:28:07 +01:00
mdtrooper 9376e9aa6d Merge branch 'develop' into feature/new_networkmap 2016-02-10 14:54:08 +01:00
Arturo Gonzalez 5a908d8c02 New maps in progress... (Added fields to creation) 2016-02-10 14:17:08 +01:00
mdtrooper df25018631 Working in the code of new networkmap. 2016-02-10 14:01:10 +01:00
mdtrooper 4c894fd04a Fixed the young javascript code. 2016-02-09 16:18:05 +01:00
mdtrooper 1d6b9dfc19 Working in the new networkmap. 2016-02-09 13:52:03 +01:00
mdtrooper 230e4071b3 Fixed the lost javascript include 2016-02-09 11:03:34 +01:00
mdtrooper fe863f61df Working in the code of new networkmaps. 2016-02-08 13:47:46 +01:00
mdtrooper 9307a6e77e Starting with the javascript objects for the new maps. 2016-02-05 15:53:59 +01:00
mdtrooper 35159cf1ac Remove a proof concept files. Thanks Arturo for the work. 2016-02-05 12:06:42 +01:00
Arturo Gonzalez 83675ed4c6 New maps in progress... (interface implementation) 2016-02-04 17:40:17 +01:00
mdtrooper ca19d447cb Working in the new features. 2016-02-04 16:59:40 +01:00
mdtrooper f90ed7a05b Starting the useful classes for the new networkmaps. 2016-02-04 12:06:45 +01:00
Arturo Gonzalez 1c44ee0e90 Fixed extra time in Tree View 2016-01-29 11:50:16 +01:00
Arturo Gonzalez 10980a8106 Fixed minor bug with Tree view. 2016-01-28 14:38:23 +01:00
Arturo Gonzalez 0984a06f25 Fixed agents count in tree view. Ticket#3248 2016-01-28 11:09:09 +01:00
Arturo Gonzalez 4821378d4a Fixed problem when searches strange modules in tree (group tree). Ticket #3204 2016-01-14 12:54:17 +01:00
Alejandro Gallardo Escobar 571d5e571e Rewrited the processing, sorting and hierarchy building of the groups.
Fixes ticket #3084.
2015-12-16 11:43:37 +01:00
Alejandro Gallardo Escobar 85f7e49cd5 Modified the access permission to the modules when the user has common ACL 2015-09-30 18:32:55 +02:00
m-lopez-f 6b6f18a695 When user hace acl's and tags dont see data in tree view, its fixed. Tiquet:#2508 2015-07-21 13:26:07 +02:00
Alejandro Gallardo Escobar 89fe54d28a Error fixes 2015-07-06 18:26:44 +02:00
Alejandro Gallardo Escobar 5b36f3aacf Fixed an error on the filter 2015-07-02 13:11:24 +02:00
Alejandro Gallardo Escobar dde4e21e60 Fixed an error with the group counters of the tree view 2015-06-30 16:14:50 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper 819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
Alejandro Gallardo Escobar eb965ff7da Fixed the data retrieving with oracle databases 2015-05-14 17:57:59 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
Alejandro Gallardo Escobar 8a348c2411 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-23 15:02:27 +02:00
m-lopez-f 896e6329c8 Fixed problems with title when open graph in tree view in meta and nodo, tiquet: #2077 2015-04-21 10:44:50 +02:00
Alejandro Gallardo Escobar 8826f0c80c Adapted the code to improve the performance of the tree view on the metaconsole with the 'tmetaconsole_agent' 2015-04-17 16:12:51 +02:00
m-lopez-f a756ef1ab5 Fixed filter by name module in tree view, Node and Meta. tiquet: 2056 2015-03-31 14:46:43 +02:00
Alejandro Gallardo Escobar 08d93c8b28 Now the 'avg_only' option is enabled by default for the metaconsole users 2015-03-25 19:20:48 +01:00
Alejandro Gallardo Escobar 481addb514 ACL improvements 2015-03-24 19:10:09 +01:00
Alejandro Gallardo Escobar 857d9e2e11 Fixed a PHP syntax error 2015-03-23 21:02:06 +01:00
Alejandro Gallardo Escobar da8570d3b9 Added support to show the interface traffic graphs through the metaconsole and improved the ACL 2015-03-23 20:51:44 +01:00
Alejandro Gallardo Escobar 5a07aabecd Now the monitor graphs of the tree view modules are 'only average' on the metaconsole 2015-03-13 14:18:15 +01:00
Alejandro Gallardo Escobar ba6c8809de Fixed the agent status filter for the strict ACL users 2015-03-13 13:54:09 +01:00
Alejandro Gallardo Escobar 59de2a0597 Fixed on the agent counters for the strict ACL users 2015-03-12 15:06:40 +01:00
Alejandro Gallardo Escobar 89c307bd5d Fixed a status filter error 2015-03-11 21:24:58 +01:00
Alejandro Gallardo Escobar ecb5a4097f A lot of changes into the agents and modules counters 2015-03-11 21:06:16 +01:00
Alejandro Gallardo Escobar d0dff23658 Added tag/group filter support to the metaconsole 2015-03-09 21:12:57 +01:00
Alejandro Gallardo Escobar 79b77a6ecf Error fixes (again) 2015-03-09 20:43:41 +01:00
Alejandro Gallardo Escobar eab7e8dc66 Error fixes 2015-03-09 20:41:23 +01:00
Alejandro Gallardo Escobar d8ead991c8 Error fixes 2015-03-09 20:19:55 +01:00
Alejandro Gallardo Escobar 4e76794f90 Minor fix 2015-03-09 19:37:29 +01:00