fbsanchez
|
c07daa3199
|
WIP Services
|
2020-06-29 19:17:40 +02:00 |
|
fbsanchez
|
94a7b625fb
|
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
pandora_console/extras/mr/39.sql
|
2020-06-22 14:06:13 +02:00 |
Luis
|
efb69c18bc
|
Ent 5809 message delete not working
|
2020-06-22 13:52:54 +02:00 |
|
fbsanchez
|
9bae4f8a17
|
MR change - minor
|
2020-06-19 12:14:09 +02:00 |
|
fbsanchez
|
6c5484baf0
|
MR change smart services
|
2020-06-18 12:35:52 +02:00 |
vanessa gil
|
4c3fd21971
|
Updated version.
|
2020-06-03 11:00:42 +02:00 |
|
fbsanchez
|
b3cf532c16
|
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
|
2020-05-29 12:30:49 +02:00 |
daniel
|
65c733e1dd
|
iot metaconsole
|
2020-05-27 09:18:21 +02:00 |
|
fbsanchez
|
7be305298a
|
Remove file - old cluster files
|
2020-05-22 14:15:10 +02:00 |
alejandro-campos
|
23c4609981
|
Merge branch 'develop' into ent-1193-Comprobar-codigo-de-estado-HTTP
|
2020-05-19 17:13:54 +02:00 |
Alejandro Fraguas
|
aaf64e591c
|
Merge branch 'ent-5708-review-discovery-h-d' into 'develop'
Ent 5708 review discovery h d
See merge request artica/pandorafms!3195
|
2020-05-14 10:32:43 +02:00 |
Tatiana Llorente
|
1f16abd4bd
|
Ent 5701 quitar feature de chat
|
2020-05-08 15:39:24 +02:00 |
|
alejandro-campos
|
197e309129
|
added new module type
|
2020-05-04 12:22:04 +02:00 |
|
alejandro-campos
|
1140a4345a
|
added new module type
|
2020-05-04 12:20:50 +02:00 |
|
fbsanchez
|
026562e7ee
|
MR changes
|
2020-04-30 15:00:04 +02:00 |
|
fbsanchez
|
7024863fd7
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
pandora_console/extras/mr/37.sql
|
2020-04-14 16:06:17 +02:00 |
|
fbsanchez
|
36daf76cc5
|
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
pandora_console/extras/mr/37.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2020-04-14 12:00:15 +02:00 |
|
Daniel Barbero Martin
|
3280ad479f
|
Fix dashboards
|
2020-04-13 15:01:18 +02:00 |
|
fbsanchez
|
a75964fcba
|
minor fix
|
2020-04-08 16:06:39 +02:00 |
|
fbsanchez
|
762ad3106d
|
Improvements and fixes H&D with review
|
2020-04-07 18:50:56 +02:00 |
Kike
|
801624b8a2
|
Deleted [RT] tag for recon templates
|
2020-04-07 14:04:06 +02:00 |
|
Kike
|
d908a9f7f6
|
Added default modules templates for recon tasks
|
2020-04-02 19:12:49 +02:00 |
|
fbsanchez
|
7f1d4725bd
|
minor fix mr
|
2020-03-31 17:52:20 +02:00 |
Jose Gonzalez
|
6cad02635e
|
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
|
2020-03-31 10:45:37 +02:00 |
|
Jose Gonzalez
|
f28de6f4d0
|
Fixed db issue
|
2020-03-31 10:45:30 +02:00 |
|
fbsanchez
|
acabe543c4
|
csv recon0
|
2020-03-30 19:44:44 +02:00 |
|
Jose Gonzalez
|
fa372656f4
|
Fixed issue with DB
|
2020-03-30 17:48:09 +02:00 |
|
Jose Gonzalez
|
dc55ca5eff
|
WIP: Changes with PEN tables
|
2020-03-30 17:02:34 +02:00 |
|
fbsanchez
|
3a74e25068
|
PEN management
|
2020-03-27 11:41:56 +01:00 |
|
fbsanchez
|
452f5253e2
|
merge develop
|
2020-03-26 14:43:57 +01:00 |
|
fbsanchez
|
e48ef76f35
|
merge
|
2020-03-26 14:38:23 +01:00 |
|
daniel
|
709201bf23
|
dashboards
|
2020-03-26 12:29:38 +01:00 |
|
fbsanchez
|
fecff8aa93
|
Discovery review advanced
|
2020-03-25 18:02:58 +01:00 |
|
Jose Gonzalez
|
e1d233453f
|
Update database files
|
2020-03-25 13:05:56 +01:00 |
|
Alejandro Campos
|
b56076044b
|
Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado'
# Conflicts:
# pandora_console/extras/mr/37.sql
|
2020-03-24 13:55:57 +01:00 |
|
alejandro-campos
|
e05c292d7d
|
show last status change of module
|
2020-03-23 12:47:58 +01:00 |
Daniel Maya
|
c7e6f9fd34
|
Added disable event in alert template
|
2020-03-23 11:34:37 +01:00 |
|
Kike
|
037564810b
|
Increase WUX tests field size in database
|
2020-03-20 14:09:06 +01:00 |
|
alejandro-campos
|
014688468c
|
changes to show last status change of modules
|
2020-03-19 15:18:20 +01:00 |
|
Jose Gonzalez
|
451cdf2ca1
|
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
|
2020-03-19 12:14:05 +01:00 |
|
Jose Gonzalez
|
c9813afc9b
|
DB changes
|
2020-03-19 12:13:56 +01:00 |
|
fbsanchez
|
f58276ddbb
|
Templates
|
2020-03-18 19:31:58 +01:00 |
|
fbsanchez
|
f3da919abc
|
WIP multiple changes
|
2020-03-16 23:52:20 +01:00 |
|
fbsanchez
|
ce11d89953
|
Frontent changes
|
2020-03-13 14:03:50 +01:00 |
|
Daniel Barbero
|
19b571fc78
|
update version
|
2020-03-03 10:17:18 +01:00 |
|
Daniel Maya
|
4e4c1495eb
|
Fixed merge conflict
|
2020-02-20 15:07:14 +01:00 |
|
Daniel Maya
|
87dc92ffd9
|
Ent 5457 suid nodos elastic
|
2020-02-18 13:24:22 +01:00 |
|
Daniel Maya
|
be47ed178b
|
Added force apply in policies
|
2020-02-05 12:49:52 +01:00 |
|
Daniel Maya
|
baecac1efb
|
Next mr
|
2020-01-29 15:51:39 +01:00 |
Daniel Rodriguez
|
28392b71ef
|
Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop'
availability failover
See merge request artica/pandorafms!3015
|
2020-01-27 10:48:50 +01:00 |
|
Daniel Maya
|
aa3bf33607
|
Added treport_content_item in migrate
|
2020-01-24 09:28:16 +01:00 |
|
Alejandro Campos
|
e7769b8bf4
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/extras/mr/35.sql
|
2020-01-20 12:00:42 +01:00 |
|
Daniel Maya
|
c68f83f013
|
availability failover
|
2020-01-15 17:16:46 +01:00 |
|
Alejandro Campos
|
c389769602
|
Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota'
# Conflicts:
# pandora_console/extras/mr/35.sql
|
2020-01-15 17:12:32 +01:00 |
|
Alejandro Campos
|
6dbe75169f
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/extras/mr/35.sql
|
2020-01-15 14:37:00 +01:00 |
|
Luis
|
2926ead13b
|
Fixed group change on networkmap.ACL and source group working separated
|
2020-01-15 12:14:37 +01:00 |
|
alejandro-campos
|
5eb2953810
|
Added port option on server configuration to be used when connecting to execution server
|
2020-01-14 15:43:17 +01:00 |
|
Alejandro Campos
|
dcd2aae3c5
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/extras/mr/35.sql
|
2020-01-14 10:28:55 +01:00 |
|
Daniel Maya
|
7204e7c0f2
|
Ent 4862 mas opciones en los filtros de severidad
|
2020-01-13 18:24:29 +01:00 |
|
Alejandro Campos
|
0468c85a4d
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
|
2020-01-07 12:00:27 +01:00 |
|
daniel
|
3dbdfdb6eb
|
Fix Landscape reports
|
2019-12-11 15:07:38 +01:00 |
|
Luis
|
6ba4a26564
|
Added timeoout option to command event responses
|
2019-12-10 11:54:30 +01:00 |
|
alejandro-campos
|
5880bec88a
|
changes in module data formatting when printed across the application and new setup options
|
2019-12-05 17:41:44 +01:00 |
|
Luis
|
b0d5b7223e
|
Added report template regex to MR
|
2019-11-27 13:21:05 +01:00 |
|
Alejandro Fraguas
|
ed0ad76e61
|
Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop'
Add new search for id source event in metaconsole
See merge request artica/pandorafms!2438
|
2019-11-27 10:14:35 +01:00 |
|
fbsanchez
|
c28dfd60a5
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-26 16:16:15 +01:00 |
|
fbsanchez
|
c985f2d5f9
|
Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-26 10:50:51 +01:00 |
|
Daniel Maya
|
cf8bae66d1
|
Added index in MR
|
2019-11-26 10:31:57 +01:00 |
Marcos Alconada
|
d0aab40fa8
|
Update 29.sql
|
2019-11-25 16:56:59 +01:00 |
|
fbsanchez
|
1b4b59d1c2
|
Rules migration DB
|
2019-11-25 13:36:43 +01:00 |
|
fbsanchez
|
5423e78d62
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/godmode/wizards/Wizard.main.php
pandora_console/include/functions_agents.php
pandora_console/include/styles/alert.css
pandora_console/pandoradb.sql
pandora_server/lib/PandoraFMS/Recon/Base.pm
|
2019-11-22 15:49:07 +01:00 |
|
marcos
|
21bf49c218
|
update id_source_event
|
2019-11-22 13:38:08 +01:00 |
|
fbsanchez
|
1565fee3f4
|
minor fix, errata
|
2019-11-22 11:59:24 +01:00 |
|
fbsanchez
|
fd12c5a009
|
DB update, default values for Alert correlation
|
2019-11-22 11:57:20 +01:00 |
|
Daniel Barbero
|
35abd12499
|
WIP alert correlations
|
2019-11-22 11:06:55 +01:00 |
|
marcos
|
ab1a64a2e6
|
Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este
|
2019-11-22 10:56:36 +01:00 |
|
marcos
|
de3f8b2a0f
|
updates
|
2019-11-22 10:56:30 +01:00 |
|
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +01:00 |
|
fbsanchez
|
362837f856
|
updated default values for tevent_rule, new tokens for correlated alerts
|
2019-11-21 17:47:21 +01:00 |
|
marcos
|
93c4793025
|
add id_source_event 33.sql
|
2019-11-21 17:36:01 +01:00 |
|
Marcos Alconada
|
34cdcdfd6e
|
Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
# pandora_console/extras/mr/29.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
# pandora_console/include/functions_events.php
|
2019-11-21 10:13:00 +01:00 |
|
fbsanchez
|
e9432aaaa5
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-20 15:51:47 +01:00 |
|
alejandro-campos
|
4d332f2bef
|
fix duplicated operation in migrate file
|
2019-11-20 12:43:08 +01:00 |
|
fbsanchez
|
446d6c3507
|
Fix windows commands
|
2019-11-20 12:35:55 +01:00 |
|
fbsanchez
|
79a135b077
|
Fix errata DESC => COMMENT
|
2019-11-20 11:36:15 +01:00 |
|
alejandro-campos
|
33b11af3c1
|
fix missing line in migrate
|
2019-11-20 11:26:28 +01:00 |
|
fbsanchez
|
43ecba3bbb
|
operator fields for event_rule
|
2019-11-20 10:40:52 +01:00 |
|
fbsanchez
|
471389a72a
|
Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-19 14:11:38 +01:00 |
|
Daniel Barbero Martin
|
1b5dcc3e28
|
Fixed errors in remote command
|
2019-11-19 12:35:52 +01:00 |
|
alejandro-campos
|
070fe32d1e
|
Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7
|
2019-11-18 16:27:12 +01:00 |
|
fbsanchez
|
443eb1168c
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
|
2019-11-18 12:48:31 +01:00 |
|
fbsanchez
|
9440570548
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-15 13:08:09 +01:00 |
|
fbsanchez
|
990ad339d3
|
db schema
|
2019-11-15 09:45:49 +01:00 |
|
fbsanchez
|
f69b86663a
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
|
2019-11-14 21:40:35 +01:00 |
|
fbsanchez
|
3c87efe113
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-14 17:13:38 +01:00 |
|
fbsanchez
|
94d87c2a3c
|
Avoid welcome window on updates.
|
2019-11-14 14:14:50 +01:00 |
|
Daniel Barbero Martin
|
c17acefc49
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-14 12:22:11 +01:00 |
|
fbsanchez
|
b0920d93af
|
Merge branch 'ent-4772-omnishell' into ent-EDF
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-13 18:15:19 +01:00 |
|
fbsanchez
|
b9633933e1
|
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
|
2019-11-12 14:17:45 +01:00 |
|
Daniel Barbero Martin
|
0213bc675e
|
add changes bbdd
|
2019-11-08 11:28:37 +01:00 |
|
Daniel Barbero Martin
|
c68a5b57dd
|
fixed Change bbdd
|
2019-11-05 16:04:48 +01:00 |
|
fbsanchez
|
f4f618c1da
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl
|
2019-11-05 15:40:14 +01:00 |
|
fbsanchez
|
276fc82556
|
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-05 15:39:18 +01:00 |
|
Daniel Barbero Martin
|
e5f24ca884
|
Merge develop
|
2019-11-05 15:27:06 +01:00 |
|
fbsanchez
|
58cbc3c738
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
|
2019-11-05 15:17:09 +01:00 |
|
fbsanchez
|
ec3c7ba559
|
Some remote command examples
|
2019-11-04 20:36:03 +01:00 |
|
fbsanchez
|
115c884cd4
|
Discovery SAP
|
2019-10-31 21:13:18 +01:00 |
|
Daniel Barbero Martin
|
7bfa076263
|
fixed error bbdd
|
2019-10-30 14:52:10 +01:00 |
|
Daniel Barbero Martin
|
d37410ed8c
|
fixed error bbdd
|
2019-10-30 14:43:10 +01:00 |
|
Daniel Barbero Martin
|
b7710a6562
|
fix remove mr34 to mr33
|
2019-10-30 08:04:13 +01:00 |
|
Daniel Barbero Martin
|
2bb81a839a
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
|
2019-10-29 17:15:19 +01:00 |
|
fbsanchez
|
383967f68a
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-10-29 16:56:01 +01:00 |
|
fbsanchez
|
f3fdcb4de0
|
MR update
|
2019-10-29 16:06:34 +01:00 |
|
alejandro-campos
|
049c3c2476
|
fix migrate missing content
|
2019-10-28 13:46:37 +01:00 |
|
Daniel Barbero Martin
|
3056c6741a
|
changes bbdd mr34
|
2019-10-28 12:20:55 +01:00 |
|
fbsanchez
|
74007ebf70
|
33 => 34, cleanup
|
2019-10-28 12:18:56 +01:00 |
|
fbsanchez
|
d6681cedd1
|
33 => 34
|
2019-10-28 12:18:13 +01:00 |
|
Daniel Barbero Martin
|
f06a55c6bb
|
continue feedback mail
|
2019-10-23 19:50:57 +02:00 |
|
Tatiana Llorente
|
30caad5a6c
|
Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810
|
2019-10-15 16:50:05 +02:00 |
|
fbsanchez
|
6bf3772690
|
remote cmd => remote execution
|
2019-10-09 19:20:58 +02:00 |
|
Daniel Barbero
|
8af72c1c9d
|
add Remote CMD
|
2019-10-09 17:26:06 +02:00 |
|
Daniel Barbero Martin
|
2ee725b204
|
fixed minor error
|
2019-09-26 16:43:31 +02:00 |
|
alejandro-campos
|
96622933fc
|
added new section in integria setup to configure different options for event responses and alert created tickets
|
2019-09-26 13:22:10 +02:00 |
|
Alejandro Campos
|
20cebbe988
|
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
# Conflicts:
# pandora_console/extras/mr/32.sql
|
2019-09-23 17:16:15 +02:00 |
|
alejandro-campos
|
9bf2980f01
|
fix minor bugs in integria integration
|
2019-09-23 12:48:20 +02:00 |
|
fbsanchez
|
6def88472a
|
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
# pandora_console/extras/mr/32.sql
|
2019-09-19 10:18:15 +02:00 |
|
Daniel Rodriguez
|
d939bf9e93
|
Merge branch 'ent-3878-Report-type-summation-not-working-properly-migratesql' into 'develop'
Ent 3878 report type summation not working properly migratesql
See merge request artica/pandorafms!2738
|
2019-09-18 17:54:17 +02:00 |
|
Alejandro Fraguas
|
4adf584827
|
Merge branch 'ent-4655-nomenclatura-licencia' into 'develop'
Changed caption Expires
See merge request artica/pandorafms!2736
|
2019-09-18 16:49:55 +02:00 |
|
Luis
|
0c72fe718c
|
Update pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-09-18 16:42:09 +02:00 |
|
Luis Calvo
|
4628e41f69
|
Added missing changes to pandora_migratte
|
2019-09-18 16:39:05 +02:00 |
|
Jose Gonzalez
|
be1cde5466
|
Deleted tests
|
2019-09-18 15:41:20 +02:00 |
|
Jose Gonzalez
|
a4e22d325d
|
Solved issue
|
2019-09-18 15:39:33 +02:00 |
|
Luis Calvo
|
43af2269ee
|
Fixed default values uncompress data
|
2019-09-18 11:51:01 +02:00 |
|
Luis Calvo
|
e409b33c6c
|
Added changes to treport_content_template to db
|
2019-09-17 12:32:07 +02:00 |
|
Luis Calvo
|
e89efea022
|
Added column 'uncompressed_module' to 'treport_content'
|
2019-09-16 11:18:01 +02:00 |
|
fbsanchez
|
aa6c105841
|
Update 32.sql missed ';'
|
2019-09-12 17:47:49 +02:00 |
|
fbsanchez
|
ebcce5cad4
|
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
# pandora_console/extras/mr/32.sql
|
2019-09-12 11:17:44 +02:00 |
|
Daniel Rodriguez
|
da7811953c
|
Merge branch 'ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono' into 'develop'
Added mr and uncommented code
See merge request artica/pandorafms!2558
|
2019-09-06 13:38:11 +02:00 |
|
fbsanchez
|
148cd5cce6
|
db updates pandora_db
|
2019-09-05 10:45:17 +02:00 |
|
fbsanchez
|
5c535514e1
|
Updated MR reference
|
2019-09-02 15:44:48 +02:00 |
|
fbsanchez
|
9868462d43
|
Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha
|
2019-09-02 09:57:45 +02:00 |
|
Daniel Maya
|
de47275735
|
Fixed mr
|
2019-08-30 10:34:52 +02:00 |
|
Daniel Maya
|
5ad22620b9
|
mr power up
|
2019-08-28 12:49:41 +02:00 |
|
Daniel Maya
|
63da85798e
|
Change mr
|
2019-08-26 16:10:06 +02:00 |
|
Daniel Maya
|
473b29252c
|
Merge branch 'develop' into ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono
|
2019-08-26 16:08:03 +02:00 |
|
fbsanchez
|
62ec37cf59
|
propagate tdatabase updates
|
2019-08-10 03:18:45 +02:00 |
|
fbsanchez
|
adbb48ab87
|
pandora HA review
|
2019-08-10 02:13:01 +02:00 |
|
Alejandro Campos
|
12eacc1933
|
Merge branch 'develop' into 'ent-4388-Nuevos-eventos'
# Conflicts:
# pandora_console/extras/mr/31.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-08-05 09:26:18 +02:00 |
|
Daniel Rodriguez
|
7ff5e23792
|
Merge branch 'ent-4460-Eliminar-antigua-integracion-con-integria' into 'develop'
removed all deprecated references to integria from code and db data
See merge request artica/pandorafms!2626
|
2019-08-02 12:28:03 +02:00 |
|
alejandro-campos
|
a36a293f19
|
added changes to pandora migrate and MR
|
2019-07-31 17:18:52 +02:00 |