Commit Graph

153 Commits

Author SHA1 Message Date
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
daniel 16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
2018-05-23 12:46:12 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
2018-05-22 19:29:46 +02:00
daniel 78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
Alejandro Gallardo Escobar 2e96c2bbd1 Fixed a SQL injection vulnerability 2018-05-21 15:19:25 +02:00
danielmaya 7783f81f59 Fixed mobile graph 2018-05-17 16:43:31 +02:00
Fermin 9cf7fee2c0 [Rebranding] Open mobile console 2018-05-11 14:24:26 +02:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
vgilc 0da39d386b Merge branch '1678-Qr-de-vista-de-agente-que-redireccione-a-vista-escritorio-en-modo-escritorio-del-navegador-movil' into 'develop'
Redirect to desktop version pandora when scan agent view QR with a mobilephone…

See merge request artica/pandorafms!1165
2018-01-29 13:38:25 +01:00
vgilc 8ea951a4bb Merge branch 'ent-1520-error-en-grafica-de-agente-no-dinamica' into 'develop'
Fixed non interactive status graphs

See merge request artica/pandorafms!1063
2017-12-21 10:48:17 +01:00
vgilc 733564dcb1 Merge branch 'default-mobile-page' into 'develop'
[Pandora Console > Mobile] Added support to the user's default page

See merge request artica/pandorafms!1091
2017-12-21 10:41:24 +01:00
enriquecd 767087aaee Redirect to desktop version pandora when scan agent view QR with a mobilephone in desktop mode web browser - #1678 2017-12-05 17:14:52 +01:00
Alejandro Gallardo Escobar 979a27f794 [Mobile console] Now the agents filter persists between the list and detail view 2017-11-20 16:44:28 +01:00
Alejandro Gallardo Escobar b6470a0e98 [Pandora Console > Mobile] Added support to the user's default page 2017-11-17 12:29:52 +01:00
fermin831 ff58a171e9 Fixed non interactive status graphs 2017-11-14 12:20:28 +01:00
enriquecd 44cf079b20 Change 24h event histogram function in pandora mobile to same that desktop pandora - #1170 2017-08-22 11:33:15 +02:00
Alejandro Gallardo Escobar beb38c70ce Changed the agent name by its alias in the mobile console 2017-02-22 13:50:06 +01:00
Alejandro Gallardo Escobar 3d521ec290 Changed the agent name by its alias in some sections 2017-02-22 12:51:55 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
m-lopez-f e5fba88137 fixed visual on movile version. gitlab: #340 2017-02-21 14:27:06 +01:00
m-lopez-f 483c64a888 Add lost updates of files in mobile version #148 2017-02-16 08:37:36 +01:00
m-lopez-f 1fe9ded0fc Add changes of visual mobile version of pandora. Gitlab: #148 2017-02-13 16:06:17 +01:00
enriquecd 6c5c6d264c Snapshop image modules for mobile console #90, Delete relation ttag_module on delete agent #4216 2016-11-22 19:24:07 +01:00
m-lopez-f 5a50829e4b Fixed minor error. Ticket: #4169 2016-11-03 15:05:30 +01:00
enriquecd 88453e2075 New function pandora ux, let open pics from base64 image modules #90 - 2 2016-10-28 14:08:13 +02:00
m-lopez-f 1f21b9ffee Add new option in mobile version.
(cherry picked from commit 09671dcb1d)
2016-10-24 11:59:23 +02:00
m-lopez-f dd836f6a08 Revert "Remove view options in mible version"
This reverts commit 8b2702f7e8.
2016-09-30 10:45:24 +02:00
m-lopez-f 8b2702f7e8 Remove view options in mible version
(cherry picked from commit 0bcd2cb072)
2016-09-30 10:40:53 +02:00
m-lopez-f 06b981e984 Add new images to mobile version and fixed problems. Ticket internal: 79 2016-09-30 10:32:48 +02:00
m-lopez-f aa553c14b3 Fixed version mobile in metaconsole version. Internal ticket: 79 2016-09-28 16:56:05 +02:00
m-lopez-f 657cd44a30 Revert "Fixed version mobile in metaconsole version"
This reverts commit a5e14a26bb.
2016-09-28 16:06:51 +02:00
m-lopez-f a5e14a26bb Fixed version mobile in metaconsole version 2016-09-28 16:04:13 +02:00
Alejandro Gallardo Escobar a87de02e0b Removed the tinyMCE from the agent description and custom fields. Removed the url injection feature from the agent description. Added the url injection feature to the agent custom fields of some sections
(cherry picked from commit c4bbe38b69e9b076b45871bc35b8c861b8ed2cc9)
2016-06-08 19:17:39 +02:00
Arturo Gonzalez Diaz ea4cb8a815 Added an error message when the user does not have permissions on the visual console 2015-10-19 18:43:28 +02:00
Arturo Gonzalez Diaz 009ae5c92a Fixed visual map in mobile version of Pandora. Ticket#2907 2015-10-19 10:51:44 +02:00
mdtrooper f1ada9076e Added a filter 'normal & critical' in severity into events. 2015-07-21 10:40:29 +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 d28cd4c172 Changes on the functionality and the ACL checks. Great improvements on the ACL management 2015-04-09 14:00:37 +02:00
Alejandro Gallardo Escobar 9bb62f1f43 Added the new way to store the maps in groups and ACL improvements 2015-03-31 12:27:12 +02:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
mdtrooper 303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
Alejandro Gallardo Escobar 3dcb6a14a2 Fixed error and added new ACL checks 2014-10-15 18:12:51 +02:00
Alejandro Gallardo Escobar 7be0179bdc Minor fix 2014-10-13 17:49:22 +02:00
jsatoh 884f59d9a8 2014-08-22 Junichi Satoh <junichi@rworks.jp>
* mobile/operation/events.php: Fixed present event filter loading
	failure.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10447 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-22 11:01:20 +00:00
jsatoh 05705a62fe 2014-08-13 Junichi Satoh <junichi@rworks.jp>
* mobile/operation/events.php: Improved to show event comment.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10411 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-13 01:57:55 +00:00
zarzuelo 205f648c4a 2014-02-12 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Fix order of the event 
	list on mobile console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9432 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-12 12:07:58 +00:00
zarzuelo 452c0096cf 2014-02-11 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Inverse the order
	of the shown events to show them from newer to older



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 16:59:30 +00:00
zarzuelo ca2e2a4132 2014-02-11 Sergio Martin <sergio.martin@artica.es>
* mobile/index.php
	mobile/operation/tactical.php
	mobile/operation/home.php: Change the tactical 
	view to load dinamically the graph to be adapted
	to the layout when change device orientation. Fix
	id_user info on title



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9428 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 13:03:31 +00:00