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

3768 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 96f6659b34 Now the children are shown again 2014-12-18 11:20:21 +01:00
Alejandro Gallardo Escobar c647ae8048 Fixes 2014-12-18 11:04:41 +01:00
Alejandro Gallardo Escobar a045faeb6d Minor changes 2014-12-18 09:55:54 +01:00
Alejandro Gallardo Escobar 76cc5d8a96 More fixes 2014-12-17 20:12:21 +01:00
mdtrooper 3556621cf0 Changed code for to run with Alex's code 2014-12-17 19:56:42 +01:00
Alejandro Gallardo Escobar 9191b97f07 Fixes 2014-12-17 19:46:33 +01:00
Alejandro Gallardo Escobar 9b8f53691a Fixes 2014-12-17 19:45:09 +01:00
Alejandro Gallardo Escobar 530454ea72 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView 
Conflicts resolved:
	pandora_console/include/javascript/tree/TreeController.js
 2014-12-17 19:13:23 +01:00
Alejandro Gallardo Escobar 304b36b13a Too lazy to explain 2014-12-17 19:11:07 +01:00
mdtrooper 9c60470d49 Working in the new code of treeview 2014-12-17 19:00:48 +01:00
Alejandro Gallardo Escobar 283dfb3160 Added new parameters and an icon to the tree root 2014-12-17 13:48:17 +01:00
Alejandro Gallardo Escobar 826dd6026a Improved the visual style 2014-12-17 13:47:40 +01:00
Alejandro Gallardo Escobar daca918ee6 Updated the tree style 2014-12-16 19:57:48 +01:00
Alejandro Gallardo Escobar a70df3c3e4 Added a new controller to process and show the tree data 2014-12-16 18:32:01 +01:00
Alejandro Gallardo Escobar cb3283a402 Added new style rules to the new tree view 2014-12-16 18:31:18 +01:00
mdtrooper 48991738ca Working in the new code of treeview 2014-12-16 16:39:00 +01:00
Alejandro Gallardo Escobar 52e6dda3b4 Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 
Resolved conflicts:
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
	pandora_console/include/styles/pandora.css
 2014-12-15 15:06:29 +01:00
artica 151f2a5b59 Auto-updated build strings. 2014-12-13 00:01:12 +01:00
mdtrooper d78461a92c Working in the improvements. Incident#1574 2014-12-12 15:01:50 +01:00
mdtrooper b42d643968 Finish the working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper 5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper 8633186b0e Working in the improvements. Incident#1574 2014-12-12 15:00:21 +01:00
Ramon Novoa d46c114fd8 Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
artica e0a80add4b Auto-updated build strings. 2014-12-12 00:01:10 +01:00
Alejandro Gallardo Escobar 9512216ed6 Moved some functions 2014-12-11 18:19:47 +01:00
Alejandro Gallardo Escobar 30f24ff583 Modifications on the ajax calls to gain compatibility 2014-12-11 17:00:55 +01:00
Alejandro Gallardo Escobar 7caf016e4d Added some new rules 2014-12-11 16:16:36 +01:00
Alejandro Gallardo Escobar 33c6789144 Added an option to allow the users to enable the 2 step auth 2014-12-11 16:14:55 +01:00
Alejandro Gallardo Escobar 3c1dbbdc73 File with double auth utilities to be accessed by ajax 2014-12-11 16:10:15 +01:00
Alejandro Gallardo Escobar b71082ccdb Added a class to perform google autenticator checks 2014-12-11 16:09:17 +01:00
mdtrooper 9019b9c78f Fixed the bar charts with all values equal to 0. 2014-12-11 13:48:51 +01:00
artica 523d9dba7e Auto-updated build strings. 2014-12-11 00:01:07 +01:00
artica 7430c87ea0 Auto-updated build strings. 2014-12-10 00:01:10 +01:00
mdtrooper 704b3932a4 Working in the massive action for the tags in policies. Ticket: #1576 2014-12-09 15:57:35 +01:00
artica 95e57c41fe Auto-updated build strings. 2014-12-09 00:01:08 +01:00
artica 6b845912f2 Auto-updated build strings. 2014-12-08 00:01:09 +01:00
artica 8dc47efb5d Auto-updated build strings. 2014-12-07 00:01:08 +01:00
artica 153c666a1b Auto-updated build strings. 2014-12-06 00:01:09 +01:00
artica 2a293139ec Auto-updated build strings. 2014-12-05 00:01:09 +01:00
mdtrooper d20c945af8 Fixed the count of ok agents in the group view into the treeview 
(cherry picked from commit b711dcdd34)

Conflicts:
	pandora_console/include/functions_groups.php
 2014-12-04 16:33:34 +01:00
