2461f826ce
Merge branch 'ent-3715-Pete_sql_en_mr_del_ipam' into 'develop'
...
fixed IPAM config
See merge request artica/pandorafms!2274
Former-commit-id: 95786e5f3fa31e8d8c663ee8f3488336c59d9b3c
2019-04-02 09:41:02 +02:00
4957bd763a
Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3791-7780-cron-en-modulos-no-funcionan-bien
...
Former-commit-id: e9a9619b767208a7249e44a1fb98623f2ff93c11
2019-04-02 09:04:34 +02:00
f67c3d5fc0
Auto-updated build strings.
...
Former-commit-id: 5e2eef78f8e98e69b43dd409c6ba0740c0e7a959
2019-04-02 00:01:31 +02:00
ee6d8642f3
Merge branch 'ent-3805-nombre-agente-guarda-sin-guion' into 'develop'
...
Fix agent name input to allow '-'
See merge request artica/pandorafms!2319
Former-commit-id: 9496fa004ee36b8d09c875a77cf3f19bec45a130
2019-04-01 18:49:11 +02:00
6733182b5d
Merge branch 'ent-3757-Errores-en-diagnostic-info' into 'develop'
...
Fixed errors in Diagnostic tool
See merge request artica/pandorafms!2292
Former-commit-id: 62fafd92e852c65136c50a3c0ff6d80a3edf72b8
2019-04-01 18:39:12 +02:00
2afc16c8dc
Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop'
...
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf
See merge request artica/pandorafms!2272
Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
2019-04-01 17:51:37 +02:00
92408f2ac1
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: fb37c8e84e264cd27158a481774c3712650df647
2019-04-01 16:11:49 +02:00
07e464d52b
Merge branch 'develop' into visual-console-refactor
...
Former-commit-id: c986c2d40359b2d35808037b857ae931becf7e91
2019-04-01 16:04:20 +02:00
343c6a6edf
Fix agent name input to allow '-'
...
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
2019-04-01 15:18:56 +02:00
73a7842ac1
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' into 'visual-console-refactor'
...
created item class and test
See merge request artica/pandorafms!2277
Former-commit-id: db7ad849637af4fb2839625078b51c511a4b564f
2019-04-01 13:05:28 +02:00
c07319fb70
Insert zero into fires_min an fires_max when null
...
Former-commit-id: de1197159053155d4f962d74179933c46189460e
2019-04-01 12:56:10 +02:00
be0f96b5f0
add ff_type Windows agent
...
Former-commit-id: d167449fe305d6a013eb2b2e22ec48a58af1e346
2019-04-01 12:52:09 +02:00
8c1076453f
Visual Console Refactor: added the events history item to the visual console container
...
Former-commit-id: 0105d2cc1a93a24e0d53df8fe057ef233d8a2843
2019-04-01 11:50:30 +02:00
ae0ca5a204
Visual Console Refactor: finished the events history item and added new lib functions
...
Former-commit-id: b54534b7e5a44764622e2f99c18f4f5edc6703f6
2019-04-01 11:16:46 +02:00
ad80b5b562
Merge remote-tracking branch 'origin/develop' into ent-3783-Error-date-last-contact-snmp-interfaces-view
...
Former-commit-id: 9c82f920608289d3f4fb49d4295c6356b7551f56
2019-04-01 10:36:27 +02:00
5ca01b0294
add ff_type linux agent
...
Former-commit-id: 0e903a7e304c5a2ea4dcf8570e45663524777748
2019-04-01 10:27:24 +02:00
ebbd131941
Visual Console Client: Upgraded the dependencies
...
Former-commit-id: cec7459402c6f3f6558c8a64918ad377ca0ea8f3
2019-04-01 09:56:33 +02:00
2d26a74f9e
Auto-updated build strings.
...
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
2019-03-31 00:01:22 +01:00
69df187ae5
Auto-updated build strings.
...
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
2019-03-30 00:01:27 +01:00
4fd3aa3a51
Avoid to execute non cron complianced modules on creation
...
Former-commit-id: edfb13175ca00bc5aee99609c0eec30e06d5936e
2019-03-29 15:06:26 +01:00
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
59300bd757
Changed field for last contact to timestamp
...
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
2019-03-29 13:24:22 +01:00
8be5cc6a38
Visual Console Item: removed some warning messages
...
Former-commit-id: e498e29eda0f790669a3343265c7b923773482b0
2019-03-29 11:57:14 +01:00
470d0b71d1
Visual Console Refactor: finished the label support
...
Former-commit-id: d09e3ac1a35722d6531817e5c935e4b582a5e0eb
2019-03-29 11:54:01 +01:00
05ce178854
Fixed week day cron in server
...
Former-commit-id: cfbd3601904c85fa1112eaf0f2310edb53f9afe8
2019-03-29 11:51:51 +01:00
4893c78f77
Added the label and colorcloud classes
...
Former-commit-id: 5a68272b63169f7d36520b3d4cdead28b26209d3
2019-03-29 11:49:40 +01:00
2a96b610d9
Auto-updated build strings.
...
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
129c4ad3dd
Visual Console Refactor: WIP
...
Former-commit-id: f201bf5320f460fe1c57bd31c683a0cb7c7293b0
2019-03-28 17:59:35 +01:00
58f6fac29e
Added colorCloud and changes in clock item
...
Former-commit-id: 19a053332ae6a30a60f2fb88611a0ad74d447bb5
2019-03-28 17:55:32 +01:00
33197df731
add new functionality flipflop
...
Former-commit-id: 00a71df0d228833dbe7211504e11418d91622d93
2019-03-28 17:33:49 +01:00
783417cab5
rollback agent_get_agents
...
Former-commit-id: 95627afdb87777d0703fe57a82f7a3e0ec82b286
2019-03-28 12:20:15 +01:00
4c08987ece
Merge branch 'develop' into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
...
Former-commit-id: f235e3324cbf60afc015a870b9464b6bcf7bd89a
2019-03-28 09:52:14 +01:00
e3222626dc
fixed error in bbdd
...
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
2019-03-28 09:49:16 +01:00
626aacbf43
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
2019-03-28 08:49:08 +01:00
98a9c62de9
Auto-updated build strings.
...
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
2019-03-28 00:01:30 +01:00
1299d6c7d6
Merge branch 'fix/netmap' into 'develop'
...
minor fix
See merge request artica/pandorafms!2307
Former-commit-id: cd6071765c1e9be5d05ed7283f0a49146ac46cb7
2019-03-27 18:34:35 +01:00
086ee0620e
minor fix
...
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
2019-03-27 18:31:02 +01:00
a3865a3181
flip flop keep counters
...
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
c85a84673f
Merge branch 'fix/mr26' into 'develop'
...
fix mr 26
See merge request artica/pandorafms!2306
Former-commit-id: d90f41df35dfbe7655af56648ca40ec9e9b3cc43
2019-03-27 17:57:24 +01:00
128a97d254
fix mr 26
...
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
2019-03-27 17:38:08 +01:00
0f30633094
Merge branch 'fix/mr' into 'develop'
...
minor fix
See merge request artica/pandorafms!2304
Former-commit-id: f24ca3e2617a696adb9de32ad5fd1bd5f5b14111
2019-03-27 17:27:39 +01:00
144cf1177d
fix tasklist map
...
Former-commit-id: 4f1195c265f4298b7303597be43b3399fa32f4e3
2019-03-27 17:12:38 +01:00
66b2102052
Merge remote-tracking branch 'origin/develop' into fix/mr
...
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
2019-03-27 17:09:46 +01:00
6ebbe54448
minor fix
...
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
2019-03-27 17:06:14 +01:00
160a72d780
Merge branch 'fix/delete' into 'develop'
...
errata fix
See merge request artica/pandorafms!2303
Former-commit-id: 2dc2834075b9491712dbd37ac087b9e20c274059
2019-03-27 16:51:19 +01:00
2dd427100e
errata fix
...
Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0
2019-03-27 16:44:08 +01:00
74cb6970dc
Updated version and build strings.
...
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +01:00
8426374776
Merge branch 'ent-3776-Menú-lateral-debe-aparecer-desplegado-por-defecto-2' into 'develop'
...
fix pandora logo image path
See merge request artica/pandorafms!2302
Former-commit-id: 7b4fbefe53b68c12ad8c4daf8e6d0c4dd283e2d1
2019-03-27 16:30:55 +01:00
082e5f06d6
fix pandora logo image path
...
Former-commit-id: 92bc151f8e988758af7381ca95b8055ec7a23d5e
2019-03-27 16:26:47 +01:00
f7cf7c65ac
Merge branch 'fix/menu' into 'develop'
...
minor fix menu
See merge request artica/pandorafms!2300
Former-commit-id: d40a7d3a84f1de2de7283ff134bc720ed14a59ca
2019-03-27 16:00:56 +01:00
Alejandro Fraguas
Fermin
artica
Daniel Rodriguez
Daniel Maya
Luis Calvo
Alejandro Gallardo Escobar
Daniel Barbero Martin
Alejandro Gallardo Escobar
fbsanchez
artica
alejandro-campos