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

18018 Commits

Author SHA1 Message Date
fbsanchez b0920d93af Merge branch 'ent-4772-omnishell' into ent-EDF 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-13 18:15:19 +01:00
fbsanchez 78443a029d Omnishell rc1 2019-11-13 18:10:16 +01:00
fbsanchez 1729b3a2c0 Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-11-13 17:43:01 +01:00
fbsanchez 0e2a3d0f47 minor style fix after feedback cleanup 2019-11-13 17:42:14 +01:00
fbsanchez 65d02d4529 Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms 2019-11-13 17:40:45 +01:00
fbsanchez 345eb48fd7 save the green lines 2019-11-13 17:38:48 +01:00
fbsanchez 83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
fbsanchez 670df456f5 wip results omnishell 2019-11-13 16:39:24 +01:00
fbsanchez 672ce6db22 first task omnishell and minor style checks 2019-11-13 15:24:44 +01:00
fbsanchez 9b1a3a9cd1 Firts_task => first_task 2019-11-13 14:58:53 +01:00
fbsanchez 6677b6a5ab hide report in welcomewindow if not enterprise customer 2019-11-13 14:32:34 +01:00
Daniel Rodriguez f844c660af Merge branch 'ent-4766-feedback-de-ayudas' into 'develop' 
add feedback

See merge request artica/pandorafms!2813
 2019-11-13 13:43:08 +01:00
fbsanchez 19897c3894 Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl 2019-11-13 13:34:35 +01:00
Daniel Barbero Martin 5f8ec8f89c fixed errors 2019-11-13 13:29:09 +01:00
fbsanchez 875d4430a7 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-13 12:21:42 +01:00
fbsanchez b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-13 12:20:29 +01:00
Daniel Barbero Martin 7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
 2019-11-13 12:12:17 +01:00
Daniel Rodriguez d4c4b3c2d8 Merge branch 'ent-4664-Bug-Automatically-combined-graph' into 'develop' 
Ent 4664 bug automatically combined graph

See merge request artica/pandorafms!2776
 2019-11-13 10:01:19 +01:00
artica c19d760bdb Auto-updated build strings. 2019-11-13 00:01:12 +01:00
fbsanchez d1fbd36a97 WIP omnishell 2019-11-12 19:31:38 +01:00
Tatiana Llorente 484ec9ea60 Ent 4845 revision de skins 2019-11-12 18:10:58 +01:00
Daniel Rodriguez 2f0b646cd8 Merge branch 'ent-4463-Histórico-IP' into 'develop' 
Fixed scroll in other ip addres in agent view - #4463

See merge request artica/pandorafms!2641
 2019-11-12 18:10:16 +01:00
Daniel Rodriguez 073ca73b2a Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop' 
Added token in visual styles to change the font size in items of reports - #4670

See merge request artica/pandorafms!2798
 2019-11-12 18:09:39 +01:00
Daniel Barbero Martin fa6bc254a1 Fixed errors 2019-11-12 16:22:58 +01:00
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
 2019-11-12 14:17:45 +01:00
fbsanchez 0022408538 Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 
Conflicts:
	pandora_console/extensions/quick_shell.php
 2019-11-12 13:25:30 +01:00
fbsanchez 1a7165f751 allow to remove user/pass from quick_shell configuration 2019-11-12 13:19:03 +01:00
marcos ec05b52fb4 update omnishell.css 2019-11-12 10:08:35 +01:00
artica 2ee4f9d88f Auto-updated build strings. 2019-11-12 00:01:09 +01:00
fbsanchez a5a54e215d fix extension agent_modules... 2019-11-11 16:42:54 +01:00
fbsanchez d1f9a86622 Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 15:36:47 +01:00
fbsanchez 01de54a220 other icon 2019-11-11 15:36:38 +01:00
fbsanchez 1637b09b1e Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 15:23:35 +01:00
fbsanchez 946ef2fae4 icon review tick badge 2019-11-11 15:23:23 +01:00
fbsanchez 53954ec853 Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 14:26:23 +01:00
fbsanchez 65f5223698 validation alerts 2019-11-11 14:26:04 +01:00
fbsanchez 0c5af7ea24 minor fixes 2019-11-11 13:46:42 +01:00
fbsanchez 0b610cd8ba Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 13:39:08 +01:00
fbsanchez 430af38fa6 minor fixes in flow control 2019-11-11 13:38:27 +01:00
Luis f57f87b50b Ent 4834 pandora custom logo text on conf 2019-11-11 13:33:37 +01:00
artica c390befc2a Auto-updated build strings. 2019-11-11 00:01:07 +01:00
artica 7e275febcd Auto-updated build strings. 2019-11-10 00:01:07 +01:00
artica cba38680bd Auto-updated build strings. 2019-11-09 00:01:09 +01:00
fbsanchez ec2d46c299 Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 2019-11-08 11:09:11 +01:00
fbsanchez ec72820c88 Icon adjustment 2019-11-08 11:08:43 +01:00
artica c8b39740a9 Auto-updated build strings. 2019-11-08 11:05:59 +01:00
Alejandro Fraguas fad8d88087 Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop' 
change execution permissions to pandora_websocket_engine rpm|deb files

See merge request artica/pandorafms!2870
 2019-11-08 11:00:46 +01:00
fbsanchez 6543756baf change execution permissions to pandora_websocket_engine rpm|deb files 2019-11-08 09:49:09 +01:00
Daniel Barbero Martin c78e3f4184 fixed minor error 2019-11-08 08:55:58 +01:00
fbsanchez d9d8cbfd35 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-07 19:43:18 +01:00