61d3720787
Merge branch 'ent-4076-Quitar-ayudas-vacias-modulos' into 'develop'
...
Removed empty help icons in modules
See merge request artica/pandorafms!2454
2019-05-27 17:53:06 +02:00
2fd37b531e
Visual changes in module graph - #4104
2019-05-27 17:37:57 +02:00
513a74d120
Removed empty help icons in local components
2019-05-27 17:13:25 +02:00
556c07ad99
Minor changes in configurar_agente
2019-05-27 17:12:35 +02:00
fb8bc48d64
Now the vc item's cache expires when the item is updated
2019-05-27 16:40:09 +02:00
1eb1120c6e
Rename class events_show_more_table to table_modal_alternate - #4102
2019-05-27 16:18:10 +02:00
016a5b3745
Changed image for severity in modal events window - #4102
2019-05-27 15:51:03 +02:00
0b4a076798
Changed image for severity in modal events window - #4102
2019-05-27 15:49:10 +02:00
0280547465
some changes
2019-05-27 15:41:23 +02:00
bc64589046
fixed error create modules
2019-05-27 15:27:46 +02:00
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
7347324601
Minor fixes - discovery styles
2019-05-27 13:19:08 +02:00
f8a0fc67f9
Minor improvements
2019-05-27 12:10:05 +02:00
ce8ba54e09
Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual
2019-05-27 11:31:24 +02:00
83602e07b9
Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4
2019-05-27 11:06:29 +02:00
de3464bd02
Auto-updated build strings.
2019-05-27 00:01:05 +02:00
ba97da46c6
Auto-updated build strings.
2019-05-26 00:01:04 +02:00
a13701ed82
Auto-updated build strings.
2019-05-25 00:01:06 +02:00
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +02:00
41bc705c02
Image only for welcome message
2019-05-24 14:19:31 +02:00
9587b4cc44
Image only for welcome message
2019-05-24 14:18:39 +02:00
1d403ec2f8
SNMP Browser fix
2019-05-24 13:42:49 +02:00
0ee2ed6f5e
Removed empty help icons in modules
2019-05-24 12:59:25 +02:00
c5bd3204ab
Minor style, avoided duplicated iface names with spaces
2019-05-24 11:42:46 +02:00
0319e4d4e6
Removed empty help icons
2019-05-24 11:11:30 +02:00
01d96728c8
changed PK to NULL
2019-05-24 11:03:09 +02:00
f5586d7b70
Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop'
...
fixed label reports and more fixed
See merge request artica/pandorafms!2413
2019-05-24 10:47:15 +02:00
cc09c257bc
Auto-updated build strings.
2019-05-24 00:01:06 +02:00
9d7d58f43e
Merge branch 'fix/newsletter_ent' into 'develop'
...
Newsletter reminder settings ent
See merge request artica/pandorafms!2449
2019-05-23 19:25:43 +02:00
4400d9303f
subscription manager udp
2019-05-23 19:22:05 +02:00
211b05c9d6
minor fix in newsletter logic
2019-05-23 18:59:38 +02:00
058c9d3806
Newsletter reminder settings ent
2019-05-23 18:54:04 +02:00
f46fdea220
Merge remote-tracking branch 'origin/develop' into fix/uno
2019-05-23 18:46:56 +02:00
8f9c9fd156
removed trace from user_edit
2019-05-23 18:46:43 +02:00
1386a44e07
fixed errors label report
2019-05-23 17:52:28 +02:00
51f846af05
Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop'
...
Fixed visual bug in policies operations actions
See merge request artica/pandorafms!2369
2019-05-23 17:24:59 +02:00
7c236149b0
Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop'
...
Fixed bug in items reports deleted
See merge request artica/pandorafms!2208
2019-05-23 17:18:00 +02:00
7097481cca
Merge branch 'ent-3974-Los-campos-de-module-plugin-no-se-guardan' into 'develop'
...
fixed bug in macros of plugin modules
See merge request artica/pandorafms!2442
2019-05-23 17:08:34 +02:00
9e1de4cbb3
Merge branch 'ent-1668-update-manager' into 'develop'
...
rb UM GCv
See merge request artica/pandorafms!2447
2019-05-23 16:16:26 +02:00
4ec6aadf7d
rb UM GCv
2019-05-23 16:12:40 +02:00
f1c077b753
Merge branch 'ent-1668-update-manager' into 'develop'
...
UM GCv
See merge request artica/pandorafms!2446
2019-05-23 16:09:16 +02:00
4abbbf6680
UM GCv
2019-05-23 15:55:07 +02:00
5d4ba6cb01
Merge branch 'ent-1668-update-manager' into 'develop'
...
summarized counts
See merge request artica/pandorafms!2445
2019-05-23 15:47:25 +02:00
08aa824f97
summarized counts
2019-05-23 15:38:45 +02:00
1529a04507
Merge branch 'ent-1668-update-manager' into 'develop'
...
fixed: um url relative
See merge request artica/pandorafms!2444
2019-05-23 11:33:46 +02:00
0ee42fbafe
fixed: um url relative
2019-05-23 11:23:42 +02:00
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
dd8af874fa
Merge branch 'ent-1668-update-manager' into 'develop'
...
license forms sync MC-N
See merge request artica/pandorafms!2441
2019-05-23 10:36:43 +02:00
2de2d1f482
Added expiration and deleted old cache data in pandora_db
2019-05-23 10:35:03 +02:00
7b5ae40868
multiple fixes
2019-05-23 10:27:50 +02:00
4c3dea3ba4
Auto-updated build strings.
2019-05-23 00:01:07 +02:00
0728c73844
fixed bug in macros of plugin modules
2019-05-22 19:14:01 +02:00
2cfe4378c2
license forms sync MC-N
2019-05-22 18:50:51 +02:00
dfb7067db2
Merge branch 'ent-1668-update-manager' into 'develop'
...
minor fix MC environments
See merge request artica/pandorafms!2439
2019-05-22 16:54:33 +02:00
8b511c2ca3
Merge branch 'ent-3984-7962-ldap-bug-en-token-force-automatically-create-profile-user' into 'develop'
...
Changed condition for ldap Force automatically create profile user
See merge request artica/pandorafms!2422
2019-05-22 16:15:06 +02:00
86cb526893
minor fix MC environments
2019-05-22 15:40:17 +02:00
892dcc750f
Updated version and build strings.
2019-05-22 15:29:49 +02:00
979f11ca8f
Merge branch 'ent-1668-update-manager' into 'develop'
...
Ent 1668 update manager
See merge request artica/pandorafms!2420
2019-05-22 15:25:49 +02:00
88234503c0
Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop'
...
Fixed url in user_edit
See merge request artica/pandorafms!2436
2019-05-22 14:14:15 +02:00
07b42f7241
Changed for metaconsole
2019-05-22 13:57:31 +02:00
5b286b4f67
Merge branch 'ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual' into 'develop'
...
Mejorar la actualizacion de los datos y elementos de la consola visual
See merge request artica/pandorafms!2429
2019-05-22 13:06:18 +02:00
c50eb57499
Merge branch 'ent-4016-error-en-valor-de-diagnostic-info' into 'develop'
...
Added new min value for InnoDB file per table( 0 to 1)
See merge request artica/pandorafms!2416
2019-05-22 12:05:29 +02:00
ba9edc0378
Auto-updated build strings.
2019-05-22 00:01:07 +02:00
85a3437124
Merge branch 'ent-3964-autorefresco-no-funciona-733-734-v2' into 'develop'
...
Ent Autorefresco no funciona en la version 733, 734 (v2)
See merge request artica/pandorafms!2435
2019-05-21 17:41:10 +02:00
f6171de522
Merge branch 'ent-3468-Ayudas_online' into 'develop'
...
helpers
See merge request artica/pandorafms!2381
2019-05-21 17:28:27 +02:00
edbde3fecb
Fixed url in user_edit
2019-05-21 17:14:29 +02:00
e361c4243a
Autorefresh bug fix
2019-05-21 12:16:06 +02:00
ce359bfaf6
Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop'
...
Ent 3937 eliminar echos y prints de las subclases de wizard
See merge request artica/pandorafms!2430
2019-05-21 12:11:53 +02:00
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
b853582fb9
Changed preview by \"click here\" message
2019-05-21 08:29:59 +02:00
20e38ead81
Auto-updated build strings.
2019-05-21 00:01:08 +02:00
77fc1abe89
minor style updates and fixes in safe-output
2019-05-20 18:16:21 +02:00
5c0a197b6b
Added cache
2019-05-20 15:15:54 +02:00
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +02:00
a898fad2c3
lint fixes
2019-05-20 10:35:46 +02:00
d82d178a0d
Auto-updated build strings.
2019-05-20 00:01:08 +02:00
2dc5fce6a6
Auto-updated build strings.
2019-05-19 00:01:06 +02:00
509c476c33
Auto-updated build strings.
2019-05-18 00:01:08 +02:00
0046e209fe
lint changes
2019-05-17 14:46:19 +02:00
54d3eefa43
lint changes
2019-05-17 14:27:59 +02:00
e746a49158
lint changes
2019-05-17 14:26:44 +02:00
bdcea7ec7d
Minor fix
2019-05-17 14:25:17 +02:00
a0b7164d9f
lint changes
2019-05-17 14:20:01 +02:00
2c8dd3b5e5
Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual
2019-05-17 14:16:23 +02:00
34218fa7eb
Improved the management of the async requests of the visual console client
2019-05-17 14:09:30 +02:00
0c9f8892e0
Changed evaluates permissions
2019-05-17 13:58:34 +02:00
ea39766d59
Merge branch 'ent-3684-Dashboard-publico-no-muestra-mapa-de-red' into 'develop'
...
ent-3684-Dashboard-publico-no-muestra-mapa-de-red into develop
See merge request artica/pandorafms!2427
2019-05-17 12:11:19 +02:00
833c2d91a7
Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual-return' into 'develop'
...
Fixed error window in visual console
See merge request artica/pandorafms!2426
2019-05-17 11:27:57 +02:00
9b4d1b3dba
Merge branch 'ent-2108-incongruencias-creacion-accion-pandora-fms-event' into 'develop'
...
Recovered event criticity field from event alert
See merge request artica/pandorafms!2425
2019-05-17 10:49:34 +02:00
bf202496da
Auto-updated build strings.
...
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
2019-05-17 00:01:10 +02:00
a0faffe161
Form eHorus user login with title
...
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
2019-05-16 18:59:17 +02:00
0cd60d0431
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
2019-05-16 18:11:33 +02:00
b3d2eaaf9e
Fixed img url on js
...
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
2019-05-16 17:25:18 +02:00
1bfd91725e
Changed <img> to hmtl_print_image
...
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
2019-05-16 17:13:14 +02:00
f1705af9f6
Fixed error window in visual console
...
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
2019-05-16 16:04:38 +02:00
c40e0ec702
pandora_console/extras/delete_files/delete_files.txt
...
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
2019-05-16 15:38:51 +02:00
0f35923073
Recovered event criticity field from event alert
...
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
2019-05-16 13:23:47 +02:00
ec60a3193a
removed all group from communications target
...
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
2019-05-16 12:52:41 +02:00
3cdbfd3646
minor fix in php requirements
...
Former-commit-id: bc268f18f8d46b8db6b1b28b3df5011bc56823d0
2019-05-16 12:50:16 +02:00
c8c0194183
Minor fix in url
...
Former-commit-id: 087a93624d65109c9c66de329c4365b98d99c8ed
2019-05-16 12:33:05 +02:00
034480bf88
minor fixes
...
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
2019-05-16 12:28:46 +02:00
0173c856af
Merge branch 'ent-4036-8031-no-funcionan-las-custom-graph-cuando-el-idioma-es-frances' into 'develop'
...
Changed simple quote in alerts
See merge request artica/pandorafms!2419
Former-commit-id: 9cab37f3ab87dd3c056f2750a1be9e5204f73e51
2019-05-16 12:17:22 +02:00
e7dbb55392
Minor fixes
...
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +02:00
13b32003b3
save changes ticket 3937
...
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
50ad335794
Merge branch 'ent-3720-7750-anadir-filtros-en-custom-graphs-2' into 'develop'
...
New branch without thras files
See merge request artica/pandorafms!2423
Former-commit-id: 909ad4d321231e4d610b409c3f5b1224a780150b
2019-05-16 11:37:25 +02:00
a25a08f48d
Added an async task manager to the visual console client
...
Former-commit-id: 4f5c92a976ae976e77cc11505c7a57bf31121930
2019-05-16 11:04:03 +02:00
702926cf85
solved merge conflict mr 28.sql
...
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
2019-05-16 10:15:46 +02:00
f5f66fc144
Auto-updated build strings.
...
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
2019-05-16 00:01:06 +02:00
9c08aa7b57
Auto-updated build strings.
...
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
2019-05-15 00:01:11 +02:00
3bf06f0b72
MR minor updates
...
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
2019-05-15 00:00:21 +02:00
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
0e99b750b4
New branch without trash files
...
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
8004e096fd
MR 28 and minor fixes
...
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
2019-05-14 18:09:34 +02:00
3548070ec1
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
...
Add new message to News board
See merge request artica/pandorafms!2415
Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
2019-05-14 17:56:43 +02:00
be20163073
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2421
Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
2019-05-14 17:38:55 +02:00
920786216b
UM notifications MR update
...
Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5
2019-05-14 17:17:04 +02:00
53e9113b7e
UM notifications MR update
...
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15:28 +02:00
35c7ea1f48
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews
...
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
2019-05-14 17:14:02 +02:00
bc849c16fb
Only one image for welcome new board
...
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
2019-05-14 17:13:44 +02:00
f807c23df7
Merge branch 'ent-3264-importa-politicas-desde-resource-registration-en-modo-centralizado' into 'develop'
...
Fixed policy import with centralized management in node
See merge request artica/pandorafms!2217
Former-commit-id: abe02564ab3d19101e37f02bd9cc9f37739e1992
2019-05-14 16:50:42 +02:00
d9dbc60eb5
Update pandoradb_migrate_6.0_to_7.0.mysql.sql
...
Former-commit-id: cb2edea9dca48e33260ce2fb707ed48b04d23bde
2019-05-14 16:45:28 +02:00
43547267a0
Changed condition for ldap Force automatically create profile user
...
Former-commit-id: caa1218b7ae4dc09649a6a4bb54b158255ea268f
2019-05-14 15:59:35 +02:00
ff8abf9b40
updated function for show and hide ehorus form
...
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
2019-05-14 15:34:22 +02:00
26bc3af1d1
Fixed centralized mode message
2019-05-14 15:16:24 +02:00
6e35f6aec7
UM updates and fixes
...
Former-commit-id: 1c06fca2174091a1a18de3d88724dc4243306b39
2019-05-14 13:41:21 +02:00
827ebcfbc5
Fix helps
...
Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267
2019-05-14 13:09:49 +02:00
79701bba60
Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA
...
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
2019-05-14 12:34:40 +02:00
ae11ea18c9
Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas
...
Conflicts:
pandora_console/include/functions_graph.php
Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
2019-05-14 12:27:02 +02:00
b89751e647
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
2019-05-14 11:50:07 +02:00
421e6b559d
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: 1addcf3afd8ef2b4376f7b888ea10e1e5735deb7
2019-05-14 11:46:39 +02:00
8ff62a58ce
Merge branch 'ent-3695-ipam-oids' into 'develop'
...
IPAM vlan wizard ExtremeXOS
See merge request artica/pandorafms!2409
Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
2019-05-14 11:30:55 +02:00
b508e40a73
Changed simple quote in alerts
...
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
15446453fb
Merge branch 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' into 'develop'
...
Ent 3771 nueva tipo de macro password en comandos acciones de alerta
See merge request artica/pandorafms!2397
Former-commit-id: bd4887079f93ed26eef66f5b5047dcc07caf56a6
2019-05-14 10:53:44 +02:00
4497554b37
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: b271e6e740b1f0cdec273786fae3e707288e72cd
2019-05-14 10:40:49 +02:00
865796ed5e
Merge branch 'visual-console-phase-2' into 'develop'
...
Visual console phase 2
See merge request artica/pandorafms!2404
Former-commit-id: af616c2346655fcf1f5732c00c0ef2f053126d86
2019-05-14 10:21:14 +02:00
cf45be2c60
Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews'
...
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
2019-05-14 10:03:37 +02:00
9501187ebc
Se cambian las consultas sql sin la imagen en la consulta
...
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
2019-05-14 10:01:30 +02:00
bad2a330fd
Se muestra en la pantalla mediante html la imganen
...
Former-commit-id: ddd86fc0b4768ed5c3750c304fded70de3389864
2019-05-14 09:48:41 +02:00
5fe4a240be
se añade imagen y se quita de bbdd
...
Former-commit-id: 4d9174e95ffb6f5a35aa194177363c27dcd2c4a1
2019-05-14 09:47:45 +02:00
b7ebb44c48
Auto-updated build strings.
...
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
2019-05-14 00:01:09 +02:00
5f87b13e13
WIP: updatemanager interaction
...
Former-commit-id: 5983c8a2f885dc696fb5bdf779e3e56783687667
2019-05-13 19:34:10 +02:00
81f7cf699b
Merge branch 'ent-3768-no-funciona-selector-de-nodo-event-group-report-meta' into 'develop'
...
Ternary condition is added
See merge request artica/pandorafms!2311
Former-commit-id: c7e9365d322c9f2bf7b52a58c4e6f077f3e68288
2019-05-13 18:36:34 +02:00
6ca07c0914
Merge remote-tracking branch 'origin/develop' into 1668-update-manager
...
Former-commit-id: 33d676ea02d3dfbb3f8c3c23aa8466192516eafb
2019-05-13 17:58:35 +02:00
860a4cdbf2
Updated pandoradb and migrate
...
Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
2019-05-13 17:57:21 +02:00
ced1b32915
Configuration, Registration and newsletter wizards
...
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
2019-05-13 17:55:41 +02:00
8c1c337522
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
2019-05-13 17:36:32 +02:00
539f416cc4
Merge
...
Former-commit-id: ab93502ce1140ff37c513f2c574b4ca22f552ee9
2019-05-13 17:30:35 +02:00
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +02:00
9347fc17aa
Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
2019-05-13 17:10:06 +02:00
a38ef3e729
Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop'
...
Added condition type not normal in alert templates
See merge request artica/pandorafms!2376
Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
2019-05-13 16:51:34 +02:00
Daniel Rodriguez
Tatiana Llorente
manuel
fbsanchez
Alejandro Gallardo Escobar
Daniel Barbero Martin
artica
marcos.alconada
Alejandro Fraguas
Daniel Maya
alejandro-campos
artica
Luis Calvo