fbsanchez
|
4947d2117a
|
minor fixes networkmapclass
Former-commit-id: d8eaa2ab328d803647d365a023c3ec08efb086d3
|
2019-03-22 03:56:31 +01:00 |
|
fbsanchez
|
6990951dc7
|
Fix in group map calculation
Former-commit-id: 1d77a55b629553ac89cb0ae33d1d1f1ad76c3de3
|
2019-03-21 21:34:56 +01:00 |
|
fbsanchez
|
26d231e78c
|
Improved user experience networkmaps
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
|
2019-03-21 20:52:01 +01:00 |
|
fbsanchez
|
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 |
|
fbsanchez
|
8fd3f7788a
|
networkmap functions ligth cleanup
Former-commit-id: 51d7eaa9dee0d58eb8e01f4043149766145df20d
|
2019-03-21 18:38:31 +01:00 |
|
fbsanchez
|
95d2259236
|
Improvements. networkmap class
Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9
|
2019-03-21 16:16:53 +01:00 |
artica
|
dfadf48b4e
|
Auto-updated build strings.
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
|
2019-03-21 00:02:00 +01:00 |
|
fbsanchez
|
6fb6963501
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
|
2019-03-20 17:40:08 +01:00 |
|
fbsanchez
|
ad432ffc12
|
Merge branch 'ent-3595-discovery-fase-2' into wip/3595
Former-commit-id: df24037730e212308a8e8805e0440e73e1ec0f16
|
2019-03-20 17:28:35 +01:00 |
|
fbsanchez
|
05c03d2d46
|
NetworkMap class
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
|
2019-03-20 17:22:06 +01:00 |
Alejandro Fraguas
|
49a28eb13c
|
Merge branch 'ent-3612_Update_manager_eliminar_archivos_obsoletos' into 'develop'
add delete files in update manager
See merge request artica/pandorafms!2263
Former-commit-id: 13d246c80921f2d4b5ceb0b191d0024e8bba753c
|
2019-03-20 15:51:19 +01:00 |
Daniel Barbero Martin
|
daf72a4bac
|
fixed errors delete files update manager open and metaconsole
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
|
2019-03-20 13:35:24 +01:00 |
|
fbsanchez
|
9aecc6b85b
|
NetworkClass RC1
Former-commit-id: 8b77646d618d157f0804b11cb7193a7f25bda97b
|
2019-03-20 13:10:20 +01:00 |
|
artica
|
c598eb60fb
|
Auto-updated build strings.
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
|
2019-03-20 00:01:24 +01:00 |
|
fbsanchez
|
1b99c5db49
|
WIP netclass editor
Former-commit-id: 2c7dffb63e4f9c587c3cdcbf8f87f134a82c1299
|
2019-03-19 20:43:08 +01:00 |
|
artica
|
392c0d0bff
|
Auto-updated build strings.
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
|
2019-03-19 00:01:25 +01:00 |
|
fbsanchez
|
97b53db82b
|
wip relationships
Former-commit-id: 7f582f8c0197f488438226120eaea4c4dcc1646e
|
2019-03-18 18:11:54 +01:00 |
Daniel Maya
|
c2033715a9
|
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 4e097a7169f1ecb05c843076b67f98f0ea1370af
|
2019-03-18 09:06:20 +01:00 |
|
Daniel Maya
|
d13e7bbf44
|
new generic functions
Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286
|
2019-03-18 09:05:47 +01:00 |
|
Daniel Maya
|
8a7702e054
|
Update networkmap class with simple map
Former-commit-id: cb6bd489ba973cf0f9c6eda8dee062518f33f382
|
2019-03-18 09:01:53 +01:00 |
|
artica
|
4772f84850
|
Auto-updated build strings.
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
|
2019-03-18 00:01:24 +01:00 |
|
fbsanchez
|
1ddeda295c
|
WIP networkmap class
Former-commit-id: fbd4ed5e5784c510bc1ea66f1627e61fa176573c
|
2019-03-17 01:39:56 +01:00 |
|
artica
|
093404eedc
|
Auto-updated build strings.
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
|
2019-03-17 00:01:29 +01:00 |
|
artica
|
16d5bf5f66
|
Auto-updated build strings.
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
|
2019-03-16 00:01:30 +01:00 |
|
fbsanchez
|
fe045962e7
|
wip generate_dot
Former-commit-id: f41d5a55ec9cd8f27124d6697e92c5fb3009a2d2
|
2019-03-15 20:44:57 +01:00 |
|
Daniel Barbero
|
d5108efb0d
|
fixed error update manager delete files
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
|
2019-03-15 12:19:02 +01:00 |
|
Daniel Barbero
|
916d11c625
|
Merge remote-tracking branch 'origin/develop' into ent-3612_Update_manager_eliminar_archivos_obsoletos
Former-commit-id: 70641758194522782cc1041f51a278350a7877f1
|
2019-03-15 10:39:23 +01:00 |
|
Daniel Barbero
|
7e345035e1
|
add height and round border in d3 graph progress
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
|
2019-03-15 10:22:55 +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 |
|
artica
|
be08d76e6c
|
Auto-updated build strings.
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
|
2019-03-15 00:01:22 +01:00 |
|
fbsanchez
|
8c8f368993
|
WIP: NetworkMaps rebuild
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
|
2019-03-14 18:51:48 +01:00 |
|
Daniel Barbero Martin
|
a1aa480421
|
add delete files in update manager
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
|
2019-03-14 18:04:28 +01:00 |
|
artica
|
0ccbb1198a
|
Auto-updated build strings.
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
|
2019-03-14 00:01:25 +01:00 |
|
fbsanchez
|
f4290e52fe
|
Minor fix notif. ball margins
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
|
2019-03-13 15:55:24 +01:00 |
|
fbsanchez
|
95c61024f7
|
Cleanup Networkmaps
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
|
2019-03-13 11:38:03 +01:00 |
Daniel Rodriguez
|
046a126889
|
Merge branch 'ent-3696-7723-No-inserta-comentario-create_event-API' into 'develop'
disable cache for events_comment
See merge request artica/pandorafms!2257
Former-commit-id: 1293d55a9bc009b79e37dd54cd848544ae6c3286
|
2019-03-13 10:32:56 +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 |
|
artica
|
99afea22cb
|
Auto-updated build strings.
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
|
2019-03-13 00:01:24 +01:00 |
|
fbsanchez
|
e61d409acc
|
fix in redirection after map creation
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
|
2019-03-12 19:23:40 +01:00 |
|
fbsanchez
|
bf9b84f266
|
discarded ranksep var as recommended edge len
Former-commit-id: 24fe2b0f7ff49b9bdf4e4ef6463ddf5f66de04d8
|
2019-03-12 18:38:58 +01:00 |
|
fbsanchez
|
663c1e0841
|
NetworkMap class rc1
Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
|
2019-03-12 18:32:55 +01:00 |
|
fbsanchez
|
1bc326c00c
|
WIP: NetworkMap class
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
|
2019-03-12 18:17:18 +01:00 |
|
Alejandro Fraguas
|
cb1fc5dc67
|
Merge branch 'ent-3616-Pantalla-de-login' into 'develop'
Ent 3616 pantalla de login
See merge request artica/pandorafms!2248
Former-commit-id: c6e02af2b50a12933ec31cd5496fafb10a646c7a
|
2019-03-12 17:23:04 +01:00 |
|
fbsanchez
|
c91c79a735
|
WIP experiments with graphviz
Former-commit-id: cee005851cd7ed05aa43fd3037c5c7d743d06fa7
|
2019-03-12 16:52:42 +01:00 |
|
fbsanchez
|
06f8aae91a
|
WIP NetworkMap class
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
|
2019-03-12 16:22:28 +01:00 |
|
Daniel Maya
|
96d6e12546
|
disable cache for events_comment
Former-commit-id: 4a3477e1911d7d5cc02ac5207ccc30cb43e7f220
|
2019-03-12 16:12:58 +01:00 |
|
Daniel Rodriguez
|
d314062623
|
Merge branch 'ent-2674-Nueva_macro_event_timestamp' into 'develop'
Ent 2674 nueva macro event timestamp
See merge request artica/pandorafms!2244
Former-commit-id: 9414e607f69637c19a5d8e61e80a2d43abb9ce0b
|
2019-03-12 13:51:47 +01:00 |
|
daniel
|
15ca89068d
|
Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
Conflicts:
pandora_console/godmode/servers/manage_recontask_form.php
pandora_console/include/functions_events.php
Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
|
2019-03-12 13:07:12 +01:00 |
|
fbsanchez
|
d7983bec4e
|
WIP NetworkMap class
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
|
2019-03-12 12:05:54 +01:00 |
Tatiana Llorente
|
29f00dd1da
|
New login page
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
|
2019-03-12 11:09:12 +01:00 |