tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,597 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

20597 Commits

Author SHA1 Message Date
fbsanchez 5e91e3fa50 Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop' 
rhel dependencies

See merge request artica/pandorafms!2339

Former-commit-id: b75a756a70434f1a25f4a4f0a129681b3f01f19f
 2019-04-04 17:42:56 +02:00
fbsanchez fdb13c1d1f rhel dependencies 
Former-commit-id: dd8eccf5d3476dc01ec2d409558483c90f20f499
 2019-04-04 17:35:27 +02:00
manuel 49c913c6de Added custom fields to report templates 
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
 2019-04-04 17:31:11 +02:00
fbsanchez 79074a274e Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop' 
forced dependencies 7.2 spec pandora_console rhel

See merge request artica/pandorafms!2338

Former-commit-id: 8f7adb7f4a8ad922a7d27eb44f2a449235b6c405
 2019-04-04 17:26:10 +02:00
fbsanchez 21294807f4 forced dependencies 7.2 spec pandora_console rhel 
Former-commit-id: 6cc644ccbf3afd341d9aafe0bd3cbd6ca3210f0f
 2019-04-04 17:12:08 +02:00
Alejandro Gallardo Escobar 0d46d0a1a0 Visual Console Refactor: added a new util function 
Former-commit-id: 4ff4042bdefe87236f7109b27b736a8b21a60e97
 2019-04-04 17:08:32 +02:00
Alejandro Gallardo Escobar 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
Alejandro Gallardo Escobar 5fb1ae0f44 Visual Console Refactor: great improvements into the Percentile model 
Former-commit-id: 0988ae35202834d0dfc91bcd4870dff478a5d73e
 2019-04-04 17:04:54 +02:00
Alejandro Gallardo Escobar 418d73b003 Visual Console Refactor: error fixes 
Former-commit-id: 5cfe645c4b02e84b9b2e9056747419bf144b0594
 2019-04-04 17:03:56 +02:00
Alejandro Gallardo Escobar ead487b24b Visual Console Refactor: add a new util function 
Former-commit-id: 8b6266651ac81fcdd18a12b71f3f316eb246277a
 2019-04-04 17:02:48 +02:00
Daniel Maya a033149a2f fixed problems with test 
Former-commit-id: 7897203e3ba020fdda8b06fd82a53d18bd91aaa1
 2019-04-04 16:08:50 +02:00
fermin831 43b296c49c Added docs to cron functions 
Former-commit-id: 7f20d7abe989adcfc841e0ce20afbe007b660038
 2019-04-04 15:30:30 +02:00
fermin831 c5a49916cb Fixed cron day of the week 
Former-commit-id: eb6b7974d7304c430068375f19ef60db1a2bb442
 2019-04-04 15:04:23 +02:00
fbsanchez f9fd0062e9 Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop' 
added +x permissions to build_rpm_rhel7

See merge request artica/pandorafms!2335

Former-commit-id: 2c7239c6e533866710eacf7b763586c06d0d07ea
 2019-04-04 12:38:52 +02:00
fbsanchez a1a4ae51e2 added +x permissions to build_rpm_rhel7 
Former-commit-id: 4d1c78a1443ecaa138b861092f0c98ad1496b193
 2019-04-04 12:30:50 +02:00
Alejandro Fraguas 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
Daniel Maya f0c9957838 Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' into 'visual-console-refactor' 
Added the label and colorcloud classes

See merge request artica/pandorafms!2332

Former-commit-id: 4f5b051161b78eaac1261f1379c3c6f9c475d494
 2019-04-04 10:18:01 +02:00
Daniel Maya 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
artica f64835dca9 Auto-updated build strings. 
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
 2019-04-04 00:01:27 +02:00
Daniel Rodriguez 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
Alejandro Gallardo Escobar 1f8d115130 Visual Console Refactor: finished the color cloud model 
Former-commit-id: a8a98ba44a459044e9f262d6dc062bde64743406
 2019-04-03 17:46:43 +02:00
Alejandro Gallardo Escobar adc0f3c21b Visual Console Refactor: minor changes 
Former-commit-id: a36d3901f79bb8342dc22e27946a2bb1798ce41c
 2019-04-03 17:46:19 +02:00
