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

11446 Commits

Author SHA1 Message Date
artica 941341585e Auto-updated build strings. 2017-08-11 00:01:13 +02:00
daniel 0915e46e4c fixed errors in visual console on simple value 2017-08-10 17:45:00 +02:00
Daniel Maya e1d4a81034 Fixed issue with simple value 2017-08-10 15:45:53 +02:00
artica 8309e4fffb Updated version and build strings. 2017-08-10 10:37:06 +02:00
artica bbe63a30ec Auto-updated build strings. 2017-08-10 00:01:15 +02:00
Daniel Maya 2bcc01c9ba Fixed time range with user no admin 2017-08-09 11:33:12 +02:00
daniel be0a91ed2c fixed minor error sql delete module 2017-08-09 10:35:57 +02:00
vgilc e250e0eeae Revert "Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop'" 
This reverts merge request !722
 2017-08-09 09:27:06 +02:00
artica f96032eeaa Auto-updated build strings. 2017-08-09 00:01:15 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
daniel 4cbd005137 fixed error in graph container 2017-08-08 12:07:28 +02:00
artica d5cff43128 Auto-updated build strings. 2017-08-08 00:01:14 +02:00
daniel 6a2d3a7011 fixed minor error 2017-08-07 17:02:56 +02:00
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +02:00
Daniel Maya 5df61b95b9 Fixed issue in public console 2017-08-07 11:30:49 +02:00
artica 5164624dca Auto-updated build strings. 2017-08-07 00:01:14 +02:00
artica 5a0da66b3d Auto-updated build strings. 2017-08-06 00:01:13 +02:00
artica c826d0951e Auto-updated build strings. 2017-08-05 00:01:13 +02:00
artica 2d8697eaeb Auto-updated build strings. 2017-08-04 00:01:14 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
artica 5860d29e37 Auto-updated build strings. 2017-08-03 00:01:15 +02:00
artica 408efec325 Updated version and build strings. 2017-08-02 10:12:45 +02:00
Hirofumi Kosaka 76c951183c [bug fix] deleting a module had caused unextected alert deletion. #156 2017-08-02 15:41:44 +09:00
artica c363a2e085 Auto-updated build strings. 2017-08-02 00:01:14 +02:00
Daniel Maya dd5cb8088c added service functions in the API 2017-08-01 10:39:02 +02:00
artica 7e508a4137 Auto-updated build strings. 2017-08-01 00:01:14 +02:00
Arturo Gonzalez d298ba4d40 Center texts 2017-07-31 14:55:38 +02:00
Arturo Gonzalez 4ce9a96b74 Fixed last timestamp in interface charts 2017-07-31 12:50:50 +02:00
vgilc dc462550ef Merge branch 'reset_commit_acl_open' into 'develop' 
Revert "Use session and not exec sql if already exists acl perms in session - #1017"

See merge request !697
 2017-07-31 10:26:40 +02:00
artica 6a4a199c96 Auto-updated build strings. 2017-07-31 00:01:13 +02:00
artica 50c4419ef7 Auto-updated build strings. 2017-07-30 00:01:13 +02:00
artica cc40fcccc2 Auto-updated build strings. 2017-07-29 00:01:14 +02:00
vgilc 03cb255562 Merge branch '1071-Formulario-gráfica-combinada-automática-open' into 'develop' 
Add column id_server to tgraph_source and fix metaconsole automatic_graph report_template - #1071

See merge request !634
 2017-07-28 14:31:46 +02:00
daniel 179325447f Revert "Use session and not exec sql if already exists acl perms in session - #1017" 
This reverts commit 78bb583824.
 2017-07-28 12:46:17 +02:00
Enrique Camargo 88879462a3 Merge branch 'develop' into '1071-Formulario-gráfica-combinada-automática-open' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2017-07-28 10:34:06 +02:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
 2017-07-28 10:30:17 +02:00
vgilc 94f6683c16 Merge branch '1114-En-la-vista-de-agente-modulo-se-distorsionan-las-imágenes-2' into 'develop' 
Change agent / module icons height a width - #1114

See merge request !659
 2017-07-28 10:25:14 +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
vgilc 9a791dc0a5 Merge branch '1082-some-modifications-in-change-pass-feature-dev' into 'develop' 
Added some fixes to reset pass feature

See merge request !677
 2017-07-28 10:23:31 +02:00
vgilc ca43066ce8 Merge branch '1085-Añadir-sección-Description-a-HTML-view-meta-enterprise-open' into 'develop' 
Add report info option in metaconsole 7 open - #1085

See merge request !687
 2017-07-28 10:22:42 +02:00
vgilc e2a175327e Merge branch '1140-Gráficas_con_entities' into 'develop' 
fixed errors entities in mail

See merge request !682
 2017-07-28 10:21:04 +02:00
vgilc 333171c2b6 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_open' into 'develop' 
fixed errors in graph container

See merge request !688
 2017-07-28 10:19:15 +02:00
vgilc f0afe8431f Merge branch '1120-Nombre-de-agente-en-mapas-GIS-dev' into 'develop' 
Change agent name by alias in gis map

See merge request !678
 2017-07-28 10:16:27 +02:00
artica 55c70098ba Auto-updated build strings. 2017-07-28 00:01:13 +02:00
Arturo Gonzalez 02ce575d9f Added a last fix 2017-07-27 12:39:38 +02:00
Arturo Gonzalez 39f4b48d84 Added some changes about update modules from local component with macros 2017-07-27 11:08:19 +02:00
artica 9d6bd697a7 Auto-updated build strings. 2017-07-27 00:01:13 +02:00
artica a9d76e2748 Updated version and build strings. 2017-07-26 17:03:41 +02:00
enriquecd 240b6e017f Adapt historical_db checkbox for sql reports to sql templates - #1157 2017-07-26 13:50:55 +02:00
Arturo Gonzalez 82b6904289 Changed some lines in configurar_agente 2017-07-26 13:36:42 +02:00