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

23077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fbsanchez
9cea131378 WIP CorrelatedAlerts 2019-11-19 23:35:29 +01:00
fbsanchez
471389a72a Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl' 
Conflicts:
   pandora_console/extras/mr/33.sql
 2019-11-19 14:11:38 +01:00
Daniel Barbero Martin
1b5dcc3e28 Fixed errors in remote command 2019-11-19 12:35:52 +01:00
Alejandro Fraguas
aa4ae996d2 Merge branch 'ent-4986-La-vista-Module-Groups-se-ve-con-cualquier-grupo-asignado-al-usuario' into 'develop' 
Ent 4986 la vista module groups se ve con cualquier grupo asignado al usuario

See merge request artica/pandorafms!2894
 2019-11-19 12:22:01 +01:00
fbsanchez
be1e4324d2 missed port 2019-11-19 12:02:10 +01:00
fbsanchez
0fd95647ea log_window 2019-11-19 11:56:11 +01:00
artica
04076a04b1 Auto-updated build strings. 2019-11-19 00:01:12 +01:00
fbsanchez
83e7d5a701 Minor fixes 2019-11-18 19:32:57 +01:00
marcos
76b7e52107 update branch 2019-11-18 18:46:57 +01:00
Tatiana Llorente
15aaf0cae6 Added acl checks to module groups view 2019-11-18 17:18:40 +01:00
alejandro-campos
070fe32d1e Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7 2019-11-18 16:27:12 +01:00
fbsanchez
6a3db40d56 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-18 16:12:01 +01:00
Daniel Barbero
8811095a3e WIP ALerts 2019-11-18 15:25:35 +01:00
Daniel Barbero
79f5e879cc WIP Alerts 2019-11-18 13:37:10 +01:00
fbsanchez
443eb1168c Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 2019-11-18 12:48:31 +01:00
fbsanchez
6126503285 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-18 12:30:51 +01:00
fbsanchez
61ccd5bdbc help_link omnishell 2019-11-18 12:30:12 +01:00
Alejandro Fraguas
0c30047da5 Merge branch 'ent-4930-create_event-no-anade-comentarios-evento' into 'develop' 
Solution for lost comments in the events section modal window

See merge request artica/pandorafms!2884
 2019-11-18 12:29:32 +01:00
fbsanchez
a5ab29e90e omnishell retries 2019-11-18 11:22:54 +01:00
fbsanchez
85ca03b054 fix- removed traces 2019-11-18 11:07:04 +01:00
fbsanchez
99b0714850 PWE keep db connection up 2019-11-18 11:06:27 +01:00
José González
4cddf5a31a Merge branch 'develop' into 'ent-4930-create_event-no-anade-comentarios-evento' 
# Conflicts:
#   pandora_console/include/functions_events.php
 2019-11-18 11:02:31 +01:00
Jose Gonzalez
93200e2af1 Changed definition of link in group icon 2019-11-18 10:51:09 +01:00
fbsanchez
1cacbbc08f fix tools 2019-11-18 10:40:02 +01:00
fbsanchez
4a05cbb544 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 2019-11-18 10:05:47 +01:00
fbsanchez
6fb2e3af81 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-18 10:05:40 +01:00
fbsanchez
13dd2ebc18 Merge branch 'ent-4226-mejoras-plugin-sap' of brutus.artica.lan:artica/pandorafms into ent-4226-mejoras-plugin-sap 2019-11-18 10:04:52 +01:00
fbsanchez
2f80759227 minor updates pandora sap 2019-11-18 10:04:47 +01:00
fbsanchez
61eb7f0635 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 2019-11-18 09:55:15 +01:00
artica
73389a7164 Auto-updated build strings. 2019-11-18 00:01:07 +01:00
artica
39b449be9c Auto-updated build strings. 2019-11-17 00:01:07 +01:00
artica
727b3bde5d Auto-updated build strings. 2019-11-16 00:01:11 +01:00
fbsanchez
46c42ef8a4 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 16:52:26 +01:00
fbsanchez
84c6640032 minor style fix 2019-11-15 16:51:53 +01:00
fbsanchez
89e014a9e4 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 16:37:01 +01:00
fbsanchez
17918cd5c6 minor fix omnishell functionality - unix agent 2019-11-15 16:36:46 +01:00
fbsanchez
32466a5f0f Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-15 16:36:06 +01:00
fbsanchez
495fdfc6f0 minor fix omnishell functionality - unix agent 2019-11-15 16:35:25 +01:00
marcos
91f28384b8 changed sap icon button 2019-11-15 16:22:30 +01:00
Alejandro Fraguas
7e8f22b1de Merge branch 'ent-4936-Comillas-dobles-en-comentarios-de-eventos-no-funcionan' into 'develop' 
Ent 4936 comillas dobles en comentarios de eventos no funcionan

See merge request artica/pandorafms!2869
 2019-11-15 13:20:13 +01:00
fbsanchez
9440570548 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 13:08:09 +01:00
fbsanchez
e561b1f906 omnishell multiselect 2019-11-15 13:07:23 +01:00
fbsanchez
990ad339d3 db schema 2019-11-15 09:45:49 +01:00
artica
378192a449 Auto-updated build strings. 2019-11-15 00:01:12 +01:00
fbsanchez
8edbb74354 discovery help link and minor fixes 2019-11-14 21:52:02 +01:00
fbsanchez
f69b86663a Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/godmode/wizards/Wizard.main.php
 2019-11-14 21:40:35 +01:00
fbsanchez
cb43d06c13 minor fix 2019-11-14 21:31:07 +01:00
fbsanchez
dcd9467bfb fix symbols in gotty credentials 2019-11-14 21:10:46 +01:00
fbsanchez
547e0c4364 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-14 20:58:16 +01:00
fbsanchez
546b8dc448 omnishell minor changes 2019-11-14 20:55:55 +01:00