Commit Graph

20114 Commits

Author SHA1 Message Date
Daniel Barbero Martin 19bf0ae940 Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: f1c63c2e0be43e9c01306375446fc1eaa3c039ef
2019-03-26 17:22:36 +01:00
Daniel Barbero Martin db39c3921b fixed minor error tasklist
Former-commit-id: 1ee10794b09e17c3b8403dfe5540195047595577
2019-03-26 17:22:14 +01:00
fbsanchez 3316d19bd3 minor fix
Former-commit-id: ff5da555c29cdde5d632e090f2b9ac779ead262f
2019-03-26 17:00:20 +01:00
fbsanchez ee6ab43a8c minor fix
Former-commit-id: e1a238bd34f4264e6be9c8a826cc1057578dd0a7
2019-03-26 16:54:11 +01:00
fbsanchez a76ad27825 minor fixes
Former-commit-id: f885316b4f063daac744ca458fa3d41a16d5d81b
2019-03-26 16:51:09 +01:00
fbsanchez 2d1463ee0c minor fixes networkmaps
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
fbsanchez 511295f1c6 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: f43d6ace220a8058f91d115386bdf56e59550cbe
2019-03-26 16:32:19 +01:00
alejandro-campos a0f4eb1910 change discovery page title
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
2019-03-26 16:10:03 +01:00
alejandro-campos 0d8322aeda Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: a9ac8888641116a4e98fbe7ac2d99901e771f275
2019-03-26 15:42:47 +01:00
alejandro-campos ec999341ba change discovery headers and add breadcrumbs to them
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
Daniel Barbero Martin e3b0b7ad11 fixed update progress bars task for 3 second
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
2019-03-26 15:38:47 +01:00
alejandro-campos d1bd5fbb1a Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a
2019-03-26 13:06:12 +01:00
fbsanchez d05b78520f minor style fix tasklist popup
Former-commit-id: 628e94f56a92558e3af648520ca13d4fb658d184
2019-03-26 11:09:17 +01:00
Daniel Rodriguez 5b0555e7cb Merge branch 'ent-3754-Ajustes-menú-lateral' into 'develop'
Ent 3754 ajustes menú lateral

See merge request artica/pandorafms!2291

Former-commit-id: 2cfa456d9e49aa262f08c690426bcbabb180392b
2019-03-26 09:42:29 +01:00
Daniel Rodriguez c3f7dd38d0 Merge branch 'ent-3342-SLA-status-transalation-error-fail' into 'develop'
Added translation files with string Fail

See merge request artica/pandorafms!2290

Former-commit-id: 0ba45f1aad523dcf45585a2bb44becd3e92b2747
2019-03-26 09:33:39 +01:00
artica 90a2e28247 Auto-updated build strings.
Former-commit-id: b835fca52692b4696092f9cd5c5737705b7c8153
2019-03-26 00:01:25 +01:00
fbsanchez 4031ae9bf7 minor update in notification viewer
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
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
fbsanchez 3d0f25cd6e discovery task status overview
Former-commit-id: 5eeb3a3220c05f30f0559d50620aa29389fb145c
2019-03-25 20:00:05 +01:00
fbsanchez 6cc6f6f125 discovery task status overview
Former-commit-id: 329d03c109b9e09788302212752f372647b19c56
2019-03-25 19:58:01 +01:00
alejandro-campos 9947fb8f34 remove console.log
Former-commit-id: 12feadfc9094d8507e5e7df595e7667a67964362
2019-03-25 19:42:12 +01:00
alejandro-campos 079f578830 fix bad behavior of pandoras side menu on page load
Former-commit-id: b1d4eb3e2464fa441f16190d29b2d57cfaa9e3c5
2019-03-25 19:37:45 +01:00
Luis Calvo 5a38be13ea Added translation files with string Fail
Former-commit-id: a0176a1fd734b7bdc1d5ffa49d29c059eb96acda
2019-03-25 18:22:42 +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 c942242652 Changed map image size
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
2019-03-25 17:59:02 +01:00
Daniel Rodriguez 3ef49d14f9 Merge branch 'ent-3669-Cambios-en-cabecera' into 'develop'
Ent 3669 cambios en cabecera

See merge request artica/pandorafms!2287

