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

15111 Commits

Author SHA1 Message Date
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
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +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
Daniel Maya 160ad7e866 Fixed Connection failure in ldap 2017-08-07 09:21:26 +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
daniel e875ce9b4e fixed errors in update manager open 2017-08-04 14:07:27 +02:00
artica 2d8697eaeb Auto-updated build strings. 2017-08-04 00:01:14 +02:00
daniel c4171ac248 fixed errors metaconsole reports serialize data 2017-08-03 17:09:27 +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
daniel 88411aedf5 fixed minor error 2017-08-03 15:07:49 +02:00
daniel df4b66fbd5 fixed error cli version snmp 2017-08-03 13:51:56 +02:00
Daniel Maya 78d4eb68bc Fixed problem in node 2017-08-03 13:29:18 +02:00
Daniel Maya 0932004781 Fixed label in automatic graph in node 2017-08-03 13:13:34 +02:00
daniel fb9f187287 fixed error exportation csv in custom graphs 2017-08-03 13:09:41 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
Daniel Maya 362ab94781 Added label in automatic graph 2017-08-03 12:41:47 +02:00
Arturo Gonzalez cccbc8ff5b Added new macro 2017-08-03 11:49:56 +02:00
daniel 20fc24b99e allow UNION sql reports 2017-08-03 11:32:43 +02:00
artica 5860d29e37 Auto-updated build strings. 2017-08-03 00:01:15 +02:00
daniel 89b0ec2584 fixed errors in graphs value negative 2017-08-02 16:46:50 +02:00
daniel 14422413a3 add helps in pandora macromodulegraphth 2017-08-02 12:00:26 +02:00
daniel 6e45b3cd9e add threshold graph send for mail 2017-08-02 11:48:37 +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