tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-24 03:08:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
34,376 Commits 34 Branches 30 Tags
Commit Graph

5147 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar
4f12ffce8c Minor fixes 2014-12-18 14:43:45 +01:00
Alejandro Gallardo Escobar
678755aa24 Removed the test code of the new tree view 2014-12-18 14:42:00 +01:00
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
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
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
76cc5d8a96 More fixes 2014-12-17 20:12:21 +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
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
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
mdtrooper
95873d9356 Added api for metaconsole. Ticket: #1474 2014-12-15 19:39:05 +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
mdtrooper
5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +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
96511fe25a Now the user can enable and configure the 2 step auth 2014-12-11 16:17:35 +01:00
Alejandro Gallardo Escobar
4792299b5a Added a new tab to the agent view 2014-12-05 10:49:50 +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
a706dfa917 Improved the agent info bubble returned via ajax. Ticket #1612 2014-12-04 16:39:29 +01:00
Alejandro Gallardo Escobar
10bf2819d6 Now many network maps can be deleted at once 2014-12-04 12:19:52 +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
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
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
5211c48643 Fixed the new autologin for the graph link and edit link 2014-11-26 19:51:50 +01:00
Vanessa Gil
815e974c0a Fixed links in monitor view. 2014-11-26 16:48:13 +01:00
Vanessa Gil
af1b7c1f64 Fixed several bugs in events. 2014-11-25 16:58:20 +01:00
mdtrooper
a70fc62af0 Fixed typo error in stat_win.php. 2014-11-25 14:30:30 +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
mdtrooper
7ba791f787 Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
mdtrooper
5cf7927240 Cleaned source code style 2014-11-19 16:30:00 +01:00
mdtrooper
45c33786e3 Erased the deprecated field 'fullscreen' in table 'tlayout' 2014-11-19 16:30:00 +01:00
Vanessa Gil
09f5956ee1 Fixed bug in event list. 2014-11-18 15:18:00 +01:00
Vanessa Gil
e8f5fabeba Fixed tickets #1562, #1556. 2014-11-18 11:27:04 +01:00
mdtrooper
a3939687ed Fixed the javascript code that uses the history reservate word 2014-10-30 18:48:37 +01:00
mdtrooper
27f70d34a1 Fixed, set the error level to other more low, and fixed unclosed tag. Ticket: #1499 2014-10-28 11:21:14 +01:00
mdtrooper
edf25fe620 Fixed the style for the agents with a hudge list of ips 2014-10-24 11:03:45 +02:00
mdtrooper
c66ca5251a Fixed the access (and listing in global search) to module with ACL tags. Ticket #1472 2014-10-20 16:45:47 +02:00
Alejandro Gallardo Escobar
e650725439 Removed the definition of a javascript function 2014-10-20 13:18:31 +02:00
Alejandro Gallardo Escobar
0a72ae3032 Fixed the subtree load after login into Pandora FMS. Fixes the ticket #1467 2014-10-17 17:29:54 +02:00
mdtrooper
26ac085975 Fixed the exportation data with some dates. Ticket #1455 2014-10-16 16:10:53 +02:00