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

9662 Commits

Author SHA1 Message Date
artica 4e0e988508 Auto-updated build strings. 2015-04-20 00:01:10 +02:00
Junichi Satoh 129e9d0dfa Added php json extension check. 2015-04-19 23:26:17 +09:00
Junichi Satoh b4dbefaf66 Updated help. 2015-04-19 17:06:05 +09:00
Junichi Satoh ece9cdb4b3 Updated help. 2015-04-19 13:48:46 +09:00
artica 1f06f8ec92 Auto-updated build strings. 2015-04-19 00:01:10 +02:00
artica d7b6fb05b4 Auto-updated build strings. 2015-04-18 00:01:11 +02:00
Alejandro Gallardo Escobar 968c179c0c Merge branch 'develop' into feature/meta-agent-cache 2015-04-17 16:16:48 +02:00
Alejandro Gallardo Escobar 8826f0c80c Adapted the code to improve the performance of the tree view on the metaconsole with the 'tmetaconsole_agent' 2015-04-17 16:12:51 +02:00
Vanessa Gil f34c10df09 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-17 14:55:31 +02:00
Vanessa Gil 1c3f0275b1 Ticket #1353. 2015-04-17 14:54:17 +02:00
m-lopez-f eb5180d582 Merge branch 'feature/NewView' into develop 2015-04-17 13:06:20 +02:00
Ramon Novoa 250ef13bca Remove \n and \r from event descriptions. 2015-04-17 12:43:43 +02:00
artica 332c5b0af5 Auto-updated build strings. 2015-04-17 00:01:30 +02:00
mdtrooper ec39e664fa Fixed the SLA with a period have a setted a time slots. 
(cherry picked from commit c5b5d60d4c)
 2015-04-16 19:21:13 +02:00
m-lopez-f 44128e3570 Merge branch 'develop' into feature/NewView 2015-04-16 16:00:56 +02:00
mdtrooper 3dbd433285 Fixed the history data in boolean and string charts. 
(cherry picked from commit f24919fe4b)
 2015-04-16 15:38:59 +02:00
m-lopez-f 036538baa9 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 15:18:28 +02:00
m-lopez-f 0df919dcdd Fixed order data to click in show data module in tree view,tiquet: #2080 2015-04-16 15:18:11 +02:00
Alejandro Gallardo Escobar e0165a4ab3 Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 14:23:34 +02:00
Alejandro Gallardo Escobar 190e105baa Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 13:40:42 +02:00
Alejandro Gallardo Escobar 08dd1832ac Found and removed the async ajax calls (finally!). That was a very bad practice. 
Also removed the alert, cause after closing it, the blur event was executed again, with another alert that repeated the process.
 2015-04-16 13:29:23 +02:00
Alejandro Gallardo Escobar a70d751c38 Removed the text of the agent search. 
The text 'All' makes no sense, cause the input searchs for it unnecessarily and the empty texts represents better the lack of filter.
 2015-04-16 13:16:50 +02:00
Vanessa Gil e93da42f5f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 12:38:43 +02:00
Vanessa Gil a0750e2b96 Fixed bug loading ajax. 2015-04-16 12:37:42 +02:00
Ramon Novoa 4f94d5bb50 Do not displayed advanced filters if custom filters are disabled. Small 
fixes.
 2015-04-16 11:35:20 +02:00
Ramon Novoa 79afef8cf8 Added support for metaconsole servers. 2015-04-16 11:35:20 +02:00
m-lopez-f db3e276195 Fixed error when flash_chart is false, colors of pie bad drawn, tiquet: #2107 2015-04-16 10:50:43 +02:00
m-lopez-f 42e81ccc5a Fixed style in menu and views and upload new images 2015-04-15 17:35:36 +02:00
Vanessa Gil 0899805c11 Update translations. 2015-04-15 15:34:54 +02:00
Alejandro Gallardo Escobar afada892fe Modified the 'group_get_data' and 'group_get_group_list' to retrieve the data from the metaconsole's new agent cache table 2015-04-15 15:29:07 +02:00
Vanessa Gil 7225b61530 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 13:14:33 +02:00
Vanessa Gil 802779c2b4 Change titles. 2015-04-15 13:14:03 +02:00
m-lopez-f 2813fac10b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 12:40:05 +02:00
m-lopez-f 80144fe8bd Change in event save filter, name of label(META), tiquet: #2075 2015-04-15 12:39:50 +02:00
Vanessa Gil a1c3f2d100 Group filter changed. 2015-04-15 12:22:07 +02:00
m-lopez-f 89fa37578a Changed rowspan size 2015-04-15 12:14:55 +02:00
m-lopez-f 012393d164 Changed javascript code to jquery code and fixed style 2015-04-15 12:13:47 +02:00
m-lopez-f b78f39f420 Delete develop traces 2015-04-15 11:30:50 +02:00
m-lopez-f a77d962590 Modify styles in tactical view and tables is responsibe with window size 2015-04-15 11:28:07 +02:00
m-lopez-f 25277eb550 Fixed menu smtp from agent detail and modify agent 2015-04-15 10:26:48 +02:00
Vanessa Gil 2af12537ed Ticket #2073. 2015-04-15 10:00:42 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f aab9628cbd Merge branch 'develop' into feature/NewView 2015-04-15 09:38:00 +02:00
artica df42c4715f Auto-updated build strings. 2015-04-15 00:01:11 +02:00
m-lopez-f 7cb8e9dd16 Changed visual to tree view 2015-04-14 10:12:13 +02:00
m-lopez-f 1a612ff3a8 Changed style in tactical view 2015-04-14 09:56:49 +02:00
m-lopez-f b8dd9705f1 Fixed style when option of submenu is selected 2015-04-14 09:56:04 +02:00
m-lopez-f 50f15dc507 Fixed errors php in menu 2015-04-14 09:37:28 +02:00
m-lopez-f f3de8d5bc8 Changed visual of tactical view 2015-04-14 09:36:41 +02:00
m-lopez-f bdbb2f3700 Merge branch 'develop' into feature/NewView 2015-04-14 08:43:46 +02:00