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

12561 Commits

Author SHA1 Message Date
Jose Gonzalez 30844bac35 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-01 17:26:09 +02:00
Jose Gonzalez c31a288cfd Minor fix when create a template and add components 2020-04-01 17:26:04 +02:00
fbsanchez e249233205 minor fixes 2020-04-01 16:43:04 +02:00
Jose Gonzalez 1b8fa26193 Minor fixes applied 2020-04-01 16:36:06 +02:00
Jose Gonzalez 6be6e19ad3 WIP: Ready for testing 2020-04-01 16:21:28 +02:00
Jose Gonzalez faf7c5462e Applied solution for image size issues in toggle bar 2020-04-01 09:25:18 +02:00
Jose Gonzalez a715b7d74a WIP 2020-03-31 13:00:07 +02:00
Jose Gonzalez 4c332a3543 WIP: Must do low changes 2020-03-31 10:47:00 +02:00
fbsanchez 3ad3a07d93 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-31 10:02:52 +02:00
daniel 263eaeeebd Fix bundle Ehorus 2020-03-31 09:33:39 +02:00
artica a2106a2056 Auto-updated build strings. 2020-03-31 01:00:18 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
Jose Gonzalez c2d81238d6 WIP: Near to finish 2020-03-30 19:03:55 +02:00
Jose Gonzalez c0b7c7e339 Changed breadcrumb for PEN form 2020-03-30 17:12:49 +02:00
Jose Gonzalez d09c5f355b WIP: Fixes and refactor 2020-03-30 17:00:48 +02:00
artica 7991d6f215 Auto-updated build strings. 2020-03-30 01:00:14 +02:00
artica ea4b3bff04 Auto-updated build strings. 2020-03-29 01:00:15 +01:00
artica 9ca21e8768 Auto-updated build strings. 2020-03-28 01:00:19 +01:00
Jose Gonzalez a150417ad3 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 
Merge to get the new code
 2020-03-27 12:18:17 +01:00
Jose Gonzalez 1be120b1dc Solved issue with display style 2020-03-27 12:18:09 +01:00
fbsanchez 6a14ddea73 minor fix 2020-03-27 11:50:41 +01:00
fbsanchez dffaafbf6a Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-27 11:42:09 +01:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
Jose Gonzalez 75de601f57 Forms modified for be able add raw inputs 2020-03-27 08:51:17 +01:00
artica d2eac81d39 Auto-updated build strings. 2020-03-27 01:00:18 +01:00
Jose Gonzalez 161c1eb643 WIP: Minor fixes 2020-03-26 14:41:54 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Jose Gonzalez 1d11e9324f Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 
Accept input changes
 2020-03-26 12:17:39 +01:00
Jose Gonzalez 2b21266a38 WIP: At this point, PEN form is operative and functional 2020-03-26 12:17:28 +01:00
fbsanchez 2fb3d664cf Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-26 09:10:13 +01:00
fbsanchez d40035a716 restoration 2020-03-26 09:10:08 +01:00
Jose Gonzalez 86cbecc9a0 WIP: PEN form near to clear 2020-03-26 09:04:10 +01:00
artica 63fca15ead Auto-updated build strings. 2020-03-26 01:00:17 +01:00
Daniel Rodriguez 87f2e434a4 Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' into 'develop' 
changes to show last status change of modules

See merge request artica/pandorafms!3114
 2020-03-25 18:10:09 +01:00
fbsanchez fecff8aa93 Discovery review advanced 2020-03-25 18:02:58 +01:00
alejandro-campos a8325653d4 add N/A in case time last_status_change is not set 2020-03-25 17:40:05 +01:00
alejandro-campos ecc6cd8f4e Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' of https://brutus.artica.es:8081/artica/pandorafms into ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado 2020-03-25 16:22:14 +01:00
alejandro-campos 4246c15157 add not available in case there is no last status change registered 2020-03-25 16:21:51 +01:00
artica 29cac0477e Auto-updated build strings. 2020-03-25 01:00:16 +01:00
Jose Gonzalez 3a5e7b08e5 WIP: Added class and page for PENs management 2020-03-24 15:14:57 +01:00
Daniel Rodriguez 415a9b4250 Merge branch 'ent-5250-Bug-con-nombres-en-la-task-list' into 'develop' 
fixed visual bug in table

See merge request artica/pandorafms!3071
 2020-03-24 14:17:21 +01:00
Alejandro Campos b56076044b Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' 
# Conflicts:
#   pandora_console/extras/mr/37.sql
 2020-03-24 13:55:57 +01:00
Alejandro Fraguas e4ea3e036b Merge branch 'ent-5597-9746-primera-carga-de-filtro-no-funciona' into 'develop' 
Fixed tags_without

See merge request artica/pandorafms!3116
 2020-03-24 11:32:33 +01:00
Tatiana Llorente 4777ecd4bf Ent 5439 error grafica eventos de agente 2020-03-24 10:12:14 +01:00
artica ce2353d54d Auto-updated build strings. 2020-03-24 01:00:17 +01:00
Jose Gonzalez c18d339730 WIP: Backup upload 2020-03-23 15:16:54 +01:00
Jose Gonzalez 28cdbf1409 Added rawInputs for forms construtor 2020-03-23 15:15:44 +01:00
Daniel Maya 11324af76a Fixed tags_without 2020-03-23 13:13:45 +01:00
Daniel Rodriguez 70f701aa4e Merge branch 'ent-5043-AADCM-Ordenar-alafeticamente-lista-de-modulos' into 'develop' 
Sort modules alphabetically in module select

See merge request artica/pandorafms!3106
 2020-03-23 13:04:44 +01:00