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

15804 Commits

Author SHA1 Message Date
artica cc4e337f70 Auto-updated build strings. 2017-11-04 00:01:12 +01:00
vgilc c45154e9d7 Merge branch '179-Se-han-dejado-una-traza-en-la-vista-de-agente-dev' into 'develop' 
Fixed traces

See merge request artica/pandorafms!1015
 2017-11-03 14:48:47 +01:00
vgilc bbecd1af09 Merge branch '1534-No-se-inicializan-módulos-SNMPv3-con-caracteres-especiales-dev' into 'develop' 
Fixed password entities in snmp walk

See merge request artica/pandorafms!1014
 2017-11-03 13:49:40 +01:00
danielmaya 173efae22d Fixed traces 2017-11-03 13:38:59 +01:00
danielmaya 7c78cd2a34 Fixed password entities in snmp walk 2017-11-03 13:18:00 +01:00
vgilc 49d5f0878f Merge branch 'tardanza-en-vista-de-arbol-carrefour' into 'develop' 
Initialize the group cache.

See merge request artica/pandorafms!1006
 2017-11-03 12:10:55 +01:00
vgilc 43fdb65e92 Merge branch '1394-Errores-tema-black-2-open' into 'develop' 
Change pandora black styles - #1394

See merge request artica/pandorafms!1013
 2017-11-03 11:36:39 +01:00
vgilc 6ddf744163 Merge branch '1511-visual-console-elements-not-sorted-in-creation-dev' into 'develop' 
Added changes to sort json in ajax return

See merge request artica/pandorafms!1001
 2017-11-03 10:46:17 +01:00
enriquecd 1e138f240f Change pandora black styles - #1394 2017-11-03 10:27:01 +01:00
vgilc dbe717c1fc Merge branch '1441-Búsqueda-y-ordenación-no-funcionan-correctamente-dev' into 'develop' 
Fixed order by remote

See merge request artica/pandorafms!1009
 2017-11-03 09:04:51 +01:00
artica 3d6d1044ea Auto-updated build strings. 2017-11-03 00:01:11 +01:00
vgilc ff4f63bb8d Merge branch '1121-4283-Icono-personalizado-por-agente-en-mapas-GIS-2' into 'develop' 
Change agent group and gis maps icons - #1121

See merge request artica/pandorafms!1010
 2017-11-02 18:38:45 +01:00
Alejandro Gallardo Escobar d7dd37f562 [Android Event Viewer] Added a button to access the settings and improved the behaviour of the filter button 2017-11-02 17:59:29 +01:00
Alejandro Gallardo Escobar c1323d39e4 [Android Event Viewer] Updated the Gradle tools 2017-11-02 17:58:05 +01:00
enriquecd 8ae61c9a84 Change agent group and gis maps icons - #1121 2017-11-02 17:33:33 +01:00
danielmaya d198cbf597 Fixed order by remote 2017-11-02 17:23:57 +01:00
vgilc 95ab46c7a5 Merge branch '1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-3' into 'develop' 
Now can create static graphs a group items without images, fix bugs - #1407

See merge request artica/pandorafms!1008
 2017-11-02 16:03:46 +01:00
enriquecd f0fe30fc3a Now can create static graphs a group items without images, fix bugs - #1407 2017-11-02 15:54:18 +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
danielmaya 33bff02978 clear entities 2017-11-02 13:03:58 +01:00
vgilc 9f0b3c6b87 Merge branch 'ent-1528-no-se-puede-acceder-a-los-agentes-en-version-OPEN' into 'develop' 
Added enterprise_hook to a UX function on the Open part

See merge request artica/pandorafms!1005
 2017-11-02 12:23:25 +01:00
