Commit Graph

9140 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 031cb3a3a0 Modified the email alert command to add the html editor activator to the field 3 2015-02-04 16:48:03 +01:00
Alejandro Gallardo Escobar 1fd8a8957b Added new functions to add or delete the tinymce editor with an element id 2015-02-04 16:20:20 +01:00
mdtrooper d12ef221b1 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2015-02-04 14:07:15 +01:00
mdtrooper 3a589d43a0 Fixed Perl Warning with undefined var 2015-02-04 14:07:09 +01:00
m-lopez-f e15e458aec Fixed problem in view of 'Tree view' with large data length. Reopen T#1748
(cherry picked from commit ded628da3e)
2015-02-04 13:11:45 +01:00
mdtrooper 7628ddb5c6 Set a data limit in the forms of massive operations. TICKET: #1700 2015-02-04 11:19:11 +01:00
m-lopez-f f5e645ec03 changed the form of display data in Agents/modules, show only agents enabled and agents with modules are same gruop module to selected in form
(cherry picked from commit bf663a93c2)
2015-02-04 11:15:27 +01:00
Alejandro Gallardo Escobar 4bb008b4eb Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-02-04 12:48:02 +01:00
Alejandro Gallardo Escobar 7405dffbb4 Now the filter form is hidden by default 2015-02-04 12:47:47 +01:00
Alejandro Gallardo Escobar c1ea771de0 Reduced the distance between the toggle and the content 2015-02-04 12:42:40 +01:00
artica 93ce434915 Auto-updated build strings. 2015-02-04 00:01:10 +01:00
m-lopez-f 84821a3729 Add help clippy in creation menus or views
Add clippy in:
Interval agent if this interval is < 300
Network maps>topology group
Create a new data server module in field 'Data Configuration'
In servers list, in column T/Q, when Q>200
2015-02-03 16:08:41 +01:00
m-lopez-f 87ebc49dc9 Changed location of servers down clippy 2015-02-03 15:43:44 +01:00
m-lopez-f 38fa5ac67a Changed page no access 2015-02-03 13:37:56 +01:00
m-lopez-f 455e1a7993 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-02-03 13:33:22 +01:00
m-lopez-f 9f43d2d2b2 Changed page no access 2015-02-03 13:33:00 +01:00
mdtrooper 9ff4ba1958 Fixed the graph for string module data. TICKET: #1749 2015-02-03 12:43:15 +01:00
m-lopez-f 0509d950ae Change text in help clippy for all servers down 2015-02-03 09:49:35 +01:00
m-lopez-f adf2bc3f6d Add clippy help for all servers down 2015-02-03 09:47:17 +01:00
artica b8307eba4a Auto-updated build strings. 2015-02-03 00:01:10 +01:00
Alejandro Gallardo Escobar 0023caf6ea Fixed an error that prevented the creation of a template when a template was selected 2015-02-02 19:53:08 +01:00
mdtrooper 45d036acdb Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2015-02-02 14:18:32 +01:00
mdtrooper 9bed03aefd Fixed PHP warnings. 2015-02-02 14:18:05 +01:00
Alejandro Gallardo Escobar f59ba6f860 Added a network interfaces table to the agent detail table 2015-02-02 13:27:32 +01:00
Alejandro Gallardo Escobar 84b617e7a7 Fixed the forced title 2015-02-02 13:26:47 +01:00
Alejandro Gallardo Escobar 107b2bdb1c Improved the creation of the network interfaces table 2015-02-02 13:22:35 +01:00
Alejandro Gallardo Escobar a74dafdb49 Fixed an error with the ip retrieving on the function "agents_get_network_interfaces" 2015-02-02 13:16:31 +01:00
m-lopez-f d4de8b3856 Add width in table view data in tree view 2015-02-02 10:24:29 +01:00
m-lopez-f 38be10c94f Fixed align in view table data in tree view
(cherry picked from commit 18939f4249)
2015-02-02 10:20:40 +01:00
artica 50c150d492 Auto-updated build strings. 2015-02-02 00:01:07 +01:00
artica c867c556e5 Auto-updated build strings. 2015-02-01 00:01:08 +01:00
artica 62aa56ec1e Auto-updated build strings. 2015-01-31 00:01:42 +01:00
Ramon Novoa 52758574b7 Update the server's version. Fixes ticket #1739. 2015-01-30 19:32:35 +01:00
Alejandro Gallardo Escobar f6e31d4a17 Modified the view to restrict some controls when the strict ACL is enabled 2015-01-30 20:41:54 +01:00
Alejandro Gallardo Escobar 4cf9accbd7 Merge branch 'feature/NewTreeView' into develop 2015-01-30 20:10:16 +01:00
Alejandro Gallardo Escobar 62cb13cd6c Removed the tree views test file 2015-01-30 20:09:38 +01:00
Alejandro Gallardo Escobar d35e6bd360 Updated the old file to show the new tree views 2015-01-30 20:07:50 +01:00
Alejandro Gallardo Escobar 9880b60257 Fixed errors and added more information about the module alerts into the module nodes 2015-01-30 20:06:49 +01:00
Alejandro Gallardo Escobar ae829d042b Visual improvements 2015-01-30 20:05:42 +01:00
Alejandro Gallardo Escobar d7831dbb19 Improved the visual style of the output of the functions that print the agent, module and alert detail views 2015-01-30 20:04:56 +01:00
Vanessa Gil 9c99b99ac4 Fixed bug when checking acls to delete event. Ticket #1737. 2015-01-30 15:54:36 +01:00
Alejandro Gallardo Escobar 1127737f83 Error fixes related with the data retrieving for the tree views on the metaconsole 2015-01-30 15:32:39 +01:00
m-lopez-f 59e4fd13bf Change visual in 'Tactical server information' in third column
(cherry picked from commit 10993ef0f5)
2015-01-30 13:13:00 +01:00
m-lopez-f bfc250433a Fixed problems with absolete paths 2015-01-30 11:48:20 +01:00
m-lopez-f c6d1432433 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-01-30 11:42:03 +01:00
m-lopez-f 626a3b5527 Fixed problems with export audit log to csv when no data to show 2015-01-30 11:41:52 +01:00
Vanessa Gil bf4b87258e Fixed bug #1733. 2015-01-30 11:33:04 +01:00
m-lopez-f fea686dfc5 Change order to show info in 'Tactical server information' about data server
(cherry picked from commit f1f1e7ba94)
2015-01-30 10:08:04 +01:00
Ramon Novoa 061216156b Changed a library name.
(cherry picked from commit f7842d8702)
2015-01-30 10:02:38 +01:00
artica 4ad250b464 Auto-updated build strings. 2015-01-30 00:01:09 +01:00