Daniel Barbero Martin
|
5e008e684d
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-02 17:45:52 +01:00 |
|
fbsanchez
|
2e5a771663
|
timelocal to strftime
|
2020-01-02 16:00:01 +01:00 |
|
fbsanchez
|
14a2da39b1
|
minor fix
|
2020-01-02 15:49:32 +01:00 |
|
fbsanchez
|
dfca202dc4
|
Merge branch 'ent-5244-modulos-no-inicializan' of brutus.artica.es:artica/pandorafms into ent-5244-modulos-no-inicializan
Conflicts:
pandora_server/lib/PandoraFMS/Core.pm
|
2020-01-02 15:47:00 +01:00 |
|
fbsanchez
|
70d51413c9
|
timelocal to strftime
|
2020-01-02 15:46:27 +01:00 |
|
fbsanchez
|
fb3e395958
|
Fix perl date issue
|
2020-01-02 14:03:14 +01:00 |
|
Jose Gonzalez
|
6422e34782
|
Modified General tab in META events
|
2020-01-02 12:50:35 +01:00 |
|
fbsanchez
|
c1f026fea1
|
restored pandora_server.spec classic
|
2020-01-02 11:05:48 +01:00 |
|
fbsanchez
|
e48b41b7e7
|
Merge branch 'ent-5240-9303-bloqueos-discovery' of brutus.artica.es:artica/pandorafms into ent-5240-9303-bloqueos-discovery
|
2020-01-02 11:03:22 +01:00 |
|
fbsanchez
|
a3fdf4007d
|
Fixed method calls in Base.pm
|
2020-01-02 10:04:41 +01:00 |
|
fbsanchez
|
154b0c367f
|
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
|
2020-01-02 09:13:32 +01:00 |
|
artica
|
713737986b
|
Auto-updated build strings.
|
2020-01-02 00:01:10 +01:00 |
|
artica
|
d386d3c390
|
Auto-updated build strings.
|
2020-01-01 00:01:10 +01:00 |
|
Daniel Maya
|
c79a4b2c01
|
fixed file vulnerability
|
2019-12-31 11:24:54 +01:00 |
|
artica
|
5b346c1ed9
|
Auto-updated build strings.
|
2019-12-31 00:01:11 +01:00 |
|
Alejandro Fraguas
|
a8e8a38fc7
|
Merge branch 'ent-5154-DB-interface-apto-espacios-en-blanco-queries' into 'develop'
dbmanager blankspaces transparent to user
See merge request artica/pandorafms!2986
|
2019-12-27 12:25:30 +01:00 |
|
marcos
|
a993e5f4e8
|
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
|
2019-12-27 11:51:22 +01:00 |
|
Alejandro Fraguas
|
48286d6920
|
Merge branch 'ent-4875-codigo-pisado-de-la-api' into 'develop'
Restore reverted changes
See merge request artica/pandorafms!2981
|
2019-12-27 10:28:25 +01:00 |
|
manuel
|
9e0168cd6c
|
Fixed bug in metaconsole alerts view
|
2019-12-27 10:24:48 +01:00 |
|
Alejandro Fraguas
|
ec950b199e
|
Merge branch 'ent-4488-Añadir-confirmacion-al-borrado-de-consolas-visuales' into 'develop'
Ent 4488 añadir confirmacion al borrado de consolas visuales
See merge request artica/pandorafms!2859
|
2019-12-26 13:42:28 +01:00 |
|
Alejandro Fraguas
|
46f02a6c53
|
Merge branch 'ent-4935-CSV-eventos-tooltip' into 'develop'
Added tooltip to CSV datatable button
See merge request artica/pandorafms!2881
|
2019-12-26 12:27:55 +01:00 |
|
Alejandro Fraguas
|
382e700272
|
Merge branch 'ent-4950-Bug-al-linkar-CV-con-otra' into 'develop'
Ent 4950 bug al linkar cv con otra
See merge request artica/pandorafms!2883
|
2019-12-26 11:46:36 +01:00 |
|
Alejandro Fraguas
|
ebe6e1109c
|
Merge branch 'ent-4467-barra-de-busqueda-como-interprete-de-ordenes' into 'develop'
Ent 4467 barra de busqueda como interprete de ordenes
See merge request artica/pandorafms!2934
|
2019-12-26 11:10:53 +01:00 |
|
marcos
|
04ed92523a
|
changed token VW to VR
|
2019-12-26 10:29:26 +01:00 |
|
artica
|
287d377520
|
Auto-updated build strings.
|
2019-12-26 00:01:08 +01:00 |
|
artica
|
4294ec6d1b
|
Auto-updated build strings.
|
2019-12-25 00:01:11 +01:00 |
|
Alejandro Fraguas
|
f0848d4feb
|
Merge branch 'ent-4993-Diferentes-bugs-tiempos' into 'develop'
Changed date format to last remote contact
See merge request artica/pandorafms!2898
|
2019-12-24 11:48:25 +01:00 |
|
Enrique Martin
|
ea86205b36
|
Merge branch 'develop' into 'ent-5187-modulos-remote_cmd-no-funcionan'
Conflicts:
pandora_server/conf/pandora_server.conf.new
|
2019-12-24 10:49:44 +01:00 |
|
Kike
|
79d3cd613f
|
Added rcmd_timeout_bin token in pandora_server.conf by default
|
2019-12-24 10:43:08 +01:00 |
|
manuel
|
3f09d13941
|
Fixed visual bug in grouped report item
|
2019-12-24 10:25:32 +01:00 |
|
manuel
|
4214a32fb7
|
Fixed visual bug in text report item
|
2019-12-24 10:11:27 +01:00 |
|
Alejandro Fraguas
|
5c0636b074
|
Merge branch 'ent-5203-incluir-ssh_launcher-en-config-pm' into 'develop'
Added ssh_launcher settings to pandora_Server
See merge request artica/pandorafms!2979
|
2019-12-24 10:03:37 +01:00 |
|
artica
|
d653b4d685
|
Auto-updated build strings.
|
2019-12-24 00:01:22 +01:00 |
|
Alejandro Fraguas
|
45c57abb70
|
Merge branch 'ent-4883-Mensaje-erroneo-WebChat' into 'develop'
Ent 4883 mensaje erroneo web chat
See merge request artica/pandorafms!2856
|
2019-12-23 17:45:25 +01:00 |
|
Kike
|
0f34528f6f
|
Set default rcmd_timeout=10 and new rcmd_timeout_bin token
|
2019-12-23 17:28:40 +01:00 |
|
Alejandro Fraguas
|
9d318a8612
|
Merge branch '5144-IE-Edge-Login-Background' into 'develop'
Added control for MS Edge and Internet Explorer browsers for disallow linear gradient
See merge request artica/pandorafms!2967
|
2019-12-23 17:13:42 +01:00 |
|
Alejandro Fraguas
|
c91290f062
|
Merge branch 'ent-4955-Bug-nombre-y-descripcion-items-informes' into 'develop'
Changed title name or description in items table of reports
See merge request artica/pandorafms!2875
|
2019-12-23 17:13:39 +01:00 |
|
Alejandro Fraguas
|
7b97855dd7
|
Merge branch 'ent-3607-fallos-visuales-en-la-vista-de-plugin-de-la-metaconsola' into 'develop'
Fixed file.png in plugin
See merge request artica/pandorafms!2725
|
2019-12-23 17:10:56 +01:00 |
|
Alejandro Fraguas
|
68a47354f9
|
Merge branch 'ent-3494-Item-group-en-visual-console-metaconsola' into 'develop'
fix bug in meta visual console: group item not retrieving values properly
See merge request artica/pandorafms!2864
|
2019-12-23 16:54:40 +01:00 |
|
fbsanchez
|
2a0187022b
|
Resolved deprecated options rpm spec
|
2019-12-23 13:28:38 +01:00 |
|
Alejandro Fraguas
|
ecb190910b
|
Merge branch '3812-Pantalla-Instalacion-DB-Demos' into 'develop'
Added images and CSS file for new demo installation screen
See merge request artica/pandorafms!2965
|
2019-12-23 11:27:55 +01:00 |
|
manuel
|
58beb51401
|
Fixed bug in pdf metaconsole os icon
|
2019-12-23 10:53:33 +01:00 |
|
Alejandro Fraguas
|
7f61caaa15
|
Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop'
Ent 5034 bug al copiar acción de alerta
See merge request artica/pandorafms!2921
|
2019-12-23 10:51:10 +01:00 |
|
Alejandro Fraguas
|
935d246a0d
|
Merge branch 'ent-5162-9263-Notificaciones-infinitas' into 'develop'
removed newsletter notification from messages list
See merge request artica/pandorafms!2978
|
2019-12-23 10:49:04 +01:00 |
|
Alejandro Fraguas
|
807db02fec
|
Merge branch 'ent-5099-dobles-interfaces' into 'develop'
Fix networkmap module key assignment
See merge request artica/pandorafms!2952
|
2019-12-23 10:25:04 +01:00 |
|
Alejandro Fraguas
|
7061ab81b6
|
Merge branch 'ent-4911-Informacion-mostrada-en-mapa-GIS-the-Satellite-Server' into 'develop'
Ent 4911 informacion mostrada en mapa gis the satellite server
See merge request artica/pandorafms!2876
|
2019-12-23 10:24:10 +01:00 |
|
Alejandro Fraguas
|
fa34170e34
|
Merge branch 'ent-5117-problemas-con-el-inventory-en-meta' into 'develop'
Fixed bug in inventory item
See merge request artica/pandorafms!2975
|
2019-12-23 10:23:21 +01:00 |
|
Alejandro Fraguas
|
69159d158d
|
Merge branch 'ent-1786-Rango-de-tiempo-en-container-graphs' into 'develop'
Ent 1786 rango de tiempo en container graphs
See merge request artica/pandorafms!2931
|
2019-12-23 10:18:39 +01:00 |
|
Alejandro Fraguas
|
c5af1823e3
|
Merge branch 'ent-2023-Poder-editar-la-opcion-Safe-operation-mode-mediante-Bulk-operations' into 'develop'
Ent 2023 poder editar la opcion safe operation mode mediante bulk operations
See merge request artica/pandorafms!2918
|
2019-12-23 10:18:14 +01:00 |
|
artica
|
cf8bf74cd4
|
Auto-updated build strings.
|
2019-12-23 00:01:17 +01:00 |
|