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
d05b78520f
minor style fix tasklist popup
...
Former-commit-id: 628e94f56a92558e3af648520ca13d4fb658d184
2019-03-26 11:09:17 +01:00
4031ae9bf7
minor update in notification viewer
...
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
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
3d0f25cd6e
discovery task status overview
...
Former-commit-id: 5eeb3a3220c05f30f0559d50620aa29389fb145c
2019-03-25 20:00:05 +01:00
6cc6f6f125
discovery task status overview
...
Former-commit-id: 329d03c109b9e09788302212752f372647b19c56
2019-03-25 19:58:01 +01:00
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
c942242652
Changed map image size
...
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
2019-03-25 17:59:02 +01:00
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
1238f15190
discovery task advanced summary support
...
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
448a5e64ea
Fixed disabled custom logo in open version
...
Former-commit-id: 4b5cd56af623bd6485111240be0bb0e11a0a3162
2019-03-25 16:46:17 +01:00
c682e5f326
Remove new font in edit user
...
Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c
2019-03-25 16:27:25 +01:00
0cdf8a16cf
removed debug trace
...
Former-commit-id: c9be9dfa635e45d50fdc908134e6f5cc65383c7e
2019-03-25 15:53:52 +01:00
dad791b887
relationship management JS
...
Former-commit-id: 82216265dece0e5d9f77a82b1b22d6ff00265ee1
2019-03-25 15:52:15 +01:00
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
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
4ea17bb0c6
fixed reload page twice
...
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
2019-03-25 12:53:50 +01:00
a841472bff
Changes in header
...
Former-commit-id: 6ef8f7fc6513562e782e7d89dc5a13a4369480c4
2019-03-25 12:50:43 +01:00
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
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
24309e9582
Fixed enterprise acl in extensions(tool)
...
Former-commit-id: 966614e5214713c94ed40e0df86d6061695667f1
2019-03-25 12:22:18 +01:00
e1a4250d01
NetworkClass RC1
...
Former-commit-id: bd30ce824e0f50e9684e32268bea396a84ff6744
2019-03-25 11:09:22 +01:00
b5401a500c
minor fixes
...
Former-commit-id: 30e4d5dffa78834088d8644168d4d64b13cf8b08
2019-03-25 11:02:16 +01:00
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
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
3916bcf636
Auto-updated build strings.
...
Former-commit-id: f5e0b2e0c54dddef282d78ddc279d689b1bf4a45
2019-03-25 00:01:22 +01:00
0e51cd0760
Auto-updated build strings.
...
Former-commit-id: 54f84af77a2fdaaa8a11cef36b5ff91d614d2219
2019-03-24 00:01:23 +01:00
9efd962867
Auto-updated build strings.
...
Former-commit-id: 37089ebb5e845ab42d62cb476e1cdc5d723904bb
2019-03-23 00:01:24 +01:00
0708947804
add interface link fix
...
Former-commit-id: 368a30d67bdbd3a08e503167b81a75fb733f327b
2019-03-22 20:30:14 +01:00
83a80b6aa2
minor fix
...
Former-commit-id: 0d68f24c418109858469dce32fb1cfd79e585775
2019-03-22 19:28:32 +01:00
eac0d66056
refresh holding area in networkmap
...
Former-commit-id: 17492041e3c14d15a6cf96b522ab368e9a2b7974
2019-03-22 19:16:45 +01:00
face622e9e
reset-map fixed
...
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
2019-03-22 18:27:12 +01:00
091e2db13a
minor fix
...
Former-commit-id: 55b56db7a7ca1eee5d48731269d2894425037e3b
2019-03-22 16:00:01 +01:00
732fdafc14
custom text in links
...
Former-commit-id: 31b851b5c296e8beb135a60f6b67ee8a073a28ea
2019-03-22 15:08:44 +01:00
e31607a4e0
custom link colors
...
Former-commit-id: 9aa8f8114494d8b8fd8f010fa5066142fd104f70
2019-03-22 15:06:01 +01:00
9ef66a11c4
custom link colors
...
Former-commit-id: 44a7df6e814679cfff1a0489374c25edcc9ab52c
2019-03-22 15:00:02 +01:00
4910da5e31
minor fix map_filter builder
...
Former-commit-id: 0ef6bcaa84163f21fe0d6bcd869a7b8646581893
2019-03-22 14:57:29 +01:00
a4c048dd29
minor fix
...
Former-commit-id: 1ccd9e446645362fb9b305a699527c5aa2c20369
2019-03-22 14:43:55 +01:00
bc1195e78e
minor fix
...
Former-commit-id: b100cf9398a52a443f934632794da991ea4f2342
2019-03-22 14:30:50 +01:00
3d71d17440
minor fix
...
Former-commit-id: 3d00cc3810df66e79ac69a71ee48df1c9c6b326e
2019-03-22 14:27:53 +01:00
64c4514ace
minor fix orphans while no pandora node
...
Former-commit-id: 067f83b5cd8fc87922c61622873b60753edebf2d
2019-03-22 13:16:26 +01:00
80ecb58f8f
minor fix orphans while no pandora node
...
Former-commit-id: a9f053624ba5c38a08c3589689d4a56cfcfcff37
2019-03-22 13:04:53 +01:00
0d301cd8ed
minor fix orphans while no pandora node
...
Former-commit-id: 5c21ffec17ba10d77921961c6c813b116449d3a0
2019-03-22 13:02:57 +01:00
45c7bea6e6
Fixed a bug: show map image alternative when offline
...
Former-commit-id: 9d3945a8fdff7c6c09db043037ae779b1b3ebecd
2019-03-22 10:57:22 +01:00
c19ec2b041
fix bug when filtering events by group
...
Former-commit-id: f5ee52f47cd615007f22ce54e67c1c345eed802b
2019-03-22 10:47:40 +01:00
4947d2117a
minor fixes networkmapclass
...
Former-commit-id: d8eaa2ab328d803647d365a023c3ec08efb086d3
2019-03-22 03:56:31 +01:00
cb8cd37ee7
Auto-updated build strings.
...
Former-commit-id: 0224100a1d5a485cd88ebbfdef94e84904e248b9
2019-03-22 00:01:32 +01:00
6990951dc7
Fix in group map calculation
...
Former-commit-id: 1d77a55b629553ac89cb0ae33d1d1f1ad76c3de3
2019-03-21 21:34:56 +01:00
26d231e78c
Improved user experience networkmaps
...
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
2019-03-21 20:52:01 +01:00
da3602fbc5
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 7867c83c3571bcd27c19f4c1dcdc6e8b95eb2715
2019-03-21 18:38:41 +01:00
alejandro-campos
fbsanchez
Daniel Rodriguez
Tatiana Llorente
Daniel Barbero Martin
Daniel Maya
Alejandro Fraguas
artica