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

6521 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 4c933c3434 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView 
Conflicts resolved:
	pandora_console/operation/tree2.php
 2014-12-18 11:54:11 +01:00
Alejandro Gallardo Escobar 677c8cfa0d Now the tree dissapear when a new search is done 2014-12-18 11:50:11 +01:00
Alejandro Gallardo Escobar 36cae31017 Now the leaf icons has the pointer cursor 2014-12-18 11:49:21 +01:00
mdtrooper 56119d0b28 Remove the double slash in the urls of ajax 2014-12-18 11:46:41 +01:00
mdtrooper 82851e146b Hide the old tree when loading a new filtered tree 2014-12-18 11:43:06 +01:00
Alejandro Gallardo Escobar 96f6659b34 Now the children are shown again 2014-12-18 11:20:21 +01:00
Alejandro Gallardo Escobar cd560178c0 Fix 2014-12-18 11:09:46 +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 b628faaeac Added test code 2014-12-17 12:26:41 +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
mdtrooper 24101c00c1 First commit of new treeview 2014-12-16 13:08:02 +01:00
Alejandro Gallardo Escobar 4b42222719 Now the tree images will be in the images folder. The operation/tree folder will be removed when this feature ends 2014-12-16 12:59:45 +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
Alejandro Gallardo Escobar 220466fa1f Added the double auth functionality to the mobile version 2014-12-15 13:47:33 +01:00
artica 151f2a5b59 Auto-updated build strings. 2014-12-13 00:01:12 +01:00
mdtrooper 9277ea1b80 Added info dialog with the modules and components that lock a server plugin 2014-12-12 15:01:50 +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 8c3a5cedb7 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 61aee8d419 Added two new OS icons. 2014-12-12 13:52:47 +01:00
Ramon Novoa d46c114fd8 Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
Alejandro Gallardo Escobar c15df44434 Fixed the 2 step login 2014-12-12 12:38:08 +01:00
artica e0a80add4b Auto-updated build strings. 2014-12-12 00:01:10 +01:00
Alejandro Gallardo Escobar 5e80428ed9 Revert "Fixed some paths" 
This reverts commit 7d1894e2ca.
 2014-12-11 18:49:04 +01:00
Alejandro Gallardo Escobar 123fdaee1a Minor fixes 2014-12-11 18:43:30 +01:00
Alejandro Gallardo Escobar 716a52e94d Fixed some paths 2014-12-11 18:43:16 +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 0d54510462 Modifications on the login process to include the 2 step verification 2014-12-11 16:18:26 +01:00
Alejandro Gallardo Escobar 96511fe25a Now the user can enable and configure the 2 step auth 2014-12-11 16:17:35 +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 d399ccbd1f Added a new table called 'tuser_double_auth' 2014-12-11 16:11:21 +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
Ramon Novoa 26c9184f85 Fixed a string (needs translations too). 2014-12-05 15:29:12 +01:00
Alejandro Gallardo Escobar 6f9b87fae0 Merge branch 'feature/ticket#1412-AgentLogViewer' into develop 2014-12-05 10:50:23 +01:00
Alejandro Gallardo Escobar 4792299b5a Added a new tab to the agent view 2014-12-05 10:49:50 +01:00
artica 2a293139ec Auto-updated build strings. 2014-12-05 00:01:09 +01:00
Alejandro Gallardo Escobar 9ed9009596 Now the tree view tabs keep the 'pure' status 2014-12-04 17:48:02 +01:00
Alejandro Gallardo Escobar fb795d2a20 Merge branch 'feature/ticket#1612-GisAgentBubble' into develop 2014-12-04 16:40:16 +01:00
Alejandro Gallardo Escobar a706dfa917 Improved the agent info bubble returned via ajax. Ticket #1612 2014-12-04 16:39:29 +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
Alejandro Gallardo Escobar 10bf2819d6 Now many network maps can be deleted at once 2014-12-04 12:19:52 +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
mdtrooper e2066a335c Fixed the description show in the table of agents. 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
mdtrooper b0ee3ed266 Added the lost fields for item group in the element list. 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
mdtrooper b7fe0c2cdc First commit in the monday, a tiny fix of styles of logon page with huge news text. 2014-12-01 09:53:41 +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 5211c48643 Fixed the new autologin for the graph link and edit link 2014-11-26 19:51:50 +01:00
Vanessa Gil 1fde3f7854 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2014-11-26 16:48:52 +01:00
Vanessa Gil 815e974c0a Fixed links in monitor view. 2014-11-26 16:48:13 +01:00
mdtrooper a8a1bade0d Merge branch 'feature/ticket#1478-New_elements_visualmap' into develop 2014-11-26 16:12:38 +01:00
mdtrooper e98a2fa535 Change the pandoradb_data.sql for to avoid the conflict in the merge with develop. 2014-11-26 16:12:22 +01:00
mdtrooper 352c63087c The last work for the new elements into the visualmap. Ticket #1478 2014-11-26 16:03:40 +01:00
mdtrooper 61ecef9ef9 Working in the new elements for the visualmap. Ticket #1478 2014-11-26 15:33:07 +01:00
artica 12160c9a2d Auto-updated build strings. 2014-11-26 00:01:09 +01:00
mdtrooper 0bc0fb1d7b Working in the new elements for the visualmap. Ticket #1478 2014-11-25 18:59:05 +01:00
mdtrooper 35739261fb Working in the new elements for the visualmap. Ticket #1478 2014-11-25 18:55:45 +01:00