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

7532 Commits

Author SHA1 Message Date
artica
165087d670 Auto-updated build strings. 2017-09-28 00:01:20 +02:00
artu30
d372d3a93e Merge branch 'develop' into '1241-adv-config-in-ldap-auth-dev' 
# Conflicts:
#   pandora_console/include/auth/mysql.php
 2017-09-27 11:02:15 +02:00
Arturo Gonzalez
b09fdce7e3 Added password verification when log in with ldap 2017-09-26 15:41:04 +02:00
daniel
4ec6b4e053 add new select to setup for TIP 2017-09-26 11:53:57 +02:00
artica
5ab5e04630 Auto-updated build strings. 2017-09-26 00:01:25 +02:00
Daniel Maya
237755a84c Merge branch 'develop' into '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-09-25 15:34:39 +02:00
Daniel Maya
f67a4d90ae Dynamic unit in massive edit modules 2017-09-25 14:51:45 +02:00
Arturo Gonzalez
cb85cff34f ldap adv conf v3 (good version) 2017-09-25 14:18:40 +02:00
daniel
00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
Arturo Gonzalez
89ba75f466 Added ldap adv conf v2 2017-09-25 13:13:11 +02:00
vgilc
3bdd23e2d7 Merge branch '1296-Barra-de-eventos---Vista-táctica-metaconsola2-dev' into 'develop' 
update info of state in events

See merge request !847
 2017-09-25 09:23:58 +02:00
vgilc
851a8082a4 Merge branch '1338-Graficas_TIP_en_informes_open_rev' into 'develop' 
reajust date in flash graphs

See merge request !849
 2017-09-25 08:50:51 +02:00
artica
444101dbdf Auto-updated build strings. 2017-09-25 00:01:22 +02:00
artica
3e3268971f Auto-updated build strings. 2017-09-24 00:01:21 +02:00
artica
d1c4ce1008 Auto-updated build strings. 2017-09-23 00:01:17 +02:00
daniel
44a6e39f99 reajust date in flash graphs 2017-09-22 15:12:53 +02:00
Daniel Maya
4c4a89ecf1 update info of state in events 2017-09-22 15:01:17 +02:00
Arturo Gonzalez
f738fa2fce Added ldap login adv conf v1 2017-09-22 13:54:02 +02:00
daniel
feae62f11c add tip reports simple graph 2017-09-22 11:39:54 +02:00
enriquecd
00eba72a99 Fix data 64 images in dialog for command_snapshot config token - #1250 2017-09-22 10:56:52 +02:00
vgilc
a42e2eae4c Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz_rev_1' into 'develop' 
fixed minor errors tips

See merge request !842
 2017-09-22 09:30:35 +02:00
vgilc
6bb182bf8f Merge branch '1155-Fallo_en_conexion_con_LDAP_merge_roto_Dani_' into 'develop' 
fixed error bad merge ldap

See merge request !841
 2017-09-22 09:30:29 +02:00
artica
c50c7b70da Auto-updated build strings. 2017-09-22 00:01:16 +02:00
daniel
3613d1c1fc fixed minor errors tips 2017-09-21 18:37:57 +02:00
Arturo Gonzalez
9d09f9a436 LDAP in progress 2017-09-21 18:00:32 +02:00
Arturo Gonzalez
98a05f7850 Added changes to ldap adv config 2017-09-21 15:55:21 +02:00
daniel
d86d622340 fixed error bad merge ldap 2017-09-21 15:53:45 +02:00
daniel
9337d33ceb tip in graph interfaces 2017-09-21 15:35:28 +02:00
Arturo Gonzalez
8d6e6d2161 Added ldap new fields to conf 2017-09-21 13:43:46 +02:00
artica
581b6cbae2 Auto-updated build strings. 2017-09-21 00:01:28 +02:00
daniel
edb2865430 fixed errors in TIP SPARSE 2017-09-20 17:29:17 +02:00
Arturo Gonzalez
f5e1410406 Added fix to macros in pdf view 2017-09-20 17:09:50 +02:00
Arturo Gonzalez
3f253b9db4 Added restriction when report comes from template 2017-09-20 15:44:30 +02:00
enriquecd
be0655334d Change installer next button style - #1349 2017-09-20 13:04:36 +02:00
Arturo Gonzalez
526f76d7d1 Added minor change to fix this issue 2017-09-20 12:08:31 +02:00
enriquecd
3ae202ff15 Fix error showing image when there is no data to show in graphs - #1283 2017-09-20 10:49:52 +02:00
Arturo Gonzalez
36c13e44c6 Added some changes to label and name macros in custom graphs 2017-09-20 10:48:06 +02:00
Arturo Gonzalez
ae657210f8 Fixed error in js library and added good export to graph container graphs 2017-09-19 17:46:12 +02:00
Arturo Gonzalez
da763824a9 Added a minor change to test optimization 2017-09-19 10:48:30 +02:00
vgilc
843c190655 Merge branch '1345-corregir_errores_en_graficas_boleanas_de_tip' into 'develop' 
fixed errors in TIP boolean graphs

See merge request !826
 2017-09-19 09:30:56 +02:00
artica
2e802e1b70 Auto-updated build strings. 2017-09-19 00:01:21 +02:00
daniel
d54509fd1e fixed errors in TIP boolean graphs 2017-09-18 17:57:43 +02:00
enriquecd
e05d0bab25 Compatible with all browsers - #1245 2017-09-18 11:07:59 +02:00
vgilc
4e840651be Merge branch '1217-errors-in-pandora-report-templates-macros-dev' into 'develop' 
1217 errors in pandora report templates macros dev

See merge request !822
 2017-09-18 10:28:54 +02:00
Arturo Gonzalez
e3c01374b1 Added changes to meta report templates 2017-09-18 10:18:38 +02:00
vgilc
08ac4c2f35 Merge branch '161-Massive-Operations-remains-at-Console' into 'develop' 
"Massive Operations" had remained at Pandora Console.

Closes #161

See merge request !729
 2017-09-18 10:12:41 +02:00
vgilc
bfbee7179d Merge branch 'Problemas_con_full_scale' into 'develop' 
fixed error in full_scale

See merge request !809
 2017-09-18 09:25:10 +02:00
artica
9a6a22718e Auto-updated build strings. 2017-09-18 00:01:20 +02:00
artica
14cea700ad Auto-updated build strings. 2017-09-17 00:01:19 +02:00
artica
d35a88e439 Auto-updated build strings. 2017-09-16 00:01:20 +02:00