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

7532 Commits

Author SHA1 Message Date
Arturo Gonzalez
bc557573ec Fixed combo in editor 2017-08-23 10:19:56 +02:00
daniel
c29d8a4fdb Revert "merge develop" 
This reverts commit 823291171347bf74d93e74a99a3c958660a39fe2, reversing
changes made to f5da86ac0aa968789fdcfa3a14dc714886c26cfb.
 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
enriquecd
418906add5 Fix bad ordination in mobile pandora events list - #1169 2017-08-22 17:24:26 +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
enriquecd
2f5127d517 Change pandora help window style - #1122 2017-08-21 15:58:19 +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