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

678 Commits

Author SHA1 Message Date
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
alejandro-campos b7af840a20 changed text 2020-06-29 10:57:19 +02:00
Alejandro Fraguas 02bffc7e0d Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop' 
changed console and audit log locations

See merge request artica/pandorafms!3278
 2020-06-25 15:28:13 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/install.php
 2020-06-25 11:25:43 +02:00
fbsanchez 45a161426b Services review 2020-06-24 18:01:34 +02:00
Daniel Rodriguez e514840031 Merge branch 'ent-5761-notificacion-max_execution_value-php-consola' into 'develop' 
Ent 5761 notificacion max execution value php consola

See merge request artica/pandorafms!3236
 2020-06-23 14:39:32 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
alejandro-campos f9ebaa2d45 minor changes in log files 2020-06-12 09:40:12 +02:00
alejandro-campos 7aadd725f6 Minor changes in notifications 2020-06-11 10:00:53 +02:00
Jose Gonzalez 4040d4b394 Solve security issue with field 2020-06-09 13:14:02 +02:00
alejandro-campos ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00
Daniel Barbero Martin 7e4c1a5468 Fixed minor error open bug 500 2020-06-02 13:55:01 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
marcos 5364404112 add notify on console supervisor 2020-05-28 13:38:53 +02:00
marcos 73218db337 add notify on console supervisor 2020-05-27 13:07:59 +02:00
Marcos Alconada c8bcd3d4fc Update ConsoleSupervisor.php 2020-05-26 13:49:03 +02:00
marcos 45f105b662 add message Database error HA 2020-05-26 11:00:22 +02:00
marcos 1095781725 changed message on consolesupervisor 2020-05-26 10:31:14 +02:00
fbsanchez 8898340b78 Comparison values max_execution_time 2020-05-25 18:49:28 +02:00
marcos 474129f984 add notify to HA 2020-05-25 17:49:23 +02:00
Daniel Rodriguez c582d02b81 Merge branch 'ent-5028-add-mf-server-installed-version-exception' into 'develop' 
Added mf_server installed verdion exception

See merge request artica/pandorafms!3172
 2020-05-22 13:46:56 +02:00
fbsanchez f3d9f2d75e Cluster view RC1 2020-05-22 13:13:19 +02:00
fbsanchez e66f33fd37 WIP Cluster references updated 2020-05-22 12:14:01 +02:00
fbsanchez b0e8287c61 Wip cluster view 2020-05-21 19:28:24 +02:00
fbsanchez 523212afb8 WIP cluster view 2020-05-20 19:04:42 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
Tatiana Llorente fabace239d Ent 5675 textos del sistema de licencias 2020-05-12 12:54:20 +02:00
Alejandro Fraguas 5f1066a342 Merge branch 'ent-5412-mensaje-de-allowoverride-en-apache' into 'develop' 
notify for allowoverride

See merge request artica/pandorafms!3149
 2020-05-11 12:53:12 +02:00
marcos 86f52fd8e6 changed message allow override 2020-05-11 12:24:18 +02:00
fbsanchez bd3ffc0c8d Tree view style review 2020-05-06 17:35:05 +02:00
Luis Calvo 5072ff0cd9 Added mf_server installed verdion exception 2020-04-20 12:33:49 +02:00
Jose Gonzalez 3f1e7d2ced Solve minor fix 2020-04-13 10:57:32 +02:00
Jose Gonzalez 805d96108c Changed position of buttons 2020-04-08 16:52:34 +02:00
Jose Gonzalez 725e7d9c16 Solved issue with wrong position in filter 2020-04-08 12:17:22 +02:00
marcos e86f72958d update AllowOverride notify 2020-04-08 10:36:40 +02:00
marcos ff3b285f08 add url on notify 2020-04-08 09:45:18 +02:00
marcos c44cb889e0 updates 2020-04-07 18:49:01 +02:00
marcos f8f2da4d40 notify for allowoverride 2020-04-07 18:40:47 +02:00
Jose Gonzalez 396c93c8b8 WIP: Refactor and solve visual issues 2020-04-07 17:46:12 +02:00
Jose Gonzalez 1a080a4e3a WIP: Backup upload 2020-04-07 16:41:33 +02:00
Jose Gonzalez 39d19b2016 Added new features to ModuleTemplates 2020-04-07 15:20:30 +02:00
Jose Gonzalez 3d01b918c9 Solved issue with pagination 2020-04-06 17:27:50 +02:00
Jose Gonzalez 3537731ee7 WIP: minor fix with CSV file names 2020-04-06 16:49:22 +02:00
Jose Gonzalez fc2ea5aabf Solved issue with CSV Export 2020-04-06 12:14:57 +02:00
Jose Gonzalez a93812d1a8 Solved issues in ModuleTemplates class 2020-04-06 11:58:42 +02:00
Jose Gonzalez a6ce19db66 WIP: Backup upload 2020-04-06 09:49:59 +02:00
Jose Gonzalez b8c8590e0b Finished module templates 2020-04-03 07:43:38 +02:00
Jose Gonzalez 6a7e9ba400 Added filter for components. Also wiped dirty code 2020-04-02 12:48:25 +02:00
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