Former-commit-id: 8fd555ba5167fe268dccf0801366e6ad4fb58cd0
2019-03-25 17:57:47 +01:00
fbsanchez 1238f15190 discovery task advanced summary support
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
Tatiana Llorente 448a5e64ea Fixed disabled custom logo in open version
Former-commit-id: 4b5cd56af623bd6485111240be0bb0e11a0a3162
2019-03-25 16:46:17 +01:00
Tatiana Llorente c682e5f326 Remove new font in edit user
Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c
2019-03-25 16:27:25 +01:00
fbsanchez 0cdf8a16cf removed debug trace
Former-commit-id: c9be9dfa635e45d50fdc908134e6f5cc65383c7e
2019-03-25 15:53:52 +01:00
fbsanchez dad791b887 relationship management JS
Former-commit-id: 82216265dece0e5d9f77a82b1b22d6ff00265ee1
2019-03-25 15:52:15 +01:00
Daniel Rodriguez 93d8cfc2f5 Merge branch 'ent-3566_No_refresca_eventos_cuando_pasan_X_cosas' into 'develop'
fixed reload page twice

See merge request artica/pandorafms!2288

Former-commit-id: b4055e5d62da01bbb031de68317ce4ee3308a97d
2019-03-25 13:49:43 +01:00
Daniel Rodriguez 2ddf0a0201 Merge branch 'ent-3491-rworks-acl-enterprise' into 'develop'
Fixed enterprise acl in extensions(tool)

See merge request artica/pandorafms!2285

Former-commit-id: bd696e945d5b298fcbfe61cb412424770d1c4193
2019-03-25 13:13:24 +01:00
Daniel Barbero Martin 4ea17bb0c6 fixed reload page twice
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
2019-03-25 12:53:50 +01:00
Tatiana Llorente a841472bff Changes in header
Former-commit-id: 6ef8f7fc6513562e782e7d89dc5a13a4369480c4
2019-03-25 12:50:43 +01:00
Tatiana Llorente cd63f38150 Merge remote-tracking branch 'origin/develop' into ent-3669-Cambios-en-cabecera
Former-commit-id: c07797dfa3a30d4379bf2b4c32fee7d6bb53639d
2019-03-25 12:43:38 +01:00
Tatiana Llorente fe7103ba9c Changes in header
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
Daniel Maya 24309e9582 Fixed enterprise acl in extensions(tool)
Former-commit-id: 966614e5214713c94ed40e0df86d6061695667f1
2019-03-25 12:22:18 +01:00
fbsanchez e1a4250d01 NetworkClass RC1
Former-commit-id: bd30ce824e0f50e9684e32268bea396a84ff6744
2019-03-25 11:09:22 +01:00
fbsanchez b5401a500c minor fixes
Former-commit-id: 30e4d5dffa78834088d8644168d4d64b13cf8b08
2019-03-25 11:02:16 +01:00
fbsanchez 040f942c9f Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9affd1c5f658a8c24c92f7e3b9868fc35868bd32
2019-03-25 10:29:49 +01:00
Alejandro Fraguas 5411eb9d17 Merge branch 'ent-3735-Buguete-filtrado-de-eventos-por-grupo' into 'develop'
fix bug in event filter by group when not using secondary groups

See merge request artica/pandorafms!2276

Former-commit-id: e414c5033fbcde1d97a28190170454080531ef34
2019-03-25 10:22:45 +01:00
artica 3916bcf636 Auto-updated build strings.
Former-commit-id: f5e0b2e0c54dddef282d78ddc279d689b1bf4a45
2019-03-25 00:01:22 +01:00
artica 0e51cd0760 Auto-updated build strings.
Former-commit-id: 54f84af77a2fdaaa8a11cef36b5ff91d614d2219
2019-03-24 00:01:23 +01:00
artica 9efd962867 Auto-updated build strings.
Former-commit-id: 37089ebb5e845ab42d62cb476e1cdc5d723904bb
2019-03-23 00:01:24 +01:00
fbsanchez 0708947804 add interface link fix
Former-commit-id: 368a30d67bdbd3a08e503167b81a75fb733f327b
2019-03-22 20:30:14 +01:00
fbsanchez 83a80b6aa2 minor fix
Former-commit-id: 0d68f24c418109858469dce32fb1cfd79e585775
2019-03-22 19:28:32 +01:00
fbsanchez eac0d66056 refresh holding area in networkmap
Former-commit-id: 17492041e3c14d15a6cf96b522ab368e9a2b7974
2019-03-22 19:16:45 +01:00
fbsanchez face622e9e reset-map fixed
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
2019-03-22 18:27:12 +01:00
fbsanchez 091e2db13a minor fix
Former-commit-id: 55b56db7a7ca1eee5d48731269d2894425037e3b
2019-03-22 16:00:01 +01:00