Commit Graph

123 Commits

Author SHA1 Message Date
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
Daniel Maya b508e40a73 Changed simple quote in alerts
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
manuel 6bd8221bc0 changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
vgilc 74f4c58693 Merge branch '2584_Visual_en_Mapas_GIS' into 'develop'
Fixed minor visual error in GIS Map

See merge request artica/pandorafms!1971

Former-commit-id: 6cdaa62ad743a06e6e7f2d0e4026a04f953fcb16
2018-12-21 10:33:17 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
samucarc 43629d5c2a Fixed minor visual error in GIS Map 2018-11-14 12:10:38 +01:00
Alejandro Gallardo Escobar 8601e38eed Minor visual improvements for the GIS views 2018-09-13 16:38:17 +02:00
danielmaya 66c8404fcf Fixed agent view in public Visual Console 2018-09-04 11:08:10 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
fermin831 e19f116637 Fixed add particular agents to GIS layers 2018-06-22 13:33:04 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
Alejandro Gallardo Escobar e77b9f35b6 Improved the help of the WMS server connection creation 2018-05-08 17:29:58 +02:00
Alejandro Gallardo Escobar e1319cb584 Improved the GIS map screen 2018-05-08 10:07:33 +02:00
Alejandro Gallardo Escobar cc06dfe876 Added a new GIS map source type called WMS 2018-04-27 12:17:42 +02:00
Alejandro Gallardo Escobar 1fbc8f01cc Added the alerts fired to the popup of the agent selected into the GIS map 2018-04-10 11:04:29 +02:00
Alejandro Gallardo Escobar 1dc8fec69a Added the number of not validated & critical events to the popup of the agent selected into the GIS map 2018-04-09 13:47:29 +02:00
Daniel Maya 5df61b95b9 Fixed issue in public console 2017-08-07 11:30:49 +02:00
vgilc 9c534ce2dc Merge branch '1127-Elementos-desplazados-en-mapas-GIS-con-Google-maps-dev' into 'develop'
Expand layer

See merge request !685
2017-07-28 10:24:44 +02:00
Daniel Maya b4765a0a9a Expand layer 2017-07-21 12:19:56 +02:00
Daniel Maya 5fd6c03917 Change agent name by alias in gis map 2017-07-19 12:32:45 +02:00
fermin831 1cf87e7753 Fixed PHP 5.3 compatibility on GIS maps 2017-03-03 10:50:17 +01:00
Arturo Gonzalez 8bae65b4a2 Fixed gis map agents name when refresh map. Ticket #395 2017-03-01 09:20:28 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
fermin831 d16138c68e Modified GIS Maps to print OpenMaps on empty google license 2017-02-21 18:48:50 +01:00
Arturo Gonzalez af3d8d8d24 Removed reference to fail gis map connection. Ticket #3967 2016-10-20 12:16:51 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
mdtrooper f253a16d9b Rewrote some parts the GIS to adapt from pandora v3 to newest versions. TICKET: #3170 2016-01-19 13:21:18 +01:00
m-lopez-f c20ba9023f Delete check f acl in gis map. Tiquet: #2989
(cherry picked from commit 9455d54a76)
2015-11-25 16:47:19 +01:00
m-lopez-f 84615a259d Delete file, dont use 2015-11-25 08:54:15 +01:00
m-lopez-f 332fce904d Fixed problems with includes javascript when enter in list of gis map. Tiquet: #2935
(cherry picked from commit ecd5e92184)
2015-11-25 08:40:22 +01:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
Alejandro Gallardo Escobar a706dfa917 Improved the agent info bubble returned via ajax. Ticket #1612 2014-12-04 16:39:29 +01:00
alexhigh 5b95334ad0 2014-04-25 Alejandro Gallardo <alejandro.gallardo@artica.es>
* extensions/system_info.php,
	  godmode/servers/plugin.php,
	  godmode/setup/file_manager.php,
	  include/config_process.php,
	  include/functions_filemanager.php,
	  include/functions_html.php,
	  operation/gis_maps/ajax.php,
	  operation/snmpconsole/snmp_mib_uploader.php: Replaced
	the possible backslashes with slashes in the directories
	path.

	* include/functions_graph.php: Modified the function
	"grafico_modulo_log4x" to adapt the 'set_include_path' to
	Windows.

	* include/get_file.php: Now the file name comes from the
	function "basename".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9814 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-25 11:07:30 +00:00
zarzuelo d84c1bc413 2014-01-30 Sergio Martin <sergio.martin@artica.es>
* operation/gis_maps/ajax.php: Fixed broken agent
	icons when autorefresh on gis maps

	* mobile/operation/groups.php
	mobile/operation/events.php
	mobile/include/style/main.css
	mobile/include/ui.class.php
	mobile/include/user.class.php: More aesthetic and 
	responsible improvements on mobile console

	* include/functions_graph.php
	include/constants.php: Added more colors to the
	graph color collection to support more graphics in 
	a combined graphs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-30 10:44:54 +00:00
mdtrooper c6d791dd93 2014-01-09 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: added function "https_is_running".
	
	* include/functions_gis.php, operation/gis_maps/render_view.php,
	operation/gis_maps/public_console.php, godmode/setup/gis_step_2.php:
	fixed the urls for google maps when it is running in https mode.
	
	Fixes: #2403




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-09 13:33:16 +00:00
mdtrooper 70dc4efd08 2013-11-22 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/ajax.php: fixed the get size of icons for
	the public gis map.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9114 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-22 09:56:40 +00:00
mdtrooper 1e6aa96e1e 2013-05-20 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/skins.ajax.php, include/functions_gis.php,
	include/javascript/openlayers.pandora.js,
	operation/gis_maps/public_console.php, operation/gis_maps/ajax.php,
	operation/gis_maps/render_view.php,
	operation/visual_console/public_console.php,
	operation/visual_console/render_view.php: added the public console
	for GIS.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8170 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-20 16:35:49 +00:00
mdtrooper f78b651a16 2013-05-20 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/ajax.php,
	include/javascript/openlayers.pandora.js, include/functions_gis.php:
	lost changes to set the size of agent icons.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8168 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-20 12:49:57 +00:00
mdtrooper b906f0b9ae 2013-05-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php, operation/gis_maps/render_view.php,
	operation/agentes/gis_view.php: changed the code to set the agent
	icon with the original size.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-20 11:16:28 +00:00
mdtrooper 62867cb42c 2013-04-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components_form.php,
	godmode/servers/plugin.php, operation/search_users.getdata.php,
	operation/visual_console/render_view.php,
	operation/events/events_marquee.php,
	operation/events/events_list.php,
	operation/snmpconsole/snmp_view.php,
	operation/gis_maps/render_view.php,
	operation/integria_incidents/incident.files.php,
	operation/integria_incidents/incident.tracking.php,
	operation/integria_incidents/incident.list.php: fixed the old refr
	access for the config instead the get var.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8061 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-25 16:32:18 +00:00