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

7376 Commits

Author SHA1 Message Date
daniel 9c141c9049 fixed errors wux 2017-08-23 17:21:15 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
artica dcd5fd2e5e Auto-updated build strings. 2017-08-23 00:01:14 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
daniel d4b0fc0e6b fixed errors in wux 2017-08-22 11:12:20 +02:00
enriquecd 031a70cc51 Add instructions,user and force_create_agent parameters to CLI event_creator - #309 2017-08-22 10:43:22 +02:00
artica 60757b0ad6 Auto-updated build strings. 2017-08-22 00:01:13 +02:00
daniel 0408a2bee6 resize pie graph 2017-08-21 13:53:50 +02:00
artica c1545fc802 Auto-updated build strings. 2017-08-21 00:01:11 +02:00
artica f3e5c32c09 Auto-updated build strings. 2017-08-20 00:01:11 +02:00
artica 19f1c3610e Auto-updated build strings. 2017-08-19 00:01:13 +02:00
daniel 86125a3c40 changes visual console wux 2017-08-18 13:29:07 +02:00
vgilc 7fdfbde6ff Merge branch '133-Bug-en-pop-up-de-activacion-de-licencia-theme-black' into 'develop' 
Change license activation popup color text - #133

See merge request !393
 2017-08-18 13:17:02 +02:00
vgilc be2eee1afa Merge branch '109-modificar-titulo-de-columna-umbrales-en-vista-de-agente' into 'develop' 
Text change warn by thresholds

Closes #109

See merge request !318
 2017-08-18 13:15:27 +02:00
vgilc 7d1a7103ad Merge branch '1190-Fallo-al-buscar-módulos-de-agente-en-protección-en-cascada-dev' into 'develop' 
Fixed issue to search agent modules in cascade protection

See merge request !717
 2017-08-18 13:05:01 +02:00
vgilc c09033ae03 Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop' 
allow UNION sql reports

See merge request !704
 2017-08-18 13:01:53 +02:00
vgilc 901a163c84 Merge branch '1108-bad-api-and-cli-request-in-meta-with-events-dev' into 'develop' 
Fixed meta event table in cli and api functions

See merge request !665
 2017-08-18 12:50:19 +02:00
vgilc a5d3f916d7 Merge branch '1005-Graficas_de_alerta_con_umbrales' into 'develop' 
1005 graficas de alerta con umbrales

See merge request !702
 2017-08-18 12:42:27 +02:00
vgilc 0083d57297 Merge branch '1177-Graficas_con_valores_negativos' into 'develop' 
fixed errors in graphs value negative

See merge request !703
 2017-08-18 12:41:10 +02:00
vgilc ac1a23c577 Merge branch '1150-added-link-to-fictional-nodes-and-redirect-with-dbclick-dev' into 'develop' 
Added new function to redirect with dbclick when fictinal have a map link

See merge request !691
 2017-08-18 12:40:36 +02:00
vgilc 2d153c1074 Merge branch '1130-Nombres-de-agente-en-vista-táctica-dev' into 'develop' 
Extended number of characters allowed

See merge request !680
 2017-08-18 12:38:15 +02:00
vgilc 386e48fe58 Merge branch '1155-Fallo-en-conexión-con-LDAP-dev' into 'develop' 
Fixed Connection failure in ldap

See merge request !715
 2017-08-18 12:37:07 +02:00
vgilc 6920831d60 Merge branch '1185-Bug_Update_Manager_Online_Pandora_7_Open' into 'develop' 
fixed errors in update manager open

See merge request !714
 2017-08-18 12:35:32 +02:00
