1efedd26ce
Fixed bug in LDAP authentication
...
Former-commit-id: 4e0b2d46d5bcd71ea63e9d09e7c0d8865735227f
2019-04-09 13:39:30 +02:00
5494a6129f
Merge branch 'ent-3855-Problemas_grupos_secundarios_en_input_auto_completado_de_modulos' into 'develop'
...
fixed error autocomplete input module
See merge request artica/pandorafms!2345
Former-commit-id: 76a7c4aa1d611a21b307d0d6367a1f15dc40b323
2019-04-09 13:14:38 +02:00
e8740b1966
Default value changes in BarsGraph and DonutGraph
...
Former-commit-id: 57ace29b4cdcd075ddceb146b1344d3e61b2b1dd
2019-04-09 12:41:14 +02:00
eabe8ef00a
Visual Console Refactor: minor changes
...
Former-commit-id: 43125220be6ea9cc76ea5b5261fd13c3fcd36d29
2019-04-09 12:24:53 +02:00
cb75ec02f9
Visual Console Refactor: minor changes
...
Former-commit-id: 60dba09bdb9a99e38abd3a4301d9f24db73adc6a
2019-04-09 12:23:46 +02:00
4d45ddbf59
Added BarsGraph
...
Former-commit-id: 5733eb9a27a9da12f9a858dccd0509be3b762328
2019-04-09 12:14:38 +02:00
c313629080
Merge branch 'ent-3445-Solucionar_problematica_flip_flop' into 'develop'
...
flip flop keep counters
See merge request artica/pandorafms!2308
Former-commit-id: b3da4d57bb1c122e1a6040c9b4d35bc7c171043e
2019-04-09 12:04:54 +02:00
351b7218ee
Merge branch 'ent-3683-entities-appear-on-event-comment-api-call' into 'develop'
...
Removed unnecesary io_safe_inpunt on from functions_api.php
See merge request artica/pandorafms!2256
Former-commit-id: 870cdc2ea85241945628ac4a41864a0d54a57bea
2019-04-09 11:19:10 +02:00
6585a4736b
fixed minor error local companent with keep counters
...
Former-commit-id: f9864be72f448885b2da118585f1bbb92319bd18
2019-04-09 10:19:51 +02:00
8404450458
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Former-commit-id: 2809d31ae616b11dc1a210415ecb1c54e201fada
2019-04-09 09:53:31 +02:00
3e4a7bfdbf
fixed error autocomplete input module
...
Former-commit-id: c9fca2ba51b3b0872d39e658f18c5d3c5e917dbd
2019-04-09 09:51:03 +02:00
0d05d5c842
Auto-updated build strings.
...
Former-commit-id: dc883b86ccb845e022637413e334d4886805bc6b
2019-04-09 00:01:31 +02:00
48e9c1466b
Visual Console Refactor: fixed some linter errors
...
Former-commit-id: 728223630dc81243e37057657428646b7f03dc78
2019-04-08 17:16:05 +02:00
86c5ead4e9
Visual Console Refactor: refactored the donut graph model
...
Former-commit-id: a0dd9abb1473c2f74956509b21e879aea44ce1e2
2019-04-08 17:02:51 +02:00
cb2be4cd6f
Added DonutGraph
...
Former-commit-id: 09b54770531c96a6f5c504f06caaefc10463bba9
2019-04-08 16:21:26 +02:00
a9c2bb9a31
Visual Console Refactor: added the service model
...
Former-commit-id: 10b5b99b280a997bdc194a9130b4d53cbf4572dc
2019-04-08 12:37:25 +02:00
986db7e7c2
Visual Console Refactor: added autoload for enterprise models
...
Former-commit-id: e9f54ebef239348dcb4f96939cd3f1d8269b172c
2019-04-08 12:35:37 +02:00
db13ecbb39
Added token save profile user
...
Former-commit-id: 442a51cfbe7ac9730e9fd9c2c1ee16b6609e5f6a
2019-04-08 11:55:58 +02:00
f3a848a9b3
Visual Console Refactor: WIP precentile tests
...
Former-commit-id: 9b2f6a35516084228a2b5d535147bb8157fd6177
2019-04-08 10:31:21 +02:00
4c8736c3a1
Visual Console Refactor: refactored the visual console view
...
Former-commit-id: dbbed082521ea878edd4765971f058733f691c51
2019-04-08 10:31:04 +02:00
6e9aad0634
Visual Console Refactor: refactored the code which fetch the items
...
Former-commit-id: 509310021f5a2e9f660e06f98aeba426f7e81b56
2019-04-08 10:30:45 +02:00
112f7ab7ed
Visual Console Refactor: the group item now passes the tests
...
Former-commit-id: 2a967ef0a23c02fdb89352df65e8d5380cdd31f7
2019-04-08 10:29:30 +02:00
9fd5d3bf5a
Auto-updated build strings.
...
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
2019-04-08 00:01:23 +02:00
d35e9dbaae
Auto-updated build strings.
...
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
2019-04-07 00:01:25 +02:00
1ddb5ebff4
Auto-updated build strings.
...
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
2019-04-06 00:01:32 +02:00
49d925d96a
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Conflicts:
pandora_console/extras/mr/27.sql
Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00
61343313d3
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: de65f005e7afad749058961558702fb98e41bbd6
2019-04-05 14:51:47 +02:00
633ccc5f10
Update visual console view
...
Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
2019-04-05 14:51:28 +02:00
992209f5bb
Visual Console Refactor: added the module and custom graph model
...
Former-commit-id: 6756f9f4b9fb9803b7a91acb8e388d19d39a0b6f
2019-04-05 14:16:50 +02:00
55b9c07d63
Visual Console Refactor: error fixes
...
Former-commit-id: 758cd06bfd322a0c409ddf512230fdc1473d54c9
2019-04-05 14:16:18 +02:00
a480e4c73f
Merge branch 'ent-3740-Buguillo-en-configuracion-de-ACLs' into 'develop'
...
ent 3740 buguillo en configuracion de ac ls
See merge request artica/pandorafms!2281
Former-commit-id: 92349a3f4e6b9820606395d06964e64cdecbba9f
2019-04-05 13:17:30 +02:00
781a6702ad
Merge branch 'ent-2232-Checkbox-Opciones-para-los-informes' into 'develop'
...
Custom fields in availability report type
See merge request artica/pandorafms!2324
Former-commit-id: 66fca18bc387db638fb9ee39c5f21bc5ec1b2069
2019-04-05 13:01:09 +02:00
873525726e
Avoid infinite loops when the day of the week in cron is out of limits
...
Former-commit-id: 6c0a87a29818219364fb9c08c44b48cb79dd74a8
2019-04-05 12:32:43 +02:00
447655409d
fixed minor error keep counters local and network components
...
Former-commit-id: 8d57bede6ea7c6f44d51a696a3257600410734fe
2019-04-05 09:27:46 +02:00
6bd38c6d4c
Merge branch 'develop' into 'ent-3740-Buguillo-en-configuracion-de-ACLs'
...
Conflicts:
pandora_console/include/functions_menu.php
Former-commit-id: 96e46da859b6d05409a8b2166bb2822493fe6558
2019-04-05 08:15:48 +02:00
8d0e53924d
Auto-updated build strings.
...
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
2019-04-05 00:01:32 +02:00
4a3eaca1cd
Visual Console Refactor: added the ability to connect to the metaconsole's node to a pair of models
...
Former-commit-id: b798747314a3ce92a2428114cda19ffa6063e3cf
2019-04-04 19:26:10 +02:00
0f8c275ed1
Visual Console Refactor: added the status image to the group model
...
Former-commit-id: 80da05ae95ed87d4c7323594ada9e70c62f27501
2019-04-04 19:25:27 +02:00
33db6d2f0c
If is metaconsole, param meta is setted to true
...
Former-commit-id: d652754fc131a0024c0c7846335a4362767e5f1d
2019-04-04 18:13:29 +02:00
c52b30fd7e
Merge branch 'ent-3784-error-creating-alert-actions-api' into 'develop'
...
Insert zero into fires_min an fires_max when null
See merge request artica/pandorafms!2318
Former-commit-id: b7d8c6738530e1d842be34ad7f81c31a898d1c76
2019-04-04 18:03:53 +02:00
fdb13c1d1f
rhel dependencies
...
Former-commit-id: dd8eccf5d3476dc01ec2d409558483c90f20f499
2019-04-04 17:35:27 +02:00
49c913c6de
Added custom fields to report templates
...
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
2019-04-04 17:31:11 +02:00
21294807f4
forced dependencies 7.2 spec pandora_console rhel
...
Former-commit-id: 6cc644ccbf3afd341d9aafe0bd3cbd6ca3210f0f
2019-04-04 17:12:08 +02:00
eb1e505a79
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: cae1d1fbf8efb664d5042877d63584c4699801ab
2019-04-04 17:07:15 +02:00
5fb1ae0f44
Visual Console Refactor: great improvements into the Percentile model
...
Former-commit-id: 0988ae35202834d0dfc91bcd4870dff478a5d73e
2019-04-04 17:04:54 +02:00
418d73b003
Visual Console Refactor: error fixes
...
Former-commit-id: 5cfe645c4b02e84b9b2e9056747419bf144b0594
2019-04-04 17:03:56 +02:00
ead487b24b
Visual Console Refactor: add a new util function
...
Former-commit-id: 8b6266651ac81fcdd18a12b71f3f316eb246277a
2019-04-04 17:02:48 +02:00
a033149a2f
fixed problems with test
...
Former-commit-id: 7897203e3ba020fdda8b06fd82a53d18bd91aaa1
2019-04-04 16:08:50 +02:00
43b296c49c
Added docs to cron functions
...
Former-commit-id: 7f20d7abe989adcfc841e0ce20afbe007b660038
2019-04-04 15:30:30 +02:00
c5a49916cb
Fixed cron day of the week
...
Former-commit-id: eb6b7974d7304c430068375f19ef60db1a2bb442
2019-04-04 15:04:23 +02:00
ac0ad88e8d
Merge branch 'ent-3829-7866-no-se-ve-cabecera-si-tenemos-habilitado-token-"Fixed-header"' into 'develop'
...
Fixed problem with fixed header
See merge request artica/pandorafms!2331
Former-commit-id: 1cdcf881352c404b25cfcbc8c6b63a2c67dd05e5
2019-04-04 10:19:04 +02:00
de750bb59f
Merge branch 'visual-console-refactor' into 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual'
...
# Conflicts:
# pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
# pandora_console/include/rest-api/models/VisualConsole/Items/Label.php
# pandora_console/tests/Functional/Models/VisualConsole/Items/ColorCloudTest.php
# pandora_console/tests/Functional/Models/VisualConsole/Items/LabelTest.php
Former-commit-id: 4ef35ceb24d2cde4b3d18f92ea14ea617fcba2cd
2019-04-04 10:10:26 +02:00
f64835dca9
Auto-updated build strings.
...
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
2019-04-04 00:01:27 +02:00
1c4765f4f5
Merge branch 'ent-3688-7704-no-cambia-el-propietario-del-evento-en-event-response' into 'develop'
...
Resolved
See merge request artica/pandorafms!2251
Former-commit-id: dc092a97b35022dd846775568df9fca1e332022a
2019-04-03 18:47:52 +02:00
1f8d115130
Visual Console Refactor: finished the color cloud model
...
Former-commit-id: a8a98ba44a459044e9f262d6dc062bde64743406
2019-04-03 17:46:43 +02:00
adc0f3c21b
Visual Console Refactor: minor changes
...
Former-commit-id: a36d3901f79bb8342dc22e27946a2bb1798ce41c
2019-04-03 17:46:19 +02:00
77ab7cad40
Visual Console Refactor: improved the sorting of the the model's data
...
Former-commit-id: 3f5fb074fa0839cc207605f92b54cd2af9d16a8a
2019-04-03 17:45:56 +02:00
8923c53ec4
Fixed problem with fixed header
...
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
2019-04-03 16:48:28 +02:00
54f6f595dd
Merge branch 'ent-3824-7869-Mapas-GIS-no-funcionan' into 'develop'
...
Fixed problem with openlayer
See merge request artica/pandorafms!2330
Former-commit-id: 639deee6b66cf43894f4eb093d590d699bb9d37c
2019-04-03 16:02:45 +02:00
5ff1a9059a
Visual Console Refactor: added the label model
...
Former-commit-id: d1c26e023fd9c75f3ae9ab0f068e301b1e71d701
2019-04-03 15:18:29 +02:00
3df4c08782
Visual Console Refactor: error fixes
...
Former-commit-id: 01d70e83426c5eb21b2184190d6c2a39111a1c75
2019-04-03 14:46:49 +02:00
ccf0192547
Merge branch 'ent-3731-Bug_en_reports_SLA_mensual' into 'develop'
...
fixed SLA weekly hourly and monthly
See merge request artica/pandorafms!2271
Former-commit-id: 1335616814937252d57028905596ec3083d2464f
2019-04-03 14:23:22 +02:00
3afe6f8d3a
Visual Console Refactor: added the status image to the static graph item
...
Former-commit-id: 26560bf06dd8a88e8b24beed3244b030a94268b9
2019-04-03 13:19:50 +02:00
8f369828c4
Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop'
...
RHEL specs and build orders (update version)
See merge request artica/pandorafms!2327
Former-commit-id: 8d6acaab90efec5cec698272e98f76ebc40b39df
2019-04-03 13:11:25 +02:00
faecabb1cc
Fixed problem with openlayer
...
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
2019-04-03 12:54:36 +02:00
bd90bbd922
Visual Console Refactor: WIP percentile item
...
Former-commit-id: 1d852fb5dff28411aeda60431d8032e77159ea5d
2019-04-03 12:12:05 +02:00
32ba3aa1d4
Visual Console Refactor: error fix
...
Former-commit-id: f627143575317076eb9998f7e09029c3063870ca
2019-04-03 12:11:13 +02:00
24d8964fd9
Visual Console Refactor: added a system to abstract the html validation, extraction and encoding
...
Former-commit-id: d53b9fba38b1a57f2c00c627b30d6a3f2d8e64ef
2019-04-03 12:07:48 +02:00
dcd5ab6317
Merge branch '3787-agents_get_agents' into 'develop'
...
rollback agent_get_agents
See merge request artica/pandorafms!2309
Former-commit-id: 7badea15471fa3d7aae787f913c76c8da70472cc
2019-04-03 12:04:52 +02:00
e642907215
Merge remote-tracking branch 'origin/develop' into ent-3791-7780-cron-en-modulos-no-funcionan-bien
...
Former-commit-id: 46844dc1e44569be828ae90bfb22c669d4eb352a
2019-04-03 12:00:48 +02:00
ca4997fd7f
Visual Console Refactor: fixed the events history model
...
Former-commit-id: 9228339af7213996fb969ee631a93a3e972e102a
2019-04-03 11:40:40 +02:00
eb6757e91c
Visual Console Refactor: fixes
...
Former-commit-id: c9ae864cba26c6085e4e7390db26e32204ec7397
2019-04-03 11:25:35 +02:00
eb17b01adc
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 357f606489e6328157f6090484f0141914bbc482
2019-04-03 10:30:15 +02:00
0dca571e2d
Visual Console Refactor: minor fix
...
Former-commit-id: aaa840b7145ff0a449ab31f850095ca5574761e1
2019-04-03 10:28:41 +02:00
b7ed6f9a7b
Visual Console Refactor: refactores the SimpleValue model and added value retrieval
...
Former-commit-id: 97ef5c92852b8fc5fd7f71e960f947d22222abcd
2019-04-03 10:28:07 +02:00
8e89f07961
Visual Console Refactor: changed some functions from instance to static
...
Former-commit-id: 64fdb9086b5028570fea02de1bbe5e8c22e45c08
2019-04-03 10:27:22 +02:00
db30a8650e
Added visual_console_view
...
Former-commit-id: a121bb8ee6fe338561fcf7efda289727e1ba7afe
2019-04-03 10:08:01 +02:00
30e9b67062
Auto-updated build strings.
...
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
2019-04-03 00:01:33 +02:00
11d8edd88b
RHEL specs and build orders (update version)
...
Former-commit-id: 582d1bea42bc41a23fc773cf1d411bb4bdad50aa
2019-04-02 18:04:33 +02:00
5670157e06
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: a97cbb6723fb51b583c98af381bfd92f1a1413f2
2019-04-02 17:26:27 +02:00
a0a250bef7
fixed error add ff_type
...
Former-commit-id: b270ec363b84bbfafcea5418b6007aba8217680b
2019-04-02 16:45:01 +02:00
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
c679751f94
fixed error add ff_type
...
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
7be3d5fa58
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Former-commit-id: d0667e3686d186a79fe7525f73a770257eaaf883
2019-04-02 15:39:32 +02:00
490aa2ac0f
Merge branch 'ent-3783-Error-date-last-contact-snmp-interfaces-view' into 'develop'
...
Ent 3783 error date last contact snmp interfaces view
See merge request artica/pandorafms!2316
Former-commit-id: 6959931add69ebb7b1b43c23cd7758024c31a886
2019-04-02 14:33:14 +02:00
89bbbd2893
Revert "fixed IPAM config"
...
This reverts commit 1fe1beb930
2019-04-02 14:06:05 +02:00
62792c078f
Visual Console Refactor: refactored the events history item to return its HTML representation
...
Former-commit-id: 8b29503a24b1877c645a3b9856d09ee2db947f99
2019-04-02 13:00:49 +02:00
6c53833484
Visual Console Refactor: changed the visibility of a pair of functions
...
Former-commit-id: 8c42603b455cfda671a5eee5a3054a77c3eda845
2019-04-02 13:00:03 +02:00
431c807f61
Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop'
...
# Conflicts:
# pandora_console/extras/mr/27.sql
Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
2019-04-02 10:21:04 +02:00
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
c07319fb70
Insert zero into fires_min an fires_max when null
...
Former-commit-id: de1197159053155d4f962d74179933c46189460e
2019-04-01 12:56:10 +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
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
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
58f6fac29e
Added colorCloud and changes in clock item
...
Former-commit-id: 19a053332ae6a30a60f2fb88611a0ad74d447bb5
2019-03-28 17:55:32 +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
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
128a97d254
fix mr 26
...
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
2019-03-27 17:38:08 +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
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
fb818064ed
minor fix menu
...
Former-commit-id: 6d0ca2d3d86af083c91a098326dc073d90187ab0
2019-03-27 14:39:02 +01:00
f516c6d36a
Added EventsHistory, SimpleValue and StaticGraph
...
Former-commit-id: 9e56eb3df9997f0d601db774a7131f783cc3dfe9
2019-03-27 13:42:40 +01:00
7b901be5fa
Changed default font size name on NetworkMap class
...
Former-commit-id: b1437a7e03eba758d83386166db0063a5fcaf12f
2019-03-27 12:42:54 +01:00
edefd16a21
Merge branch 'ent-3595-discovery-fase-2' into 'develop'
...
Ent 3595 discovery fase 2
See merge request artica/pandorafms!2230
Former-commit-id: 2d5e2e4ff57612c727f20357bfb9de5b8c29ae72
2019-03-27 12:13:06 +01:00
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
9ee095406b
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
2019-03-27 11:59:25 +01:00
eacdf6ffc9
Merge branch 'ent-3666-fallo-rendimiento-informes-sla-disponibilidad-carrefour' into 'develop'
...
removed old useless code
See merge request artica/pandorafms!2241
Former-commit-id: 53aecf83239855335278d2b7068fd32dfe856c96
2019-03-27 11:52:55 +01:00
3c853ff508
widget networkmap simple working
...
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
2019-03-27 11:47:09 +01:00
3038de3a9d
minor fixes
...
Former-commit-id: 73dbbaa42f3b6120400da688dee7a0499bf31796
2019-03-27 11:06:57 +01:00
c717baafc0
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 70601a390ebca2a1530b77c86a83c19e29e98261
2019-03-27 10:53:46 +01:00
8160983e36
Auto-updated build strings.
...
Former-commit-id: 00a94a2b9b56bbb245f3389855c734f7af14d874
2019-03-27 00:01:24 +01:00
ca5c214472
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8952ebd872b4030cb8e1bd4ad3f0425afd13fd09
2019-03-26 19:30:55 +01:00
94bb818e6d
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 9e6ab3e90c11a0849550bca777aead3a25ee7bdd
2019-03-26 19:30:40 +01:00
ba0ddfb826
style revission
...
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
b7267dfafa
Merge branch 'ent-3774-Autorefresh_no_se_deshabilita' into 'develop'
...
fixed minor error header disabled
See merge request artica/pandorafms!2297
Former-commit-id: ffc6904ecfa47e41ea87b867f8650c237ee1877a
2019-03-26 18:49:27 +01:00
5504741a9d
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29
2019-03-26 18:48:49 +01:00
8d95afc9ea
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
...
Former-commit-id: 40a12a5a5331fb53fed7fcfce30ba1e327494c59
2019-03-26 18:46:52 +01:00
ab793257ad
Visual Console Refactor: minor fix
...
Former-commit-id: 4350b8342f0a813c7283bd8a2bf2a3a76b677c5a
2019-03-26 18:46:48 +01:00
4cd06539a2
fixed minor error refresh header
...
Former-commit-id: 5fd75dd4fe634760c37fb06a16cc127c9cbfc71d
2019-03-26 18:37:49 +01:00
004fec7454
Revert "fixed minor error header disabled"
...
This reverts commit 2cf945a5e3
2019-03-26 18:35:56 +01:00
0982cd61b5
Merge branch 'ent-3568-limitar-acceso-a-la-consola-cuando-se-supere-el-limite-de-agentes' into 'develop'
...
Ent 3568 limitar acceso a la consola cuando se supere el limite de agentes
See merge request artica/pandorafms!2293
Former-commit-id: caedaf6470c3fbea8d76db4b61a5a8d241dc7830
2019-03-26 18:04:56 +01:00
2cf945a5e3
fixed minor error header disabled
...
Former-commit-id: 87ac8d400ac83f316bf8efb1fca6afe2d60e6c8c
2019-03-26 17:59:00 +01:00
64af349041
added class clock
...
Former-commit-id: ad23dd5fe0f6eb2251851cf794d0b1464d286ff5
2019-03-26 17:32:02 +01:00
08a240746c
breadcrum improvement discovery
...
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
2019-03-26 17:28:31 +01:00
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
db39c3921b
fixed minor error tasklist
...
Former-commit-id: 1ee10794b09e17c3b8403dfe5540195047595577
2019-03-26 17:22:14 +01:00
manuel
Daniel Rodriguez
Daniel Maya
Alejandro Gallardo Escobar
Alejandro Fraguas
Daniel Barbero Martin
artica
Alejandro Gallardo Escobar
fermin831
Luis Calvo
fbsanchez
artica
alejandro-campos