Alejandro Gallardo Escobar 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
Daniel Rodriguez 25960e65ba Merge branch 'ent-3320-7151-parametros-instalacion-destendida-windows' into 'develop' 
Added alias to windows configuration file

See merge request artica/pandorafms!2329

Former-commit-id: 04f3fb87c82d248a6caa197464893aab2973531c
 2019-04-03 17:07:45 +02:00
Daniel Maya 8923c53ec4 Fixed problem with fixed header 
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
 2019-04-03 16:48:28 +02:00
Alejandro Fraguas 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
Alejandro Gallardo Escobar 5ff1a9059a Visual Console Refactor: added the label model 
Former-commit-id: d1c26e023fd9c75f3ae9ab0f068e301b1e71d701
 2019-04-03 15:18:29 +02:00
Alejandro Gallardo Escobar 3df4c08782 Visual Console Refactor: error fixes 
Former-commit-id: 01d70e83426c5eb21b2184190d6c2a39111a1c75
 2019-04-03 14:46:49 +02:00
Daniel Rodriguez 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
Alejandro Gallardo Escobar 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
Daniel Rodriguez 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
Daniel Maya faecabb1cc Fixed problem with openlayer 
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
 2019-04-03 12:54:36 +02:00
Alejandro Gallardo Escobar bd90bbd922 Visual Console Refactor: WIP percentile item 
Former-commit-id: 1d852fb5dff28411aeda60431d8032e77159ea5d
 2019-04-03 12:12:05 +02:00
Alejandro Gallardo Escobar 32ba3aa1d4 Visual Console Refactor: error fix 
Former-commit-id: f627143575317076eb9998f7e09029c3063870ca
 2019-04-03 12:11:13 +02:00
Alejandro Gallardo Escobar 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
Alejandro Fraguas 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
fermin831 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
Alejandro Gallardo Escobar ca4997fd7f Visual Console Refactor: fixed the events history model 
Former-commit-id: 9228339af7213996fb969ee631a93a3e972e102a
 2019-04-03 11:40:40 +02:00
Alejandro Gallardo Escobar eb6757e91c Visual Console Refactor: fixes 
Former-commit-id: c9ae864cba26c6085e4e7390db26e32204ec7397
 2019-04-03 11:25:35 +02:00
Alejandro Fraguas ee59f4678e Merge branch 'ent-3801-no-funciona-event-storm-protection' into 'develop' 
Add a missing configuration option.

See merge request artica/pandorafms!2322

Former-commit-id: 6ccc3926eb2d4fe76e2a60f6f74a242ce7e84051
 2019-04-03 10:57:26 +02:00
Alejandro Gallardo Escobar 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
Alejandro Gallardo Escobar 0dca571e2d Visual Console Refactor: minor fix 
Former-commit-id: aaa840b7145ff0a449ab31f850095ca5574761e1
 2019-04-03 10:28:41 +02:00
Alejandro Gallardo Escobar b7ed6f9a7b Visual Console Refactor: refactores the SimpleValue model and added value retrieval 
Former-commit-id: 97ef5c92852b8fc5fd7f71e960f947d22222abcd
 2019-04-03 10:28:07 +02:00
Alejandro Gallardo Escobar 8e89f07961 Visual Console Refactor: changed some functions from instance to static 
Former-commit-id: 64fdb9086b5028570fea02de1bbe5e8c22e45c08
 2019-04-03 10:27:22 +02:00
Daniel Maya db30a8650e Added visual_console_view 
Former-commit-id: a121bb8ee6fe338561fcf7efda289727e1ba7afe
 2019-04-03 10:08:01 +02:00
Daniel Maya 2bcc05806a Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor 
Former-commit-id: 770dec9dd08f8c6cb526c38b35d52a7b825e9b62
 2019-04-03 10:05:59 +02:00
fermin831 1dcdc1bc79 Added alias to windows configuration file 
Former-commit-id: 52b7462f8b8192a1d9de636a3b13eb7ee3fb9871
 2019-04-03 09:53:17 +02:00
artica 30e9b67062 Auto-updated build strings. 
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
 2019-04-03 00:01:33 +02:00
fbsanchez 11d8edd88b RHEL specs and build orders (update version) 
Former-commit-id: 582d1bea42bc41a23fc773cf1d411bb4bdad50aa
 2019-04-02 18:04:33 +02:00
Daniel Maya 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