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

13188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 c708991cb4400f9376832409492a6bf4d9e9c305)
 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
cesar991
38a8eeb437 Add log file in ACL.py and Alerts.py 2017-01-09 12:17:51 +01:00
m-lopez-f
9b02510599 Fixed problems with wizard login when cancel wizard. Ticket: #4246 
(cherry picked from commit f11e78cc3a0ccd8aea6f014952afd07198b27af0)
 2017-01-09 09:10:13 +01:00
artica
1abf229079 Auto-updated build strings. 2017-01-09 00:01:12 +01:00
artica
403e5f6678 Auto-updated build strings. 2017-01-08 00:01:10 +01:00
artica
c5074d72aa Auto-updated build strings. 2017-01-07 00:01:12 +01:00
Junichi Satoh
009b026a82 Added description for _agentcustomfield_n_ 2017-01-06 11:22:43 +09:00
Junichi Satoh
e82f31dc02 Improved to be able to pass agent's custom fields to plugin parameters. 2017-01-06 10:56:18 +09:00
artica
71b1322b76 Auto-updated build strings. 2017-01-06 00:01:13 +01:00
enriquecd
356944f8f2 Create and update buttons in CONFIGURE EVENT RULE positioned wrong #130 2017-01-05 16:27:45 +01:00
daniel
e779d4ff0b fixed error metaconsole connection macros 
(cherry picked from commit e244d766a448ff6d7792e8a26542f67b1e278f49)
 2017-01-05 13:55:23 +01:00
artica
d9e51bde9a Auto-updated build strings. 2017-01-05 00:01:14 +01:00
daniel
00a8bdb895 fixed reports alerts pdf view 
(cherry picked from commit 07a8109f7ac958d0abaf0d421fd99d6f2106be46)
 2017-01-04 19:42:54 +01:00
daniel
d44dc61758 fixed minor error order by desc event list 
(cherry picked from commit 9a48e5220812c7a17d86c82ad193e60ccdab3b03)
 2017-01-04 14:34:35 +01:00
artica
013c40fed4 Auto-updated build strings. 2017-01-04 00:01:13 +01:00
daniel
4afaf5190a fixed errors in reports alerts 
(cherry picked from commit 85dddf0b56f2816451f690481308717b2568b3e0)
 2017-01-03 19:33:11 +01:00