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

14937 Commits

Author SHA1 Message Date
Daniel Maya 2bcc01c9ba Fixed time range with user no admin 2017-08-09 11:33:12 +02:00
vgilc 431cafc713 Merge branch '1199-Problema_commit_japones_al_borrar_modulos_da_fallo_sql' into 'develop' 
fixed minor error sql delete module

See merge request !723
 2017-08-09 10:56:19 +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
vgilc 728d471d6d Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop' 
Disabled select for not admins

See merge request !722
 2017-08-08 15:26:17 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
vgilc dcfd4a7939 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_rev2' into 'develop' 
fixed error in graph container

See merge request !721
 2017-08-08 12:26:07 +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
vgilc af81f139e0 Merge branch '1024-Agrupar_graficas_rev' into 'develop' 
fixed minor error

See merge request !719
 2017-08-07 17:08:21 +02:00
daniel 6a2d3a7011 fixed minor error 2017-08-07 17:02:56 +02:00
vgilc 8d2b2da941 Merge branch '1192-mr_5_changes_mysql' into 'develop' 
mr-5 add queries

See merge request !718
 2017-08-07 14:02:30 +02:00
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +02:00
vgilc 120fbad29d Merge branch '1127-Elementos-desplazados-en-mapas-GIS-dev' into 'develop' 
Fixed issue in public console

See merge request !716
 2017-08-07 11:44:51 +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
vgilc 6e25fc6ba9 Merge branch '1082-change-pass-db-register-dev' into 'develop' 
Added registration method to reset pass

See merge request !707
 2017-08-03 17:05:24 +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
vgilc c51bf1637b Merge branch '156-unrelated-alert-is-deleted' into 'develop' 
[bug fix] deleting a module had caused unextected alert deletion. #156

Closes #156

See merge request !701
 2017-08-02 09:47:32 +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
vgilc eae29d998e Merge branch '1038-API-para-manipular-servicios-dev' into 'develop' 
added service functions in the API

See merge request !700
 2017-08-01 11:42:43 +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
vgilc 97b170a911 Merge branch '1128-center-text-in-vc-items-when-label-position-is-top-or-bottom-dev' into 'develop' 
Center texts

See merge request !699
 2017-07-31 15:20:33 +02:00
Arturo Gonzalez d298ba4d40 Center texts 2017-07-31 14:55:38 +02:00
vgilc 8f4cd81ac5 Merge branch '1065-last-timestamp-in-interface-charts-dev' into 'develop' 
Fixed last timestamp in interface charts

See merge request !698
 2017-07-31 12:57:35 +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
vgilc ea93a55982 Merge branch '618-new-item-auto-sla-graph-in-visual-console-dev' into 'develop' 
618 new item auto sla graph in visual console dev

See merge request !675
 2017-07-28 14:24:21 +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