Commit Graph

558 Commits

Author SHA1 Message Date
fbsanchez 436e60c736 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
Daniel Rodriguez dcf40fed3d Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop'
Ent 3610 vista edicion de usuario

See merge request artica/pandorafms!2278

Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0
2019-03-25 18:16:07 +01:00
Tatiana Llorente fe7103ba9c Changes in header
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
Tatiana Llorente 151fe6ac78 Fixed a bug: show map image alternative when offline
Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810
2019-03-21 18:13:21 +01:00
Tatiana Llorente d27c509817 Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario
Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c
2019-03-20 13:28:07 +01:00
Tatiana Llorente a99c8b1a7b New view user edit
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
Daniel Barbero 0593e72f3e move custom net scan and script to OPEN
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
fbsanchez 99b1aadacb discovery icon set
Former-commit-id: d88ba9c57d7a4c590e7a6965b2a4a9f7fd473790
2019-03-14 17:21:16 +01:00
fbsanchez 750c64fbd7 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
Tatiana Llorente aaf5d7bf89 New view user edit
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
Tatiana Llorente 29f00dd1da New login page
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
2019-03-12 11:09:12 +01:00
Tatiana Llorente c5722d2e10 New view user edit
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
Tatiana Llorente 9a702a90a1 New view user edit
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
Tatiana Llorente 71afb7a741 New login page
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
alejandro-campos 35ff5ced90 add aws first task icon
Former-commit-id: b5e083e599ebe00194261cbb5a6da017c5723f2c
2019-03-08 10:14:17 +01:00
Tatiana Llorente acc44ff9ce Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral'
Conflicts:
   pandora_console/install.php
Former-commit-id: 35214830b309620c88c44b32f93cfae93775e9a8
2019-03-06 09:18:38 +01:00
fbsanchez 70e4e86cdf Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
2019-03-05 18:58:26 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
Tatiana Llorente 12a287f322 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/install.php


Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
Tatiana Llorente 36fa0fc41f new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
samucarc 7e53461b94 Added new alert when failed database
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
2019-02-28 17:40:11 +01:00
Alejandro Fraguas 441fb979e1 Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
Ent 3210 nueva vista de servicios

See merge request artica/pandorafms!2195

Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
Tatiana Llorente 34eedc5330 new header and menu
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
Tatiana Llorente 526311d1c6 new header and menu
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
alejandro-campos eb56fd566c implemented services treeview
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
fbsanchez 4148387c50 Updates discovery
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00
fbsanchez 08c6d782a4 Add menuentry discovery
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24:32 +01:00
manuel 29206eb3bb Added visual changes
Former-commit-id: 33ac4873763e6b0e2cf3d2ad2b25492fe5b33583
2019-02-18 11:42:55 +01:00
fbsanchez 5093094d7d H&D tasklist and some visual changes
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
2019-02-15 18:05:59 +01:00
manuel 32d34cd09b Changed styles in host and devices
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
2019-02-15 14:02:32 +01:00
fbsanchez 4229be94bf Merge remote-tracking branch 'origin/develop' into 2952_Mejora_en_wizard_para_crear_agentes_desde_la_metaconsola
Former-commit-id: f6f1fd106a21820cc3f9f93e11fd0f5907986cd8
2018-12-26 17:51:11 +01:00
Alejandro Gallardo Escobar b0998003a3 Added a new icon
Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259
2018-12-10 09:19:26 +01:00
daniel 9d80e940bf fixed minor error cfv 2018-11-19 16:17:20 +01:00
samucarc e3b7f33287 Added improvements in the creation of agents in the meta console 2018-10-25 13:26:35 +02:00
vgilc 66e662c53e Merge branch '2572-Fallo-visual' into 'develop'
Database and application_osx icons added to select icon of group - #2572

See merge request artica/pandorafms!1749
2018-10-25 13:02:08 +02:00
vgilc 9b4eeb5c84 Merge branch '2723-Fallo-hint-en-eventos' into 'develop'
new function that adds a border to the image if the status is warning - #2723

See merge request artica/pandorafms!1743
2018-10-25 12:07:58 +02:00
samucarc 6a19c2faec Añadida icono service map 2018-10-04 11:09:03 +02:00
tatiana.llorente@artica.es 2fb8c99b2a Database and application_osx icons added to select icon of group - #2572 2018-09-11 15:30:16 +02:00
tatiana.llorente@artica.es d36c10fa08 new function that adds a border to the image if the status is warning - #2723 2018-09-10 13:22:02 +02:00
fermin831 90e3a423c4 Added secondary groups and no hierarchy documentation 2018-08-17 15:45:59 +02:00
fermin831 251c308d8c Fixed new servers (migration and autoprovision) icons 2018-06-20 18:31:52 +02:00
vgilc 822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop'
2042 ha cluster dev

See merge request artica/pandorafms!1524
2018-06-13 16:14:29 +02:00
danielmaya f9be72b34a added image 2018-06-12 10:14:59 +02:00
vgilc e808150f6b Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz' into 'develop'
Show warning modal window when change snmp or satellite module name - #2251

See merge request artica/pandorafms!1480
2018-06-04 10:18:44 +02:00
danielmaya 6711ff3e9c Added ha_cluster images 2018-05-31 10:30:21 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
enriquecd deb1cebeca Show warning modal window when change snmp or satellite module name - #2251 2018-05-11 16:13:56 +02:00
fermin831 0f4daee237 Added icon to realtime SNMP graph 2018-05-04 13:18:33 +02:00
fermin831 fb4be3cddf [SLA] Substitute the downplanned color 2018-04-11 16:22:16 +02:00
Ramon Novoa 42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00