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

514 Commits

Author SHA1 Message Date
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +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
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
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
enriquecd 4aa04cfef0 Set texport_server table name field varchar 600 - #1015 2017-07-17 16:19:38 +02:00
vgilc 66ad86a302 Merge branch '1015-Aumentar-tamaño-del-campo-nombre-en-tabla-texport_server_data' into 'develop' 
Change tserver_export_data to varchar 600 - #1015

See merge request !600
 2017-07-17 15:41:45 +02:00
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
enriquecd 342db3c4fb Add column id_server to tgraph_source and fix metaconsole automatic_graph report_template - #1071 2017-06-29 17:33:29 +02:00
enriquecd 7e383262bb Change tserver_export_data to varchar 600 - #1015 2017-06-20 13:56:20 +02:00
Ramon Novoa 035829ce91 Replaced procedures with prepared statements. 
The Update Manager client cannot load MySQL procedures because the
parser breaks them.
 2017-06-15 15:43:00 +02:00
Ramon Novoa d2d56b4b89 Add a missing MR. 2017-06-15 13:47:20 +02:00
Ramon Novoa 7c3ef317b0 Revert "Add a missing MR." 
This reverts commit 16b0da1515.
 2017-06-15 10:50:31 +02:00
Ramon Novoa 16b0da1515 Add a missing MR. 2017-06-15 10:33:30 +02:00
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
Arturo Gonzalez 7a9f63f212 Added change to db 2017-06-01 14:30:34 +02:00
Arturo Gonzalez 4d46470e96 Added target_ip to policy_modules table 2017-06-01 14:24:24 +02:00
Arturo Gonzalez efd28c0513 Added Enrique Camargo db changes to mr number 2 2017-06-01 11:28:24 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez 47862600a4 Added los querys to migrate 2017-05-30 15:33:16 +02:00
Arturo Gonzalez 1e0af6ec26 Added field to db 2017-05-29 11:58:42 +02:00
Arturo Gonzalez a4636f3435 Added changes in db 2017-05-29 11:55:04 +02:00
Daniel Maya 0f9a2cf2f8 New feature: Graphic grouping. added mr 2017-05-23 17:17:40 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +02:00
Arturo Gonzalez 2e3f6ad700 Added change to mr 2017-05-10 15:21:42 +02:00
Arturo Gonzalez de650b9ef2 Added change to mr (enriquecd) 2017-04-25 16:26:45 +02:00
Daniel Maya bd5cda07c4 deleted 1.sql 2017-04-25 10:28:46 +02:00
Arturo Gonzalez 82530c9b59 Added external query to mr 2017-04-20 16:18:37 +02:00
vanessa gil c3ccb00b2a new file. 2017-04-20 13:36:03 +02:00
Arturo Gonzalez 29ad608ddb Added ; to query transaction 2017-04-18 11:41:51 +02:00
Arturo Gonzalez 97abef62c4 Added db field to mr 2017-04-18 11:39:46 +02:00
fermin831 bf368a155b Drop addcol procedure if not exists 2017-04-17 13:25:36 +02:00
fermin831 4178343313 Added procedure to avoid migrate fail in tbackup 2017-03-30 17:11:49 +02:00
daniel 13620b1489 fixed custom logo login 2017-03-27 12:01:31 +02:00
vanessa gil 644eeaa7aa delete file 2017-03-23 16:51:00 +01:00
vanessa gil d006c81eb0 delete files. 2017-03-23 15:53:44 +01:00
daniel 173141c90a add news field trecorn-task migrate 2017-03-22 16:31:34 +01:00
vanessa gil b00ddd9beb new file. 2017-03-22 11:29:28 +01:00
vanessa gil 5cf45a08ec new file 2017-03-22 11:10:09 +01:00
vanessa gil 2b7e5de6a1 new file 2017-03-22 11:03:38 +01:00
vanessa gil be188dcf68 new file 2017-03-22 10:47:51 +01:00
vanessa gil 7c94400e7b MR 2017-03-22 10:29:10 +01:00
vanessa gil 0b564c2866 new file 2017-03-21 13:43:01 +01:00
vanessa gil 2994a9f8a1 new file. 2017-03-21 13:32:08 +01:00
m-lopez-f e34ec2109a Fixed problem with extension backup. Add new column in migrate sql. 2017-03-21 13:15:45 +01:00
vanessa gil c23767c5d7 new mr file. 2017-03-21 13:11:17 +01:00