Ramon Novoa ec870aa2f6 Initialize the group cache. 2017-11-02 10:41:07 +01:00
fermin831 c849df1c21 Added enterprise_hook to a UX function on the Open part 2017-11-02 10:31:01 +01:00
artica f8211e2c63 Auto-updated build strings. 2017-11-02 00:01:07 +01:00
artica 9b530c414f Auto-updated build strings. 2017-11-01 00:01:10 +01:00
Arturo Gonzalez 50e7e5fc17 Added changes to sort json in ajax return 2017-10-31 16:39:58 +01:00
vgilc cd508098cb Merge branch 'change_route_parser' into 'develop' 
Exposed route_parser code

See merge request artica/pandorafms!1000
 2017-10-31 14:42:36 +01:00
fbsanchez 5496446819 Exposed route_parser code 2017-10-31 14:01:56 +01:00
vgilc 62b4ed9b2d Merge branch 'ent-1365-graficas-gauge-no-muestran-umbrales-menores-a-1' into 'develop' 
Fixed lower than 1 values on gauges

See merge request artica/pandorafms!974
 2017-10-31 12:52:51 +01:00
fermin831 0a0506b9ff Merge branch 'develop' into ent-1365-graficas-gauge-no-muestran-umbrales-menores-a-1 
Conflicts resolved:
*  pandora_console/include/graphs/pandora.d3.js
 2017-10-31 12:47:42 +01:00
vgilc a7e1e877e7 Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop' 
654 cambios en informes de maximo minimo y media 4480 cherry

See merge request artica/pandorafms!994
 2017-10-31 12:13:55 +01:00
vgilc 2e606acad9 Merge branch '951-Añadir-enlace-documentación-en-aviso-de-MR-pendiente-open-2' into 'develop' 
Add minor realeases doc link in header advice modal window - #951

See merge request artica/pandorafms!995
 2017-10-31 12:13:22 +01:00
vgilc ef47b1dc6f Merge branch '1398-Dashboard-En-la-creacion-solo-1-widget-2b' into 'develop' 
Add only one widget when creating a dashboard - #1398

See merge request artica/pandorafms!998
 2017-10-31 12:08:04 +01:00
enriquecd d1c29845a9 Add only one widget when creating a dashboard - #1398 2017-10-31 12:00:30 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
nramon 4e672cc758 Merge branch '655-module_data_increment_new_type_of_report' into 'develop' 
655 module data increment new type of report

See merge request artica/pandorafms!519
 2017-10-31 08:18:26 +01:00
artica 0653c17a9d Auto-updated build strings. 2017-10-31 00:01:11 +01:00
enriquecd f2c6837cd5 Add minor realeases doc link in header advice modal window - #951 2017-10-30 18:20:43 +01:00
Alejandro Gallardo Escobar 849eba10d4 [Console] Fixed a vulnerability into the 'fgraph.php' script 2017-10-30 18:03:09 +01:00
enriquecd 96b3ebc67a Change pandoradb treport_content_template and treport_content fields - #654 2017-10-30 17:27:37 +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 0897bbea28 Merge branch 'revert-65ae5ed2' into 'develop' 
Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"

See merge request artica/pandorafms!993
 2017-10-30 16:15:28 +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
Alejandro Gallardo Escobar 64ec82f9d6 [Console] Added a notice to warn the users about the php files uploaded with the files manager 2017-10-30 16:04: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 77a0f634cc Merge branch '1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-2' into 'develop' 
Show no data advice when select none in visual console  static graph or icon element - #1407

See merge request artica/pandorafms!907
 2017-10-30 15:48:57 +01:00
nramon 70763ada3b Merge branch 'develop' into '1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-2' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-10-30 15:32:32 +01:00
nramon 9ecc68bfe7 Merge branch '1125-Vista-de-Agente-Modulo' into 'develop' 
Disable autosubmit in agent module view - #1125

See merge request artica/pandorafms!753
 2017-10-30 15:29:09 +01:00
nramon 7bc959ef41 Merge branch '1205-Editar-OID-desde-operaciones-masivas-4406-Northern' into 'develop' 
Add snmp oid field in module bulk operations - #1205

See merge request artica/pandorafms!807
 2017-10-30 15:27:34 +01:00