Commit Graph

10593 Commits

Author SHA1 Message Date
Alejandro Fraguas 545afcb684 Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop'
Added secondary groups in global search

See merge request artica/pandorafms!2351

Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
2019-05-06 10:33:30 +02:00
artica 6d7b748591 Auto-updated build strings.
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
2019-05-06 00:01:06 +02:00
artica 83b6fe5a55 Auto-updated build strings.
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
2019-05-05 00:01:07 +02:00
artica 168ee6cdc6 Auto-updated build strings.
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
2019-05-04 00:01:07 +02:00
artica b88456f696 Auto-updated build strings.
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
2019-05-03 00:01:06 +02:00
artica 828d7830a5 Auto-updated build strings.
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
2019-05-02 00:01:06 +02:00
artica a9e0acd3e1 Auto-updated build strings.
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
2019-05-01 00:01:10 +02:00
Daniel Rodriguez 3b73ea95ae Merge branch 'ent-3940-No-salen-IPs-en-mapas-netflow' into 'develop'
Fixed node name in netflow map

See merge request artica/pandorafms!2386

Former-commit-id: 14cf4f85a78b092fb7efe10a05e63702d4dbcbb2
2019-04-30 17:53:48 +02:00
Daniel Rodriguez 5be813e210 Merge branch 'ent-3877-custom-field-view-faltan-los-enlaces-en-los-contadores' into 'develop'
add links counters cfv

See merge request artica/pandorafms!2388

Former-commit-id: 8666427450be1b27f1c6b7ae08a3e9388e32aa97
2019-04-30 17:50:33 +02:00
Daniel Maya c31948b7c2 Fixed netflow node name
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
2019-04-30 17:30:57 +02:00
artica 310d217fb2 Auto-updated build strings.
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
2019-04-30 00:01:09 +02:00
Daniel Barbero Martin 94932d23ac fixed error cfv status
Former-commit-id: cccd14ea5d2e202124233372e3db47564b2d8475
2019-04-29 15:43:51 +02:00
Daniel Rodriguez 9788a9f6d5 Merge branch 'visual-console-refactor' into 'develop'
Visual console refactor: hotfixes

See merge request artica/pandorafms!2384

Former-commit-id: 59e435071a8cf94f4628ce04a77c00b42c65e4eb
2019-04-29 12:43:42 +02:00
Alejandro Gallardo Escobar 5f986e2390 Visual Console Refactor: bugfix
Former-commit-id: 2afef18813cc2a2d51a40bdf0a5c619bd0900b59
2019-04-29 11:53:21 +02:00
Alejandro Gallardo Escobar 7f6ec7a501 Visual Console Refactor: bugfix
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
2019-04-29 11:03:56 +02:00
Alejandro Gallardo Escobar e5c17f660b Visual Console Refactor: fixed the label position
Former-commit-id: d39b91f86c43e6e90f9287409635d331667d9551
2019-04-29 10:56:06 +02:00
Alejandro Gallardo Escobar c09fbf4ddb Visual Console Refactor: fixed the links
Former-commit-id: c37373329350c8b1ed421ae91f2a3c1e7d7f577a
2019-04-29 10:45:12 +02:00
artica 5d6bd31786 Auto-updated build strings.
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
2019-04-29 00:01:06 +02:00
artica 141a042ee2 Auto-updated build strings.
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
2019-04-28 00:01:06 +02:00
artica 29b7ddeb6d Auto-updated build strings.
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
2019-04-27 00:01:09 +02:00
Daniel Maya 504457f9a6 Fixed decimal in percentil
Former-commit-id: ad964b4e4e2fa59eae959d5107b63d3c6f96766c
2019-04-26 14:37:35 +02:00
Daniel Barbero e54112641d add links counters cfv
Former-commit-id: 5a1bdfc376db32f94d06330c2e498c473361e710
2019-04-26 14:25:51 +02:00
Daniel Maya 4b73518804 Fixed node name in netflow map
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
2019-04-26 09:54:38 +02:00
artica 6de9b4f23e Auto-updated build strings.
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
2019-04-26 00:01:06 +02:00
Alejandro Gallardo Escobar 6feaba0b9d Visual Console: changed the default orientation of the items
Former-commit-id: 121e71236369303385a4579b49b2129c1a0f62d0
2019-04-25 18:23:28 +02:00
Alejandro Gallardo Escobar f3f5bcecd8 Visual Console Refactor: fixed the module graph element
Former-commit-id: baee256acdbc28c3b2d0364b97f301f776121e36
2019-04-25 16:59:24 +02:00
Alejandro Gallardo Escobar af69804708 Improved the background size and the elements order of the Visual Console
Former-commit-id: 6c6c7f332062dd0b405387730e06f29cf1d328d8
2019-04-25 16:36:17 +02:00
Alejandro Gallardo Escobar 08f9a34f23 Visual Console Refactor: bugfix
Former-commit-id: e6bff1d0458ca878cf31661bfcb77d833f5b8093
2019-04-25 14:24:19 +02:00
Alejandro Gallardo Escobar 2d9b4908de Visual Console Refactor: the legacy visual console is enabled by default
Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a
2019-04-25 14:08:55 +02:00
Alejandro Gallardo Escobar 0bd276bc88 Visual Console Refactor: bugfix
Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d
2019-04-25 14:02:30 +02:00
Daniel Rodriguez 3b03b6fa10 Merge branch 'visual-console-refactor' into 'develop'
Visual console refactor

