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

15396 Commits

Author SHA1 Message Date
Daniel Maya 67a17679e3 Added encryption select in enterprise setup 2017-10-02 15:40:10 +02:00
artica 3188bf1b0b Updated version and build strings. 2017-10-02 11:57:37 +02:00
artica e9b8f01931 Auto-updated build strings. 2017-10-02 00:01:20 +02:00
artica bc48ddc747 Auto-updated build strings. 2017-10-01 00:01:20 +02:00
artica befb1fb196 Auto-updated build strings. 2017-09-30 00:01:23 +02:00
vgilc 3ea66cbae8 Merge branch 'update-japanese-help' into 'develop' 
Updated Japanese help.

See merge request !771
 2017-09-29 08:32:27 +02:00
artica 6d7a9fd648 Auto-updated build strings. 2017-09-29 00:01:25 +02:00
vgilc e18a3bbe36 Merge branch 'pandora_server-no-se-reinicia-al-cambiar-conf-remota' into 'develop' 
Set @Parser::Expat::Encoding_Path instead of calling load_encoding.

See merge request !865
 2017-09-28 15:34:24 +02:00
Ramon Novoa 96a3dfab43 Set @Parser::Expat::Encoding_Path instead of calling load_encoding. 
Parser::Expat::load_encoding doesn't seem to be thread safe. Set
@Parser::Expat::Encoding_Path instead to avoid problems.

Ref pandora_enterprise#1340.
 2017-09-28 15:18:21 +02:00
vgilc ebe1f37bf9 Merge branch '1306-visual-console-elements-functions-in-cli-dev' into 'develop' 
Fixed elements per row to 8

See merge request !864
 2017-09-28 10:11:41 +02:00
Arturo Gonzalez 0b3f252436 Fixed elements per row to 8 2017-09-28 09:56:15 +02:00
artica 165087d670 Auto-updated build strings. 2017-09-28 00:01:20 +02:00
vgilc a49260e38b Merge branch '1306-visual-console-functions-in-cli-dev' into 'develop' 
Fixed bad positions when mode is auto and have less than 4 elements and added ne…

See merge request !860
 2017-09-27 13:26:17 +02:00
Arturo Gonzalez 23aa244051 Fixed bad positions when mode is auto and have less than 4 elements and added new parameter to export elements with id 2017-09-27 13:15:51 +02:00
vgilc 896c71695d Merge branch '1306-add-simple-quotes-to-json-elements-exportation-dev' into 'develop' 
Added simple quotes

See merge request !859
 2017-09-27 12:38:21 +02:00
Arturo Gonzalez ed7d8efaea Added 0 to all parents id 2017-09-27 12:26:13 +02:00
Arturo Gonzalez 28ecf5c51b Added simple quotes 2017-09-27 12:21:33 +02:00
vgilc 0a47af8cbc Merge branch '1338-Graficas_TIP_en_informes_open_rev3' into 'develop' 
fixed minor error TIP

See merge request !857
 2017-09-26 13:50:18 +02:00
daniel e032f40525 fixed minor error TIP 2017-09-26 12:03:00 +02:00
artica 5ab5e04630 Auto-updated build strings. 2017-09-26 00:01:25 +02:00
vgilc 183589e0ce Merge branch '1208-Extension_estado_BD_rev2' into 'develop' 
fixed errors in extension db status

See merge request !854
 2017-09-25 17:28:42 +02:00
daniel b23f83036c fixed errors in extension db status 2017-09-25 17:23:57 +02:00
vgilc 5a1972db26 Merge branch '1338-Graficas_TIP_en_informes_open_rev2' into 'develop' 
fixed errors in report interfaces

See merge request !852
 2017-09-25 13:35:23 +02:00
daniel 00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
vgilc 07b8e178d3 Merge branch '152-handle-incomplete-SNMPtraps' into 'develop' 
Improved SNMP trap handling against incomplete traps or partially delayed ones.

Closes #152

See merge request !593
 2017-09-25 13:14:35 +02:00
vgilc 04dc184b62 Merge branch '1168-icon-to-know-if-agent-is-in-planned-downtime-dev' into 'develop' 
Added iconin agent view

See merge request !851
 2017-09-25 10:39:45 +02:00
Arturo Gonzalez 7b437d612a Added with quiet agent to 2017-09-25 10:29:34 +02:00
Arturo Gonzalez 83e9276f1b Added iconin agent view 2017-09-25 10:25:12 +02:00
vgilc 5f93ca1aba Merge branch '1208-Extension_estado_BD_rev' into 'develop' 
fixed error merge dani

See merge request !850
 2017-09-25 09:55:32 +02:00
daniel 7a8135f36d fixed error merge dani 2017-09-25 09:45:58 +02:00
vgilc 3bdd23e2d7 Merge branch '1296-Barra-de-eventos---Vista-táctica-metaconsola2-dev' into 'develop' 
update info of state in events

See merge request !847
 2017-09-25 09:23:58 +02:00
vgilc 851a8082a4 Merge branch '1338-Graficas_TIP_en_informes_open_rev' into 'develop' 
reajust date in flash graphs

See merge request !849
 2017-09-25 08:50:51 +02:00
artica 444101dbdf Auto-updated build strings. 2017-09-25 00:01:22 +02:00
artica 3e3268971f Auto-updated build strings. 2017-09-24 00:01:21 +02:00
artica d1c4ce1008 Auto-updated build strings. 2017-09-23 00:01:17 +02:00
daniel 44a6e39f99 reajust date in flash graphs 2017-09-22 15:12:53 +02:00
vgilc 5713c6b42f Merge branch '1306-new-functions-in-pandora-manage-to-visual-console-dev' into 'develop' 
Added change to scape double quotes

See merge request !846
 2017-09-22 15:08:07 +02:00
Daniel Maya 4c4a89ecf1 update info of state in events 2017-09-22 15:01:17 +02:00
Arturo Gonzalez 9e01eda73d Added change to scape double quotes 2017-09-22 14:42:26 +02:00
vgilc 07ba50e499 Merge branch '1338-Graficas_TIP_en_informes_open' into 'develop' 
add tip reports simple graph

See merge request !845
 2017-09-22 12:02:08 +02:00
daniel feae62f11c add tip reports simple graph 2017-09-22 11:39:54 +02:00
vgilc e73e20e98c Merge branch '1306-fixes-in-pandora-manage-visual-console-functions-dev' into 'develop' 
Added minor changes to duplicate and export functions

See merge request !843
 2017-09-22 10:22:54 +02:00
Arturo Gonzalez 49d3c2574b Added minor changes to duplicate and export functions 2017-09-22 10:18:18 +02:00
vgilc a42e2eae4c Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz_rev_1' into 'develop' 
fixed minor errors tips

See merge request !842
 2017-09-22 09:30:35 +02:00
vgilc 6bb182bf8f Merge branch '1155-Fallo_en_conexion_con_LDAP_merge_roto_Dani_' into 'develop' 
fixed error bad merge ldap

See merge request !841
 2017-09-22 09:30:29 +02:00
artica c50c7b70da Auto-updated build strings. 2017-09-22 00:01:16 +02:00
daniel 3613d1c1fc fixed minor errors tips 2017-09-21 18:37:57 +02:00
daniel d86d622340 fixed error bad merge ldap 2017-09-21 15:53:45 +02:00
vgilc 3348267a8f Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz' into 'develop' 
tip in graph interfaces

See merge request !840
 2017-09-21 15:42:23 +02:00
daniel 9337d33ceb tip in graph interfaces 2017-09-21 15:35:28 +02:00