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

193 Commits

Author SHA1 Message Date
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
daniel 97aaad0b02 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-01 14:04:46 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
fermin831 0acaf2312d [Rebranding] Mobile console head title 2018-05-29 13:26:47 +02:00
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
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +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 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
enriquecd 3b1c9e16a5 Fix pandroid index page - #1837 2018-02-07 16:56:21 +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
Alejandro Gallardo Escobar 85411c8948 [Pandora Console > Mobile] Redirect to the required page after login 2018-01-24 14:13:13 +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
vgilc 585e7d44ee Merge branch '1170-Pandora-FMS-Aplicación-movil-Error-La-barra-de-histograma' into 'develop' 
Change 24h event histogram function in pandora mobile to same that desktop pandora - #1170

See merge request !745
 2017-09-11 09:12:54 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
enriquecd 8b718371f9 Fix agent view qr mobile code - #1229 2017-08-24 16:09:04 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02: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
m-lopez-f 1bef3ab0de Fixed problems with pass when this pass containt blank spaces. 2017-05-04 15:47:17 +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
m-lopez-f 66957b5580 can't use mobile version when you install metaconsole version, add redirect. Ticket: #4067 
(cherry picked from commit 4be427bad9)
 2016-09-23 11:57:34 +02:00
daniel 9ff35c28f3 ticket integria: 3956 #22 2016-08-12 13:35:22 +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
m-lopez-f decb820659 Fixed problems with session in pandora mobile verison. Tiquet: #3656 2016-06-01 12:54:00 +02:00