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

13626 Commits

Author SHA1 Message Date
daniel a5055ec27a fixed error in ldap create new users 2017-02-21 14:04:53 +01:00
Alejandro Gallardo Escobar 0daaa9651e Changed the agent name by its alias 2017-02-21 14:04:43 +01:00
daniel df0a6086c4 fixed minor error in report availavility 2017-02-21 13:56:00 +01:00
m-lopez-f 2abff60380 Fixed code 2017-02-21 13:30:53 +01:00
Enrique Camargo 31d7091ce7 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop' 
Resolve "Meter un salto de linea entre las opciones "modules first" y "agents firsts" de forma que se anineen bien"

See merge request !180
 2017-02-21 13:06:56 +01:00
m-lopez-f a242395af0 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:01:34 +01:00
enriquecd 26627e0613 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' of https://192.168.50.5:8081/artica/pandorafms into 62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien 2017-02-21 12:54:48 +01:00
enriquecd 5dbca6eeca Insert newline between module first and agent first in module massive op /2 - #62 2017-02-21 12:52:48 +01:00
Enrique Camargo 32806a5538 Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas' into 'develop' 
Improve custom graph interface - #66

See merge request !179
 2017-02-21 12:39:01 +01:00
enriquecd 48a04d6c47 Improve custom graph interface - #66 2017-02-21 12:18:18 +01:00
artu30 c9e89921d2 Merge branch 'feature/log_in_reports' into 'develop' 
Feature/log in reports

See merge request !178
 2017-02-21 12:15:34 +01:00
m-lopez-f 3b97095fda Fixed problems with check discard unknown events in module configuration. Integria: #4242, Gitlab: #324 2017-02-21 12:09:07 +01:00
Arturo Gonzalez 5190228010 Merge branch 'develop' into feature/log_in_reports 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting_html.php
 2017-02-21 12:06:24 +01:00
m-lopez-f 09e1b8ce1c Fixed problems with src images in visual consoles. Gitlab: #255 2017-02-21 10:28:19 +01:00
fermin 59135bb1b1 Merge branch '65-la-version-del-cliente-de-ehorus-es-vieja-hablar-con-fermin' into 'develop' 
Updated eHorus client

See merge request !176
 2017-02-21 10:23:29 +01:00
Alejandro Gallardo Escobar e7df5ebacb Merge branch 'develop' into feature/alias_friendly_name 2017-02-21 10:12:35 +01:00
m-lopez-f 8a1bdf5017 Fixed problems with login that this user not have a administration permissions. Gitlab #323 2017-02-21 09:47:42 +01:00
artica 028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00
Alejandro Gallardo Escobar 51955d5bea Changed the agent name by its alias 2017-02-20 20:02:39 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Alejandro Gallardo Escobar e53d75d98d Added a function to get the agent alias using a module id 2017-02-20 18:50:28 +01:00
fermin831 7592bce0a9 Updated eHorus client 2017-02-20 18:25:46 +01:00
Alejandro Gallardo Escobar 354377a56a Changed the agent name by its alias 2017-02-20 17:28:38 +01:00
daniel 5c32d0ba95 Merge branch '267-vista-agente-modulo-con-filtros-no-visualiza-datos-open' into 'develop' 
fixed errors in agent/module

See merge request !175
 2017-02-20 17:26:14 +01:00
Arturo Gonzalez 03f2250ffa Removed weird alerts in networkmap. 2017-02-20 16:35:32 +01:00
daniel 65047c23a5 fixed errors in agent/module 2017-02-20 16:16:53 +01:00
Alejandro Gallardo Escobar 3715b9da5d Merge branch 'feature/alias_friendly_name' of https://brutus.artica.lan:8081/artica/pandorafms into feature/alias_friendly_name 2017-02-20 15:33:02 +01:00
Alejandro Gallardo Escobar 550a00cec7 Changed the agent name by its alias 2017-02-20 15:32:49 +01:00
Alejandro Gallardo Escobar c49df7c60d Added a function to get the agent alias 2017-02-20 15:32:10 +01:00
Ramon Novoa 89b7f516c7 Generate random agent names by default. 2017-02-20 15:23:18 +01:00
Ramon Novoa ce451154db Add an alias to the self-monitoring XML. 2017-02-20 15:18:39 +01:00
Arturo Gonzalez 4a6cdf822d Fixed modules lejend in agent view. Ticket #294 2017-02-20 15:02:01 +01:00
m-lopez-f 2c1e43a477 Re-fixed problems with agents name in visual consoles 2017-02-20 14:38:58 +01:00
m-lopez-f ca8ec686ac Fixed problems with upload images and show images in created visual consoles. Gitlab: #314 2017-02-20 13:54:34 +01:00
m-lopez-f 3ffe8ae49f Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-20 12:56:38 +01:00
m-lopez-f 9a3e693137 Fixed problems with change size of visual console when this size is very small. 
And add message when this size is very small.
 2017-02-20 12:56:29 +01:00
Arturo Gonzalez e8a765876b Fixed multiple delete button and form structure in messages section. Ticket #301 2017-02-20 12:53:53 +01:00
Arturo Gonzalez 651e7ea8e6 Changed migration file name. Ticket #297 2017-02-20 12:35:52 +01:00
Enrique Camargo 4a5a9a5eef Merge branch '40-ancho-de-los-combobox-integria-4407-2' into 'develop' 
Not limit 300px agent and module comboboxes in graph builder - #40

See merge request !173
 2017-02-20 12:31:58 +01:00
enriquecd b915a1034b Not limit 300px agent and module comboboxes in graph builder - #40 2017-02-20 12:06:30 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
daniel 4b8808c93d Merge branch '64-detalles-visuales-a-mejorar-sobre-la-interfaz-de-las-graficas' into 'develop' 
fixed errors in graphs

See merge request !172
 2017-02-20 11:23:57 +01:00
Arturo Gonzalez 58ea653e05 Fixed multiple delete in events filter. Ticket #303 2017-02-20 11:20:59 +01:00
daniel 40ee2cce0a fixed errors in graphs 2017-02-20 11:13:47 +01:00
Arturo Gonzalez f9eb762951 Changed license url and update url. Ticket #299 2017-02-20 10:32:07 +01:00
Arturo Gonzalez 89f0ec658c Added data precision to events. Ticket #288 2017-02-20 09:50:57 +01:00
artica f7fd67ca79 Auto-updated build strings. 2017-02-20 00:01:14 +01:00
artica 2d26efe942 Auto-updated build strings. 2017-02-19 00:01:14 +01:00
artica 1021655e43 Auto-updated build strings. 2017-02-18 00:01:16 +01:00
m-lopez-f e3c3fafa43 Fixed problems with agent name in visual consoles. Gitlab #257 2017-02-17 15:39:28 +01:00