tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,499 Commits 34 Branches 30 Tags
Commit Graph

11499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Maya
c007e5f14c Fixed help alert command. Ticket #3415. 
(cherry picked from commit b40f0848e0ba9ff38593a0d8d8ba6c5bef5c9790)
 2016-06-15 15:54:27 +02:00
fermin831
4472fc727b Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-15 15:35:39 +02:00
fermin831
ccbd793307 Solved download messages at first time and other visual changes 2016-06-15 15:34:30 +02:00
Arturo Gonzalez
e60ea96552 Added new functions to cli. Ticket #3501 
(cherry picked from commit 5df150bc1b006cdd0a5347542614ee7253f22dc2)
 2016-06-15 12:53:32 +02:00
Daniel Maya
2ff2cc9d90 fixed change url update manager. Ticket #3809. 
(cherry picked from commit da7d8d077305c37b761f68b90c9d2a35b5f7f0eb)
 2016-06-15 11:15:31 +02:00
axl89
c635b24abb Added associated ticket 3831 to PAN2 2016-06-15 11:08:34 +02:00
Daniel Maya
390942dcbc button inserted Agent_detail. Ticket #3831. 
(cherry picked from commit 2c0dae13b192a12246ec9700b1bff670b4083569)
 2016-06-15 10:55:17 +02:00
artica
c32c32b4d4 Auto-updated build strings. 2016-06-15 00:01:21 +02:00
axl89
9cc3d83c1d Added missing import to PAN1 and PAN2 2016-06-14 18:37:09 +02:00
axl89
0d07822599 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-14 18:35:43 +02:00
axl89
d8bedfbaf7 Added behaviour to pass the wizards 2016-06-14 18:35:01 +02:00
fermin831
e4314cbe8b Definitive messages to update manager and solved some issues. 2016-06-14 18:33:39 +02:00
fermin831
ef32c2ec22 Added language and fixed last_um_check functionality 2016-06-14 16:54:04 +02:00
Daniel Maya
98d266e2f9 fixed update manager. Ticket #3551. 
(cherry picked from commit 04fcccd5784fccc8b6cab01d97ab058885b170cc)

Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
 2016-06-14 16:46:46 +02:00
fermin831
5e6080c354 Fixed download messages for first time 2016-06-14 15:12:39 +02:00
fermin831
fffa84620f Added function update_manger_get_last_message 2016-06-14 14:51:10 +02:00
axl89
03cb8b6f5e Fixed the is_element_present function AGAIN 2016-06-14 13:25:45 +02:00
axl89
78a1a888fd Fixed the is_element_present function by importing NoSuchElementException 2016-06-14 13:24:17 +02:00
axl89
7ce8206c87 Added is_element_present function 2016-06-14 13:21:01 +02:00
fermin831
fcf0f63e26 Fixed update manager submenu position 2016-06-14 12:39:26 +02:00
Daniel Maya
9df12f7aca fixed table filemanager. Ticket #3435. 
(cherry picked from commit 36bb76bebc92aaddfe26f6401504815b19de761f)
 2016-06-14 12:11:37 +02:00
artica
ba0c60ab9b Auto-updated build strings. 2016-06-14 00:01:24 +02:00
fermin831
27cebafd02 Merge branch 'feature/identification_wizard' into pandora_6.0 
Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
 2016-06-13 18:36:35 +02:00
fermin831
a5bb107984 Fixed display newsletter checkbox at first time 2016-06-13 18:18:36 +02:00
fermin831
2ea9b6f97b Added some dafault values 2016-06-13 18:18:12 +02:00
cesar991
173eb17d25 added create_user function 2016-06-13 17:35:30 +02:00
Alejandro Gallardo Escobar
1e732146df Added tooltips to the horizontal and vertical short labels. Ticket #3634 2016-06-13 17:33:26 +02:00
fermin831
a93a6befee Removed some unwanted traces 2016-06-13 17:31:17 +02:00
fermin831
72fbd5e67a Added um messages pop-up and fixed popup order 2016-06-13 17:24:47 +02:00
Alejandro Gallardo Escobar
86ceea13de Reduced the max length of the x and y labels of the vertical and horizontal graphs. Ticket #3634 2016-06-13 17:18:00 +02:00
fermin831
e14e4090d2 Added Mark as read button to update manager messages 2016-06-13 16:47:38 +02:00
fermin831
c9e3fdaa61 Updated menu to put update manager in main menu 2016-06-13 16:30:54 +02:00
Alejandro Gallardo Escobar
fb17378abc The service default image is not previewed now. Ticket #3753 2016-06-13 15:43:40 +02:00
Daniel Maya
10849233af change url update manager. Tciket #3809. 
(cherry picked from commit aa4e07cb13e4630aa181f2b9bdc1e553b5f0f48f)
 2016-06-13 15:38:29 +02:00
fermin831
e578c8ff64 Added some definitive images and fixed several design issues 2016-06-13 13:06:10 +02:00
m-lopez-f
d83e6c8443 Fixed Pie charts and legend. Tiquet: #3742 2016-06-13 09:03:18 +02:00
m-lopez-f
abac67c1b4 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-13 09:00:57 +02:00
m-lopez-f
583a84b8d7 Fixed Pie charts and legend. Tiquet: #3742 
(cherry picked from commit 54c6de6a41b1b4dd3409b9fa941a91c2d1092210)
 2016-06-13 09:00:48 +02:00
artica
b5c95ce4c1 Auto-updated build strings. 2016-06-13 00:01:21 +02:00
artica
f44f28b270 Auto-updated build strings. 2016-06-12 00:01:22 +02:00
artica
7a1693fb93 Auto-updated build strings. 2016-06-11 00:01:26 +02:00
Sancho Lerena
1fbe092a48 Show the gauge custom graphs with the defined height. If the user can choose the graph height he should be able to see how is used. 2016-06-10 11:42:37 +02:00
m-lopez-f
2303bc9356 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-10 11:11:23 +02:00
m-lopez-f
d058d096d7 Fixed problems when selected no interactive charts or print pdfs. Tiquet: #3742 2016-06-10 11:11:11 +02:00
Daniel Maya
260c27f44a fixed aupdate manager. Ticket #3551. 
(cherry picked from commit 3d1f30ec12ee14a68770db805a4f3aa16493eec4)
 2016-06-10 10:51:09 +02:00
artica
54d0a042ef Auto-updated build strings. 2016-06-10 00:01:27 +02:00
fermin831
9fbeab4975 Added notification messages on menu 2016-06-09 18:54:59 +02:00
Alejandro Gallardo Escobar
6e8d57f3be Fixed the error which prevented the opening of the QR dialog on the public console section 2016-06-09 17:00:57 +02:00
Alejandro Gallardo Escobar
4cd2e7750b Fixed the error which prevented the opening of the QR dialog on the public console section 2016-06-09 16:58:32 +02:00
fermin831
cf157c70c1 New update manager specification changes 2016-06-09 16:06:34 +02:00