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

577 Commits

Author SHA1 Message Date
Jose Gonzalez 933bdef165 Added solution for multiple template delete 2020-04-02 08:10:37 +02:00
Jose Gonzalez c31a288cfd Minor fix when create a template and add components 2020-04-01 17:26: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 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
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
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
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 2b21266a38 WIP: At this point, PEN form is operative and functional 2020-03-26 12:17:28 +01:00
Jose Gonzalez 86cbecc9a0 WIP: PEN form near to clear 2020-03-26 09:04:10 +01:00
Jose Gonzalez 3a5e7b08e5 WIP: Added class and page for PENs management 2020-03-24 15:14:57 +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
Jose Gonzalez 29dcc8bc78 WIP: Backup upload 2020-03-20 15:35:30 +01:00
Jose Gonzalez 7bf5764081 Added CSS changes. WIP: Backup upload 2020-03-19 18:24:52 +01:00
Jose Gonzalez cca11f2341 WIP: Backup upload 2020-03-19 16:14:38 +01:00
fbsanchez f58276ddbb Templates 2020-03-18 19:31:58 +01:00
fbsanchez b860c49383 target selections 2020-03-17 18:34:30 +01:00
Jose Gonzalez c1337a4318 WIP: Backup upload 2020-03-17 18:27:56 +01:00
Jose Gonzalez 40958ae69d WIP: Backup upload 2020-03-17 16:24:17 +01:00
Jose Gonzalez 142823eef6 WIP: Backup upload 2020-03-17 13:46:10 +01:00
fbsanchez 3a4deddc4b 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-16 23:52:34 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
Jose Gonzalez 106f8bd1cf Created new files with Module Blocks and changed Menu entries 2020-03-16 20:48:38 +01:00
Jose Gonzalez c5888b1d1a Added control for favourites filter in TreeService class 2020-03-11 15:00:35 +01:00
Daniel Maya 363b3e8a80 Changed pandora fms by product name 2020-02-10 16:21:04 +01:00
Luis 56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
Daniel Rodriguez e6a5d7986f Merge branch 'ent-5376-Inyecciones-SQL-vistas-por-Nokia-USA' into 'develop' 
Fixed % with sprintf

See merge request artica/pandorafms!3039
 2020-02-04 13:14:55 +01:00
Daniel Rodriguez 8b60daa9ba Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop' 
fix module string data with html special chars breaking html in page

See merge request artica/pandorafms!3042
 2020-02-04 10:10:07 +01:00
alejandro-campos 73f3dfac85 fix module string data with html special chars breaking html in page 2020-01-31 11:53:42 +01:00
Daniel Maya 891c517611 Fixed % with sprintf 2020-01-30 13:02:33 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2020-01-21 08:28:00 +01:00
Daniel Barbero Martin 4a1801bc50 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 08:04:18 +01:00
Alejandro Campos 6dbe75169f Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-15 14:37:00 +01:00
Tatiana Llorente 28b585196b Ent 5099 dobles interfaces en mapas de red no se visualizan 2020-01-15 14:11:36 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-14 10:28:55 +01:00
Daniel Barbero Martin 14e4e37c2a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-10 08:09:13 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Daniel Barbero a933a091ea styles fixed 2020-01-09 12:07:19 +01:00
Daniel Barbero b40f5b17c1 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-09 09:43:57 +01:00
Daniel Rodriguez c30e9eb1fe Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop' 
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red

See merge request artica/pandorafms!2896
 2020-01-08 11:33:27 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00