1458 Commits

Author	SHA1	Message	Date
Arturo Gonzalez	c9d1fab036	Added new system of calculate status if user set a parent weight	2017-11-08 12:49:03 +01:00
daniel	baab22bb28	add queries mr8 and migrate	2017-11-07 11:44:09 +01:00
vgilc	594b6e9417	Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop' ... 1320 exportación csv saca entities dev See merge request artica/pandorafms!1007	2017-11-02 15:35:38 +01:00
Daniel Maya	b9851a3a71	code backup	2017-10-31 11:51:19 +01:00
enriquecd	2da1e57dc1	Change pandora migrate and add mr8 changes - #654 ... Conflicts: pandora_console/extras/mr/8.sql	2017-10-30 17:26:35 +01:00
enriquecd	f608c686b8	Graph and table mode for max, min and avg reports an template reports - #654	2017-10-30 17:23:59 +01:00
nramon	8163200f54	Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'" ... This reverts merge request !871	2017-10-30 16:11:58 +01:00
nramon	65ae5ed2eb	Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop' ... Graph and table mode for max, min and avg reports and template reports - #654 See merge request artica/pandorafms!871	2017-10-30 15:51:51 +01:00
nramon	49a1f7d872	Merge branch '1459-Campo-para-establecer-el-tiempo-de-autorefresco-dev' into 'develop' ... Added time autorefresh See merge request artica/pandorafms!945	2017-10-30 10:58:07 +01:00
enriquecd	7e6adb5d40	Db changes for tgraph_source field order - #1382	2017-10-24 19:02:16 +02:00
daniel	92d2179469	updated version	2017-10-24 17:11:56 +02:00
Daniel Maya	9b1cbf3c9b	Changed column in tuser_task_scheduled	2017-10-24 13:10:07 +02:00
enriquecd	ea51df8b20	Add show on top option to all visual console elements - #1313	2017-10-23 18:54:57 +02:00
Daniel Maya	f6e012e0fa	Added time autorefresh	2017-10-23 13:17:06 +02:00
enriquecd	c9ff9e77a3	Apply db changes to hide no data field event template reports - #1326	2017-10-18 18:22:00 +02:00
Alejandro Gallardo Escobar	b641323eed	[artica/pandora_enterprise#1462] Added the DB changes needed by the dashboard items slideshow feature	2017-10-18 17:29:06 +02:00
Daniel Maya	74308ae42b	Created Safe operation mode	2017-10-17 16:58:05 +02:00
vgilc	1838a6b30a	Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'" ... This reverts merge request !863	2017-10-16 16:44:16 +02:00
enriquecd	c86bd5cc3c	Fix pandora diag texts and delete old secitons files - #1350	2017-10-09 15:36:28 +02:00
vgilc	80495ddaf7	Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop' ... create mr8 for send mail plain/text See merge request !863	2017-10-09 10:11:07 +02:00
enriquecd	570a209861	Db maintenance section is now called Admin tools with only admin access permission, erase all subsection except db interface and db status - #1350	2017-10-04 19:02:45 +02:00
enriquecd	788265713e	Graph and table mode for max, min and avg reports an template reports - #654	2017-10-02 18:23:26 +02:00
daniel	2d673c8ac1	create mr8 for send mail plain/text	2017-09-27 13:46:29 +02:00
enriquecd	8ce6920e44	DB changes for visual console group elements - #1245	2017-09-07 12:11:13 +02:00
daniel	f954b92aae	fixed error in mr for WUX	2017-09-05 11:06:49 +02:00
daniel	d74a3f74b4	Merge branch 'develop' into 1056-pandora-wux-grid-server	2017-09-01 10:51:54 +02:00
Enrique Camargo	6b4a15534d	Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' ... # Conflicts: # pandora_console/extras/mr/6.sql	2017-08-31 18:21:08 +02:00
Enrique Camargo	afd184f466	Update 6.sql	2017-08-31 17:58:34 +02:00
Arturo Gonzalez	2fe8849708	Added db changes to mr 6	2017-08-31 11:33:08 +02:00
daniel	b078d48918	fixed errors in wux	2017-08-30 09:47:57 +02:00
fbsanchez	ae971ded58	Fix on migrate 6.0 to 7.0	2017-08-28 19:15:10 +02:00
fbsanchez	2b18b1589c	Added new module type: web_analysis	2017-08-28 19:05:08 +02:00
enriquecd	068be133ed	Add password reset table in MR - #1211	2017-08-28 12:22:59 +02:00
Arturo Gonzalez	f021bedb5c	Added proxy servers to events response form	2017-08-24 12:34:06 +02:00
Arturo Gonzalez	3291526195	Added new fields to server table	2017-08-23 12:41:36 +02:00
daniel	c29d8a4fdb	Revert "merge develop" ... This reverts commit 823291171347bf74d93e74a99a3c958660a39fe2, reversing changes made to f5da86ac0aa968789fdcfa3a14dc714886c26cfb.	2017-08-23 09:35:17 +02:00
daniel	8232911713	merge develop	2017-08-22 18:39:34 +02:00
vgilc	870be2c4ea	Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop' ... Fixed issue with cascade_protection_module See merge request !720	2017-08-18 12:34:31 +02:00
Daniel Maya	059dec7cc9	Fixed delimiter	2017-08-16 17:04:21 +02:00
Arturo Gonzalez	bf77ea14d1	Added recover delimiter	2017-08-16 10:36:30 +02:00
vgilc	47c851be95	Merge branch '1109-mysql-procedure-error-in-pandora-migrate-dev' into 'develop' ... Added recover delimiter See merge request !666	2017-08-14 12:25:35 +02:00
daniel	1d7d55a451	fixed errors in form wux	2017-08-09 13:27:51 +02:00
Daniel Maya	3ef3679f10	Fixed issue with cascade_protection_module	2017-08-08 10:38:30 +02:00
daniel	590bfbfe84	mr-5 add queries	2017-08-07 13:57:04 +02:00
Arturo Gonzalez	ea06ba213b	Added registration method to reset pass	2017-08-03 13:05:57 +02:00
Enrique Camargo	88879462a3	Merge branch 'develop' into '1071-Formulario-gráfica-combinada-automática-open' ... # Conflicts: # pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql	2017-07-28 10:34:06 +02:00
vgilc	9a791dc0a5	Merge branch '1082-some-modifications-in-change-pass-feature-dev' into 'develop' ... Added some fixes to reset pass feature See merge request !677	2017-07-28 10:23:31 +02:00
Arturo Gonzalez	278330e8f6	Added some fixes to reset pass feature	2017-07-19 11:37:17 +02:00
vgilc	6dba0a5040	Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' ... # Conflicts: # pandora_console/extras/mr/4.sql	2017-07-18 12:24:49 +02:00
Daniel Maya	f0e43e252c	New feature: Add groups to policies	2017-07-18 12:06:57 +02:00