853 Commits

Author	SHA1	Message	Date
Jose Gonzalez	649442f794	Updated copyrights	2020-11-27 13:52:35 +01:00
fbsanchez	79b3f2d762	Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido	2020-11-26 11:28:39 +01:00
fbsanchez	1121440943	Clean only recovered servers	2020-11-26 11:28:31 +01:00
alejandro-campos	448cc253b4	changes in treeview	2020-11-25 17:00:37 +01:00
Daniel Rodriguez	8471f170fb	Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop' ... Fix See merge request artica/pandorafms!3652	2020-11-25 14:40:38 +01:00
Jose Gonzalez	7187c54730	Fix	2020-11-25 14:33:52 +01:00
Jose Gonzalez	da3bb9b808	Fix	2020-11-25 14:29:11 +01:00
Jose Gonzalez	5f9db9a896	Fix	2020-11-25 14:27:42 +01:00
Daniel Rodriguez	b1fd90ae58	Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop' ... Ent 6542 agents alerts view fallos visuales Closes pandora_enterprise#6542 See merge request artica/pandorafms!3594	2020-11-25 13:35:17 +01:00
fbsanchez	d18fffb0cb	Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido ... Conflicts: pandora_console/include/class/ConsoleSupervisor.php	2020-11-25 12:07:53 +01:00
Jose Gonzalez	60ca2109f3	Solved issue with full screen	2020-11-25 11:59:03 +01:00
Jose Gonzalez	912b2179bd	Fix visual issues	2020-11-25 11:36:14 +01:00
Jose Gonzalez	0cc1da21b0	Fix errors	2020-11-24 15:53:25 +01:00
Jose Gonzalez	ed1b8f9713	Fix some bugs and added surround input feature	2020-11-24 15:51:02 +01:00
alejandro-campos	f5648d734d	fixed snapshot in meta	2020-11-23 17:09:58 +01:00
Daniel Rodriguez	f2383aa4a3	Merge branch 'ent-6590-comprobacion-ha-ralentiza-la-consola' into 'develop' ... Avoid check ha nodes while navigating, scheduled See merge request artica/pandorafms!3620	2020-11-23 16:55:56 +01:00
Jose Gonzalez	f081a6e376	Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales ... Merge with last updates	2020-11-23 10:08:16 +01:00
Jose Gonzalez	8706ec060c	Solve OIDs issues and malfunction of some modules	2020-11-19 13:31:32 +01:00
Jose Gonzalez	ea259f0aa7	Fixed issue	2020-11-17 16:36:30 +01:00
fbsanchez	f9ab987825	Avoid check ha nodes while navigating, scheduled	2020-11-17 11:44:52 +01:00
Luis Calvo	2ee187ae53	Fixed acl on discovery tasklist	2020-11-16 18:30:23 +01:00
alejandro-campos	fc429efce2	fixed wrong error message: recon task is not necessarily linked to script	2020-11-11 09:52:15 +01:00
Jose Gonzalez	702b5025e9	Ended development	2020-11-10 16:48:09 +01:00
Jose Gonzalez	665deaa5c8	WIP: Backup upload	2020-11-10 12:23:50 +01:00
Jose Gonzalez	8a6a11fee6	WIP: Backup upload	2020-11-06 12:38:35 +01:00
Jose Gonzalez	b5dc75ce93	WIP: Backup upload	2020-11-04 16:40:18 +01:00
Daniel Rodriguez	6a31a28679	Merge branch 'ent-6410-Wizard-SNMP-SNMP-Interfaces-y-WMI-no-autocompletan-Target-IP-con-IP-del-agente' into 'develop' ... Ent 6410 wizard snmp snmp interfaces y wmi no autocompletan target ip con ip del agente See merge request artica/pandorafms!3588	2020-11-03 10:26:24 +01:00
Luis	25de1b686a	Fixed oid for getting x64 interfaces module. Fixed visual (module order) bug	2020-10-30 14:41:33 +01:00
Daniel Maya	bde52df2e8	Added datalist for target ip	2020-10-30 13:25:33 +01:00
Daniel Rodriguez	83233b6192	Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop' ... groups_get_children and propagate update See merge request artica/pandorafms!3545	2020-10-29 12:36:49 +01:00
Daniel Rodriguez	5d4723ba15	Merge branch 'ent-6470-error-componentes-remotos' into 'develop' ... Ent 6470 error componentes remotos Closes pandora_enterprise#6470 See merge request artica/pandorafms!3558	2020-10-29 09:48:25 +01:00
Daniel Rodriguez	0a24fedb5a	Merge branch 'ent-6606-mostrar-descripcion-de-servicios-en-vista-de-arbol' into 'develop' ... Use service description instead of name in tree view See merge request artica/pandorafms!3570	2020-10-28 11:19:49 +01:00
Jose Gonzalez	8ba92a683a	Fix some errors	2020-10-27 07:51:30 +01:00
Jose Gonzalez	a9075f0068	Fix	2020-10-27 07:49:33 +01:00
Kike	3287223b4d	Use service description instead of name in tree view	2020-10-26 12:05:37 +01:00
Jose Gonzalez	a8c54dadee	Fixed some errors	2020-10-22 17:03:31 +02:00
Jose Gonzalez	ddc46c077f	Solved issue	2020-10-22 17:01:10 +02:00
Jose Gonzalez	f09e864569	Solved issue	2020-10-22 12:47:25 +02:00
alejandro-campos	def59508ae	changed behavior of all group acl check and fixed acl vulnerabilities	2020-10-22 12:00:44 +02:00
fbsanchez	42cca865ac	groups_get_children and propagate update	2020-10-21 11:38:57 +02:00
daniel	148384f8fb	phantomjs performance	2020-10-13 18:24:10 +02:00
fbsanchez	2e0321fc6e	Limit server down notifications once a day	2020-10-07 18:48:17 +02:00
daniel	3455de7f85	fixed visual errors and default values	2020-10-07 16:03:52 +02:00
fbsanchez	95f58776c8	fixes group selection	2020-09-30 17:47:44 +02:00
fbsanchez	5f4893ef1a	Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos	2020-09-29 12:47:11 +02:00
Daniel Rodriguez	4939d71420	Merge branch 'ent-6382-10451-Bug-en-chequeos-de-notificaciones-por-HA-+-ticket-guardia' into 'develop' ... fixed bug when node is disabled See merge request artica/pandorafms!3484	2020-09-29 12:43:59 +02:00
fbsanchez	b2d819aa29	Minor fixes	2020-09-25 19:35:19 +02:00
Daniel Rodriguez	5af6718941	Merge branch 'ent-6336-ifHCXXXX-nuevo-wizard-snmp-interfaces' into 'develop' ... Added x64 interface modules to wizard See merge request artica/pandorafms!3478	2020-09-25 10:46:39 +02:00
Manuel Montes	f78ae89a99	Ent 6177 mejoras para el public link de dashboards	2020-09-24 16:20:13 +02:00
alejandro-campos	4662fba06a	fixed bug when node is disabled	2020-09-24 13:05:17 +02:00
Daniel Rodriguez	0c78b09891	Merge branch 'ent-6334-10699-10652-Wizard-WMI-SNMP-no-añade-modulos-o-incluye-los-que-quiera' into 'develop' ... fixed modules selection in agent wizard See merge request artica/pandorafms!3472	2020-09-24 10:56:51 +02:00
fbsanchez	9ce54213b6	WIP GCP	2020-09-23 14:07:23 +02:00
fbsanchez	4ceeb61c87	Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery	2020-09-22 16:56:11 +02:00
fbsanchez	4394a8cf6a	wip discovery.cloud.gcp	2020-09-22 16:55:46 +02:00
Luis Calvo	a7db77d4fb	Added x64 interface modules to wizard	2020-09-22 16:45:34 +02:00
Marcos Alconada	a9b2c6beb8	Ent 5898 secciones en diagnostico aparecen 2 veces	2020-09-22 12:16:31 +02:00
Daniel Rodriguez	6f6c18ef7b	Merge branch 'ent-6127-corregir-feedback-esp' into 'develop' ... Ent 6127 corregir feedback esp See merge request artica/pandorafms!3422	2020-09-22 12:13:55 +02:00
alejandro-campos	b1bb1e2aa0	fixed modules selection in agent wizard	2020-09-21 16:22:17 +02:00
Daniel Rodriguez	8ef5e7cb9f	Merge branch 'ent-6138-credentials-without-identifier-error-message' into 'develop' ... Fixed credential store error message on required inputs See merge request artica/pandorafms!3428	2020-09-17 15:17:03 +02:00
Daniel Rodriguez	4174d9910f	Merge branch 'ent-6279-vulnerabilidades-XSS' into 'develop' ... Ent 6279 vulnerabilidades xss See merge request artica/pandorafms!3445	2020-09-17 10:17:11 +02:00
Luis	12735f6ace	Fixed module templates submit button value	2020-09-16 12:41:49 +02:00
fbsanchez	c2238ac295	minor changes	2020-09-11 15:30:18 +02:00
fbsanchez	09a5bad4f1	Fixes in visualization (groups selection)	2020-09-11 15:17:08 +02:00
fbsanchez	3374a89ae0	Group selection improvement	2020-09-11 14:34:41 +02:00
Jose Gonzalez	e833c318a5	Avoid XSS in Module templates	2020-09-09 12:35:28 +02:00
Jose Gonzalez	b9b94e1382	Avoid XSS in Private Enterprise Numbers	2020-09-09 11:44:26 +02:00
Jose Gonzalez	6a192433cb	Avoid XSS in Net Scan scripts	2020-09-09 11:27:08 +02:00
Marcos Alconada	b02d44ced5	fixed error with snmp interfaces	2020-09-03 11:17:04 +02:00
Luis Calvo	3d947ef77b	Fixed credential store error message on required inputs	2020-09-02 11:20:31 +02:00
manuel.montes	51ed420d77	Fixed visual bug	2020-09-01 12:18:10 +02:00
Luis Calvo	18e6b26db8	Fixed wizard snmp process module process field	2020-08-07 16:46:35 +02:00
Daniel Rodriguez	7afc8902d3	Merge branch 'ent-6107-console-notifications-doesnt-clean-afeter-solved' into 'develop' ... Server notifications clean when solved See merge request artica/pandorafms!3360	2020-07-22 13:47:57 +02:00
Luis Calvo	71eaebc03b	Server notifications clean when solved	2020-07-06 17:01:52 +02:00
fbsanchez	a0d489b90e	Smart services	2020-07-06 11:10:43 +02:00
fbsanchez	af7981ed05	Service tree view	2020-07-02 14:53:33 +02:00
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
Daniel Barbero Martin	c4f0305f9b	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-08 08:29:59 +01:00
Alejandro Campos	0468c85a4d	Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' ... # Conflicts: # pandora_console/godmode/setup/setup_visuals.php	2020-01-07 12:00:27 +01:00
Daniel Rodriguez	1ced09986e	Merge branch 'ent-5212-ventana-de-bienvenida-open' into 'develop' ... Minor fix - opensource welcome icon See merge request artica/pandorafms!2983	2020-01-07 09:38:20 +01:00
Daniel Barbero Martin	5e008e684d	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-02 17:45:52 +01:00
Alejandro Fraguas	ebe6e1109c	Merge branch 'ent-4467-barra-de-busqueda-como-interprete-de-ordenes' into 'develop' ... Ent 4467 barra de busqueda como interprete de ordenes See merge request artica/pandorafms!2934	2019-12-26 11:10:53 +01:00
marcos	04ed92523a	changed token VW to VR	2019-12-26 10:29:26 +01:00
Alejandro Fraguas	935d246a0d	Merge branch 'ent-5162-9263-Notificaciones-infinitas' into 'develop' ... removed newsletter notification from messages list See merge request artica/pandorafms!2978	2019-12-23 10:49:04 +01:00
fbsanchez	9ee102b365	already used ui_get_full_url	2019-12-19 20:02:29 +01:00
fbsanchez	abf4097e63	Minor fix - opensource welcome icon	2019-12-19 19:58:00 +01:00
marcos	43d08f354a	Ajustes CSS	2019-12-19 16:53:45 +01:00
marcos	87405ba318	add message no resoult found	2019-12-19 14:20:31 +01:00
marcos	e06c974e67	add acl's to order interpreter	2019-12-19 14:10:43 +01:00
alejandro-campos	c3daa7e803	removed newsletter notification from messages list	2019-12-19 10:42:41 +01:00
Daniel Barbero	2a92c9d38d	Fixed errors VC forms	2019-12-17 10:57:19 +01:00
marcos	de161d830c	add Traducction	2019-12-13 14:46:47 +01:00
marcos	3008651b65	add < list	2019-12-13 14:43:30 +01:00
marcos	4e712d1a45	fixed error	2019-12-13 14:25:33 +01:00
marcos	90d0be6ff1	fixed error	2019-12-13 14:22:50 +01:00
marcos	480673521c	Can select with keyboard list items	2019-12-13 14:08:44 +01:00
marcos	6a5dfb5ec9	refactor code	2019-12-12 17:16:09 +01:00
Daniel Barbero	63dd3c48f8	Merge remote-tracking branch 'origin/develop' into new-vc-line-element ... Conflicts: pandora_console/include/javascript/pandora.js	2019-12-12 16:32:32 +01:00
marcos	1f3fc1f908	add more pages in order interpreter	2019-12-12 16:27:11 +01:00
fbsanchez	ede4cedf62	Fix networkmap module key assignment	2019-12-11 16:42:50 +01:00
Daniel Rodriguez	f9c4a826d5	Merge branch 'ent-4982-Tree-View-Module-groups' into 'develop' ... Added Group by in tree view See merge request artica/pandorafms!2903	2019-12-10 13:46:27 +01:00
vgilc	7db5f8b9b1	Merge branch 'ent-4887-service-tree-view-no-carga' into 'develop' ... Solved issue with query See merge request artica/pandorafms!2858	2019-12-10 11:46:17 +01:00