tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,439 Commits 34 Branches 30 Tags
Commit Graph

15439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
1d7d55a451 fixed errors in form wux 2017-08-09 13:27:51 +02:00
daniel
788cb8cbd8 fixed errors in form wux 2017-08-09 12:08:52 +02:00
vgilc
2f5928754d Merge branch '1200-Time-range-en-gráficas-de-interfaces-SNMP-dev' into 'develop' 
Fixed time range with user no admin

See merge request !724
 2017-08-09 11:39:40 +02:00
Daniel Maya
2bcc01c9ba Fixed time range with user no admin 2017-08-09 11:33:12 +02:00
daniel
7e649b78b3 wux new form 2017-08-09 11:29:16 +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
Daniel Maya
3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +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
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