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

13203 Commits

Author SHA1 Message Date
daniel e2b749a34d Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop' 
Allow dinamic ip

Closes #17

See merge request !34
 2017-01-17 09:22:36 +01:00
daniel 9e391e0210 Allow dinamic ip 2017-01-17 09:21:46 +01:00
daniel 2aba5dde02 Merge branch 'revert-981273b2' into 'develop' 
Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria…

See merge request !33
 2017-01-17 09:09:23 +01:00
daniel cf2c0a87b6 Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'" 
This reverts merge request !31
 2017-01-17 09:03:17 +01:00
Junichi Satoh d16aa71c53 Added missing ';'. 2017-01-17 16:14:17 +09:00
artica 42487d8a6d Auto-updated build strings. 2017-01-17 00:01:13 +01:00
daniel 981273b2b6 Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop' 
Allow automatic ip

Closes #17

See merge request !31
 2017-01-16 17:47:55 +01:00
daniel 7261b50a4e Allow automatic ip 2017-01-16 17:46:59 +01:00
Enrique Camargo 1ca30286ab Merge branch '110-Mejoras_visuales_en_consola_Visual' into 'develop' 
110 mejoras visuales en consola visual

#110

See merge request !29
 2017-01-16 14:44:24 +01:00
enriquecd 897da6d5da Improve visual console - #110 2017-01-16 14:42:03 +01:00
Ramon Novoa a27f72168d Change the input encoding once,not on every run. 2017-01-16 13:59:02 +01:00
enriquecd e7ffa47b0a Improve visual console - #110 2017-01-16 13:32:28 +01:00
enriquecd 6447189606 Improve visual console - #110 2017-01-16 13:31:56 +01:00
Enrique Camargo 9375927b55 Merge branch '13-Texto_en_hovering' into 'develop' 
Change hover text in vconsole, full text in bbdd but show truncate - #13

#13

See merge request !27
 2017-01-16 12:09:38 +01:00
enriquecd 32b0e504aa Change hover text in vconsole, full text in bbdd but show truncate - #13 2017-01-16 12:05:36 +01:00
Arturo Gonzalez e0d55c56e6 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-01-16 11:35:30 +01:00
Arturo Gonzalez d51225f86c Added pass field to groups in console. Ticket #153 2017-01-16 11:34:55 +01:00
Ramon Novoa 66ae3460ce Add the token group_password to agent configuration files. 2017-01-16 11:34:44 +01:00
Enrique Camargo 31d37e0905 Merge branch 'cherry-pick-729f0daa' into 'develop' 
Merge branch '7-cambiar_color_de_grafica_de_acceso' into 'pandora_6.0'

Change agent details graph color

#7

See merge request !14

See merge request !24
 2017-01-16 11:27:24 +01:00
vgilc 2dcc6db342 Merge branch '7-cambiar_color_de_grafica_de_acceso' into 'pandora_6.0' 
Change agent details graph color

#7

See merge request !14
 2017-01-16 11:27:00 +01:00
daniel 102e5bfc69 Merge branch '11-config-network-tools-no-se-muestra-3520' into 'develop' 
fixed minor error extensions

Closes #11

See merge request !21
 2017-01-16 08:38:55 +01:00
daniel e3c5121068 fixed minor error extensions 2017-01-16 08:37:45 +01:00
artica 28989fc4db Auto-updated build strings. 2017-01-16 00:01:12 +01:00
artica 3956ce300f Auto-updated build strings. 2017-01-15 00:01:12 +01:00
artica 233fe5e839 Auto-updated build strings. 2017-01-14 00:01:17 +01:00
Enrique Camargo 50174695dd Merge branch '9-Feature_Case_sensitive_en_campos_de_búsqueda' into 'develop' 
Case insensitive in tree view filter search #9

#9

See merge request !19
 2017-01-13 11:03:12 +01:00
enriquecd 21c2b93637 Case insensitive in tree view filter search #9 2017-01-13 11:01:08 +01:00
mlopez 0933ccd5a6 Merge branch '8-tree-view-metaconsola-con-usuario-ad-no-muestra-hiperlink-nodo' into 'develop' 
Fixed problems with access a node with user in metaconsole.

#8

See merge request !17
 2017-01-13 10:46:40 +01:00
m-lopez-f 6d1c519340 Fixed problems with access a node with user in metaconsole. 2017-01-13 10:46:09 +01:00
artica 2773b3f2f9 Auto-updated build strings. 2017-01-13 00:01:15 +01:00
mlopez 2868ee3f2b Merge branch '1-acciones-masivas' into 'develop' 
Add selection modules in "Bulk operations: Add action alerts and delete action alerts".

#1

See merge request !15
 2017-01-12 15:53:16 +01:00
m-lopez-f 7403890e6c Add selection modules in bulk operations: Add action alerts. 2017-01-12 15:51:59 +01:00
daniel 8ae01d5ce6 Merge branch '141-consola-visual-metaconsola-vista-integria-4348-open' into 'develop' 
fixed visual errors in metaconsole



See merge request !12
 2017-01-12 10:57:13 +01:00
daniel 72f26697ed fixed visual errors in metaconsole 2017-01-12 10:53:08 +01:00
artica c0446bfde0 Auto-updated build strings. 2017-01-12 00:01:15 +01:00
daniel 061273a2b2 Merge branch '5-consola-visual-metaconsola-scroll-a-tope-integria-4346' into 'develop' 
fixed visual error visual console

Closes #5

See merge request !9
 2017-01-11 17:37:50 +01:00
daniel 21a133977c fixed visual error visual console 2017-01-11 17:31:11 +01:00
cesar991 2ccb1685a4 Add create log file in Services.py Policies.py Views.py and User.py tests files 2017-01-11 17:29:40 +01:00
mlopez 59bd635b3a Merge branch '4-vista-de-alertas-metaconsola' into 'develop' 
add lost option in call function in alert view in metaconsole.



See merge request !7
 2017-01-11 16:52:40 +01:00
m-lopez-f 8b4eedd630 add lost option in call function in alert view in metaconsole. 2017-01-11 16:51:16 +01:00
mlopez 256e81d086 Merge branch '2-el-campo-last-data-hacer-click-en-un-modulo-no-se-muestra-correctamente' into 'develop' 
Change visual of data in tree view, now show more data.

Closes #2

See merge request !4
 2017-01-11 13:14:39 +01:00
m-lopez-f eaacf46131 Change visual of data in tree view, now show more data. 2017-01-11 13:12:46 +01:00
Hirofumi Kosaka 2224478ed5 Fixed "pagination" had ignored trap_type filtering at SNMP Console. 2017-01-11 19:46:22 +09:00
artica 2d872bf2ee Auto-updated build strings. 2017-01-11 00:01:13 +01:00
cesar991 92f139d30d Add create log file in Network_components.py Netwrok_server.py and Planned_downtime.py 2017-01-10 17:59:54 +01:00
m-lopez-f 19a06f5828 Fixed lost filter in url pagination events in metaconsole. Ticket: #4243 
(cherry picked from commit c708991cb4)
 2017-01-10 09:55:59 +01:00
artica c0f46fbd2f Auto-updated build strings. 2017-01-10 00:01:13 +01:00
cesar991 140ff8f232 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-01-09 14:46:05 +01:00
cesar991 037478fd53 Add log file in Collections.py and Bulk_operations.py 2017-01-09 14:45:32 +01:00
Ramon Novoa b331867e94 Properly parse absolute incremental modules. 2017-01-09 14:45:23 +01:00