See merge request artica/pandorafms!2348

Former-commit-id: 6a257514f7a5487b84a1cb35514899e1ef6f11e8
2019-04-25 11:27:49 +02:00
Alejandro Gallardo Escobar 7d95151a5b Visual Console Refactor: minor fixes
Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
2019-04-25 10:57:25 +02:00
Daniel Maya 260a149668 fixed include_once in items
Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa
2019-04-25 10:37:11 +02:00
Alejandro Gallardo Escobar 35d54a7e79 Visual Console Refactor: added missing libs
Former-commit-id: e0564527b93b844c69035f125d9e74e5baa693b7
2019-04-25 10:30:24 +02:00
Alejandro Gallardo Escobar 6a378f664e Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 0c2ffa8d51737644ae99eebdaae842af26ba52b8
2019-04-25 10:02:38 +02:00
Alejandro Gallardo Escobar 8ae521b2c4 Visual Console Refactor: added missing libraries
Former-commit-id: 02a027fb7f6276c9a59d58cd47fb2736c3878c38
2019-04-25 10:02:35 +02:00
Daniel Maya 3d2bcb3495 Fixed include_once in DonutGraph
Former-commit-id: 20c76457cabdc1cf78fc77c2218d025543d4607e
2019-04-25 09:25:19 +02:00
Alejandro Gallardo Escobar b6d6b05ddb Visual Console Refactor: upgraded the bundles
Former-commit-id: af79177070cbae3c3ff61282332564f8426a544d
2019-04-25 09:13:34 +02:00
artica 7f7a727c21 Auto-updated build strings.
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
2019-04-25 00:01:10 +02:00
Daniel Barbero Martin 596e760454 fixed error secondary groups
Former-commit-id: 758cebf4ad68e24e86739d8be21dd90e2cc44847
2019-04-24 17:28:55 +02:00
Alejandro Gallardo Escobar 48917c565f Visual Console Refactor: renamed the bundles
Former-commit-id: 0f63859b3e2eeeb890ad35779d2119137855fb8a
2019-04-24 17:25:57 +02:00
Alejandro Gallardo Escobar c1272035cc Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
Alejandro Gallardo Escobar dab4024f24 Visual Console Refactor: fixed the module graph's height
Former-commit-id: 9e9bed04904c136450d0831e542bf7bcd6abab14
2019-04-24 16:57:52 +02:00
Tatiana Llorente ab6658a450 Fixed pagination in modal windows - #3707
Former-commit-id: 090149ce7add4d30c8747e570a819c1b8025a0a6
2019-04-24 16:26:50 +02:00
Alejandro Gallardo Escobar 1cb15c9404 Visual Console Refactor: fixed the donut graph
Former-commit-id: a59da7d787571779c3dbc1be790855fda83d4b00
2019-04-24 16:07:46 +02:00
Alejandro Gallardo Escobar 3c2e65a8a5 Visual Console Refactor: added the missing macros to the label
Former-commit-id: 2e52a35c0f571d6162cbd3fb1188c3f47b77a8a5
2019-04-24 15:58:33 +02:00
Daniel Maya d541eab986 Fixed size in module graph
Former-commit-id: 5afdc41a1a7ec50f16bd39f70af6821505f98946
2019-04-24 15:40:07 +02:00
Tatiana Llorente 313ff93c8c Fixed pagination in modal window to create dashboard - #3707
Former-commit-id: 6fbfff55e76cb88db890864ec36d6bc766f6e2c6
2019-04-24 15:38:46 +02:00
Daniel Rodriguez 50e994e065 Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop'
change way to print discovery simple multiple inputs

See merge request artica/pandorafms!2378

Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
2019-04-24 13:55:02 +02:00
Alejandro Fraguas 759a533180 Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into 'develop'
Commit para revisar progreso

See merge request artica/pandorafms!2289

Former-commit-id: b8924b2fc0d151274809ab625fa840b27412d493
2019-04-24 13:47:15 +02:00