tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,054 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
Arturo Gonzalez 39d54518eb New transmap in progress (problem with merge from develop) 2016-05-30 13:13:39 +02:00
Arturo Gonzalez a4dd64bb8e Merge branch 'develop' into feature/transactional-map 
Conflicts:
	pandora_console/include/constants.php
	pandora_console/operation/menu.php
 2016-05-30 13:08:34 +02:00
Arturo Gonzalez c0ccd438a9 Saml login fixed 
(cherry picked from commit 02344033f3)
 2016-05-26 16:42:35 +02:00
Arturo Gonzalez 0ee5ccb6b6 Saml login, fixed constants 2016-05-26 15:45:41 +02:00
Arturo Gonzalez 268cc025d8 New transactional maps in progress... (Added constants to nodes and arrows) 2016-05-17 09:16:19 +02:00
mdtrooper 04c6bd9c88 Merge branch 'develop' into feature/new_networkmap 2016-05-13 11:39:18 +02:00
Alejandro Gallardo Escobar a90ae26178 Changed the default cell number of the dashboard from 9 to 4 
(cherry picked from commit bb853bf779)
 2016-05-11 18:16:24 +02:00
mdtrooper 78f044dbf5 Some fixes. 2016-04-26 15:03:53 +02:00
mdtrooper 074edb87e3 Added some constants. 2016-04-19 09:48:47 +02:00
mdtrooper b4b3cc720d Fixed the networkmaps new for the policies. 2016-04-18 19:16:26 +02:00
mdtrooper db8bff681b Fixed the groups in the networkmap new. 2016-04-18 17:21:56 +02:00
mdtrooper 676e6d884f Fixed the module groups in the networkmaps. 2016-04-13 18:00:24 +02:00
mdtrooper 2958e563c6 Updloaded lost changes in the constants 2016-04-06 12:26:49 +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 304928b2ec Working in the events for the fictional nodes. 2016-04-04 13:58:54 +02:00
mdtrooper aefff3041f Merge branch 'develop' into feature/new_networkmap 
Conflicts:
	pandora_console/include/constants.php
 2016-03-09 11:15:17 +01:00
Arturo Gonzalez fe18999778 Changed data in saml login 2016-03-01 11:55:18 +01:00
Arturo Gonzalez a3a38c9bb6 New login method (saml). Ticket#3393 2016-02-17 13:05:22 +01:00
mdtrooper c5f6259fce Working in the new networkmaps. 2016-02-17 12:25:03 +01:00
mdtrooper fe863f61df Working in the code of new networkmaps. 2016-02-08 13:47:46 +01:00
Arturo Gonzalez a5bcd25e5e New maps in progress... (List, edit and creation pages) 2016-02-02 14:10:13 +01:00
mdtrooper 71f38f7e02 Working in the migration. 2016-02-01 15:12:21 +01:00
mdtrooper b5e789c4f2 Move the lost dashboard contansts to the constants.php file. 2016-01-19 09:26:49 +01:00
mdtrooper 82c890410d Now the dates are showed in the locale of user. TICKET: #2487 2016-01-18 11:54:17 +01:00
mdtrooper 836b3a125a Killing some unicorns and magic numbers. 
(cherry picked from commit 4772b25f5d)
 2016-01-08 10:25:49 +01:00
m-lopez-f c72f024610 Add new custom graphs and fixed others graphs. 
New graphs:
	Bullet Chart
	Vertical Bars and Horizontal
	Pie
	Gauges
 2015-11-04 17:42:45 +01:00
Ramon Novoa f0b2aa23eb Added the Satellite Server to the server's view. 2015-10-14 14:58:34 +02:00
mdtrooper 63498fdbf7 Added percentile 95º in the stat win of module. TICKET: #2613 2015-08-20 17:55:10 +02:00
Alejandro Gallardo Escobar 468c7be463 Fixed the date format for Javascript 2015-08-10 17:02:36 +02:00
mdtrooper f1ada9076e Added a filter 'normal & critical' in severity into events. 2015-07-21 10:40:29 +02:00
mdtrooper 8fedb02afa Added the constant ERR_COULDNT_RESOLVE_HOST 
(cherry picked from commit 2b5d79b81c)
 2015-06-26 12:00:22 +02:00
mdtrooper 0be8792b01 Killing unicorns and magic numbers. 2015-06-11 20:45:40 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
 2015-05-06 17:02:40 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
mdtrooper 803c03956d Working in the refactoring the code of reports (custom_graph). 2015-03-25 16:44:39 +01:00
mdtrooper fdaa8865b2 Working in the code refactoring. 2015-03-24 11:01:19 +01:00
mdtrooper e7b79a0a8f Working in the new feature. 2015-03-23 11:08:58 +01:00
Alejandro Gallardo Escobar 3c600fe29d Added a new constant: 'AGENT_MODULE_STATUS_ALL' 2015-03-06 13:45:54 +01:00
mdtrooper 0919eb4fce Fixed PHP Warning lost constant about collections 2015-02-25 12:26:37 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
Alejandro Gallardo Escobar bfe87ff73f Added new constants and functions to get the status images in their 'ball' type 2015-01-12 11:02:20 +01:00
mdtrooper 48991738ca Working in the new code of treeview 2014-12-16 16:39:00 +01:00
mdtrooper 7edad2cb1d Working in the new elements for the visualmap. Ticket #1478 2014-11-24 16:40:59 +01:00
mdtrooper 22cff3c2b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 10:42:14 +01:00
mdtrooper a13f523596 Added new constant 'ERR_AUTH' 2014-10-22 12:56:40 +02:00
mdtrooper 02dbdf1648 Rewrote some parts of code of function ui_pagination. Ticket #1407 2014-10-10 14:42:50 +02:00
mdtrooper 86451b120d Fixed the constants are used in the collections. Ticket #1428 2014-10-08 12:59:45 +02:00
mdtrooper c1760a345d Cleaned source code style 2014-09-25 13:51:23 +02:00
mdtrooper 4033f5dae8 Uploaded constants about the collection status. 2014-09-10 16:11:36 +02:00