daniel f0efe69ad4 fixed error in wux 2017-08-18 12:02:47 +02:00
artica 3ce15d5814 Auto-updated build strings. 2017-08-18 00:01:12 +02:00
daniel ab3cd7dcc0 wux console view 2017-08-17 18:38:12 +02:00
Daniel Maya 498272d75d Update setup log collector 2017-08-17 11:07:22 +02:00
artica f7ecefcc60 Auto-updated build strings. 2017-08-17 00:01:13 +02:00
daniel 104a1a83b4 fixed minor error 2017-08-16 16:30:44 +02:00
artica f7ea07d559 Updated version and build strings. 2017-08-16 13:09:03 +02:00
Daniel Maya 2963f18ed3 Added text line in label help 2017-08-16 12:05:17 +02:00
artica 8958dd0900 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica c08e17084f Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya e99ef7d0f1 Fixed 2017-08-16 10:38:02 +02:00
Daniel Maya 80faddcbb8 Xaxisname deleted from xaxes 2017-08-16 10:38:02 +02:00
artica 9ddf454e09 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica b973e12a51 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica 5542bd8947 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
daniel 4b26cf119c fixed errors visual console 2017-08-16 10:38:02 +02:00
artica 31d5699a2b Auto-updated build strings. 2017-08-16 10:38:02 +02:00
daniel 61ffae2ae1 fixed errors in visual console on simple value 2017-08-16 10:38:02 +02:00
Daniel Maya 07c115eb4e Fixed issue with simple value 2017-08-16 10:38:02 +02:00
artica ed5c0c71b2 Updated version and build strings. 2017-08-16 10:38:02 +02:00
artica 70988d8c8c Auto-updated build strings. 2017-08-16 10:38:02 +02:00
daniel 2d3d9e782f fixed errors metaconsole reports serialize data 2017-08-16 10:38:02 +02:00
Daniel Maya 7d578093d9 Fixed label in automatic graph in node 2017-08-16 10:38:01 +02:00
daniel afc481098d fixed error exportation csv in custom graphs 2017-08-16 10:36:30 +02:00
Daniel Maya 43285a9192 Added label in automatic graph 2017-08-16 10:36:30 +02:00
Daniel Maya 860a81aee8 Fixed urlencode in event popup 2017-08-16 10:36:30 +02:00
Arturo Gonzalez 09bb7d8cd8 Changed field in sql request 2017-08-16 10:36:30 +02:00
daniel 571c74d558 fixed error export csv custom graph 2017-08-16 10:16:04 +02:00
artica b0f3a737a9 Auto-updated build strings. 2017-08-16 00:01:15 +02:00
artica a12f0de8b7 Auto-updated build strings. 2017-08-15 00:01:13 +02:00
vgilc 9c32a72c9f Merge branch 'develop' into '1077-sql-error-in-log4x-data-module-dialog-dev' 
# Conflicts:
#   pandora_console/include/functions_modules.php
 2017-08-14 15:26:54 +02:00
Daniel Maya 2f8e8703b7 Fixed 2017-08-14 14:53:56 +02:00
Daniel Maya c3d1d7e397 Xaxisname deleted from xaxes 2017-08-14 12:36:49 +02:00
vgilc aa54f0cc9a Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop' 
fixed errors metaconsole reports serialize data

See merge request !712
 2017-08-14 12:24:43 +02:00
vgilc 4d0b360bf8 Merge branch '1112-PopUp-eventos-no-carga-gráfica-de-módulos-con-espacios-dev' into 'develop' 
Fixed urlencode in event popup

See merge request !676
 2017-08-14 12:18:22 +02:00
vgilc f5d161b108 Merge branch '1167-Fallo_en_exportación_a_CSV_de_Custom_Graphs' into 'develop' 
fixed error exportation csv in custom graphs

See merge request !708
 2017-08-14 12:16:47 +02:00
vgilc baf9b6aa5a Merge branch '1173-Campo-label-no-funciona-en-templates-de-informe-en-la-metaconsola-dev' into 'develop' 
Added label in automatic graph

See merge request !706
 2017-08-14 12:13:58 +02:00
artica 8462e9d3d5 Auto-updated build strings. 2017-08-14 00:01:13 +02:00
artica cc7b00bb39 Auto-updated build strings. 2017-08-13 00:01:12 +02:00
artica bc022aba2b Auto-updated build strings. 2017-08-12 00:01:13 +02:00
daniel 33ccab173e fixed errors visual console 2017-08-11 09:13:26 +02:00
artica 941341585e Auto-updated build strings. 2017-08-11 00:01:13 +02:00
daniel 0915e46e4c fixed errors in visual console on simple value 2017-08-10 17:45:00 +02:00
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
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
artica f96032eeaa Auto-updated build strings. 2017-08-09 00:01:15 +02:00
artica d5cff43128 Auto-updated build strings. 2017-08-08 00:01:14 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +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
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
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
artica c363a2e085 Auto-updated build strings. 2017-08-02 00:01:14 +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
Arturo Gonzalez d298ba4d40 Center texts 2017-07-31 14:55:38 +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