mdtrooper 1bd2166d7e Cleaned source code style. (only for test git) 2014-12-04 14:39:35 +01:00
mdtrooper 03890a5295 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:41 +01:00
mdtrooper 3a3db3f0f7 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:37 +01:00
artica bc27d934de Auto-updated build strings. 2014-12-04 00:01:10 +01:00
mdtrooper f25440d68a Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
mdtrooper e45b8183d8 Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
Vanessa Gil 7806cee6fd Fixed several bugs with acl tags. 2014-12-03 10:27:27 +01:00
artica 1587428f57 Auto-updated build strings. 2014-12-03 00:01:09 +01:00
mdtrooper 303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
mdtrooper 673d0bd34f Added the lost fields for item group in the editor. 2014-12-02 11:40:27 +01:00
artica ab5c8d4948 Auto-updated build strings. 2014-12-02 00:01:10 +01:00
mdtrooper 333781b203 Fixed the not init agents in the tree group view. Ticket: #1584 2014-12-01 16:37:40 +01:00
mdtrooper 3c76f41387 Fixed the group view for agents not init. Ticket: #1584 2014-12-01 13:56:40 +01:00
artica 3d4eb5a399 Auto-updated build strings. 2014-12-01 00:01:08 +01:00
artica 1f3e07cf75 Auto-updated build strings. 2014-11-30 00:01:08 +01:00
artica af5669a96d Auto-updated build strings. 2014-11-29 00:01:09 +01:00
mdtrooper ba24c38940 Fix the ACL tags in the edit module view. Ticket: #1602 2014-11-28 16:38:44 +01:00
mdtrooper 6ba6290830 Fixed the lost id_group in the items on visualmap. Ticket #1586 2014-11-28 16:37:07 +01:00
artica 0d9c5277aa Auto-updated build strings. 2014-11-28 00:01:08 +01:00
artica 9dabd9ce8d Auto-updated build strings. 2014-11-27 00:01:09 +01:00
mdtrooper a8a1bade0d Merge branch 'feature/ticket#1478-New_elements_visualmap' into develop 2014-11-26 16:12:38 +01:00
artica 12160c9a2d Auto-updated build strings. 2014-11-26 00:01:09 +01:00
Vanessa Gil af1b7c1f64 Fixed several bugs in events. 2014-11-25 16:58:20 +01:00
mdtrooper e48580c93a Working in the new elements for the visualmap. Ticket #1478 2014-11-25 13:15:51 +01:00
mdtrooper 018c5136c5 Working in the new elements for the visualmap. Ticket #1478 2014-11-25 11:52:04 +01:00
mdtrooper 631f0ee2b7 Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00
artica 6011b413dd Auto-updated build strings. 2014-11-25 00:01:09 +01:00
mdtrooper c7514cd29c Working in the new elements for the visualmap. Ticket #1478 2014-11-24 17:52:28 +01:00
mdtrooper 7edad2cb1d Working in the new elements for the visualmap. Ticket #1478 2014-11-24 16:40:59 +01:00
artica b0dde88f6d Auto-updated build strings. 2014-11-24 00:01:08 +01:00
artica 5326a799e0 Auto-updated build strings. 2014-11-23 00:01:08 +01:00
artica 124e2c39d1 Auto-updated build strings. 2014-11-22 00:01:09 +01:00
Alejandro Gallardo Escobar 07eb065a99 Now the boolean and module string graphs can search data into the history database 2014-11-21 16:01:01 +01:00
mdtrooper e63886e1e7 Fixed the box for the dashboard. 2014-11-21 13:41:20 +01:00
mdtrooper 9f7c8d4483 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 13:28:11 +01:00
mdtrooper 22cff3c2b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 10:42:14 +01:00
artica 472a360dbe Auto-updated build strings. 2014-11-21 00:01:09 +01:00
Vanessa Gil afadc5b0bb Fixed bug in event list. 2014-11-20 15:36:29 +01:00
mdtrooper bda09a22e1 Added in setup visual a check for to show the group as text. Ticket: #1501 2014-11-20 15:06:11 +01:00
mdtrooper bb05dfcd58 Fixed PHP warning about the unset 'server_log_dir' 2014-11-20 12:49:13 +01:00
artica 4aed3a4906 Auto-updated build strings. 2014-11-20 00:01:10 +01:00
mdtrooper afebae0b80 Added the toolbox button for copy items. Ticket: #1479 2014-11-19 16:30:01 +01:00
mdtrooper 7ba791f787 Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
mdtrooper 3b00d4df58 Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
mdtrooper c509a3195d Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
mdtrooper 6008df9fc9 Working in the fusion of code of edition and view 2014-11-19 16:30:01 +01:00
mdtrooper 9e2626141b Working in the fusion 2014-11-19 16:30:01 +01:00
mdtrooper b2b163af46 Working in the fusion 2014-11-19 16:30:01 +01:00
mdtrooper 2401c68b26 Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:01 +01:00
mdtrooper a4bbfd40af Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:01 +01:00
mdtrooper 4a51f0c9f7 Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:01 +01:00
mdtrooper e48f675935 Removed the un used field label_color. 2014-11-19 16:30:00 +01:00
mdtrooper a9498399df Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:00 +01:00
mdtrooper 63d783907f Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:00 +01:00
mdtrooper c6987bdc0d Starting to the fusion. 2014-11-19 16:30:00 +01:00
mdtrooper 97278f60d2 Erased the deprecated field 'no_link_color' in table 'tlayout_data' 2014-11-19 16:30:00 +01:00
artica f587e837b0 Auto-updated build strings. 2014-11-19 00:01:09 +01:00
Alejandro Gallardo Escobar 144deab9d6 Fixed the agent module sla array data for the slicebar 2014-11-18 18:22:23 +01:00
Vanessa Gil e8f5fabeba Fixed tickets #1562, #1556. 2014-11-18 11:27:04 +01:00
artica 0423b93b4c Auto-updated build strings. 2014-11-18 00:01:13 +01:00