tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-22 02:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,526 Commits 34 Branches 30 Tags
Commit Graph

15166 Commits

Author SHA1 Message Date
fbsanchez
55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
fbsanchez
38a6d65f60 Merge remote-tracking branch 'origin/develop' into ent-2685-7938-aadcm-dashboards-en-metaconsola 2021-04-06 11:01:20 +02:00
Jose Gonzalez
a9a1a7ccb8 Added function for safe html symbols tag 2021-04-06 10:36:43 +02:00
Daniel Barbero Martin
74afdf9510 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-06 08:03:40 +02:00
artica
247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
José González
bfaf8a8794 WIP: Backup upload 2021-04-05 17:55:46 +02:00
Daniel Barbero Martin
846b601a3c WIP command center 2021-04-05 17:32:19 +02:00
marcos
78ce8660c9 fixed visual error 2021-04-05 17:27:40 +02:00
marcos
ac286a438c set labels white color on module interval svg 2021-04-05 11:41:36 +02:00
Daniel Barbero Martin
0a106c2a6e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-05 08:20:38 +02:00
artica
31a8fd6c55 Auto-updated build strings. 2021-04-05 01:00:42 +02:00
artica
4811e45bf2 Auto-updated build strings. 2021-04-04 01:00:37 +02:00
artica
95e437252b Auto-updated build strings. 2021-04-03 01:00:36 +02:00
artica
2f4eaacb6a Auto-updated build strings. 2021-04-02 01:00:33 +02:00
artica
10ea68f33f Auto-updated build strings. 2021-04-01 01:00:11 +02:00
Daniel Barbero Martin
9364428346 WIP command center 2021-03-31 15:50:41 +02:00
fbsanchez
700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
Jose Gonzalez
5eeb3423f0 Solve merge 2021-03-31 10:29:57 +02:00
Daniel Barbero Martin
6ac13adc39 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-31 08:31:12 +02:00
artica
321fc8aa05 Auto-updated build strings. 2021-03-31 01:00:44 +02:00
Daniel Barbero Martin
01f801cb4f fixed minor error 2021-03-30 17:49:15 +02:00
Jose Gonzalez
a8e3c10846 Added comments header and improve code 2021-03-30 16:31:45 +02:00
Daniel Maya
f004cfc276 trace removed 2021-03-30 16:20:46 +02:00
Daniel Rodriguez
8a62fa67ad Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' 
Ent 7171 iconos poco visibles en monitor detail black theme

See merge request artica/pandorafms!3929
 2021-03-30 09:51:04 +00:00
marcos
063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
Calvo
245286330c Fixed treeview filter by module status 2021-03-30 08:28:10 +02:00
Daniel Barbero Martin
4bcc566ee1 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-30 08:28:05 +02:00
artica
8b92c0ffc1 Auto-updated build strings. 2021-03-30 01:00:51 +02:00
Daniel Barbero Martin
264c6d515e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-29 17:47:44 +02:00
marcos
5d38740630 resolved error with sql message error external tools2 2021-03-29 16:54:41 +02:00
artica
96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
Jose Gonzalez
5e125a33c3 Fixed lints 2021-03-29 14:42:51 +02:00
Jose Gonzalez
001b547fb0 Fixed issue with duplicate web server modules 2021-03-29 14:07:57 +02:00
Daniel Rodriguez
4fa790dd7f Merge branch 'ent-7202-fallos-visuales-discovery' into 'develop' 
Ent 7202 fallos visuales discovery

See merge request artica/pandorafms!3953
 2021-03-29 09:49:31 +00:00
Calvo
bc7584f259 Fixed api add user profile with group all 2021-03-29 10:51:02 +02:00
marcos
1f89a0d293 fixed visual error 2021-03-29 09:58:23 +02:00
Daniel Rodriguez
d01c3e1c92 Merge branch 'ent-7215-fallos-vista-eventos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3961
 2021-03-29 07:23:03 +00:00
Marcos Alconada
9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
marcos
3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
Daniel Rodriguez
04483fe9f3 Merge branch 'ent-7210-Bug-en-token-limit-de-widget-List-of-last-events' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3958
 2021-03-29 07:15:32 +00:00
Daniel Barbero Martin
fe87e827a9 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-29 08:17:35 +02:00
marcos
88f3ce9b90 fixed lost icons 2021-03-29 08:12:54 +02:00
artica
3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica
cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica
e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
Daniel Rodriguez
c5d6daa018 Merge branch 'ent-7207-error-visual-en-relaciones-de-network-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3968
 2021-03-26 13:41:31 +00:00
Marcos Alconada
9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
marcos
89ba8b43fb fixed visual error 2021-03-26 13:58:13 +01:00
fbsanchez
a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect 
Conflicts:
	pandora_console/godmode/users/user_list.php
 2021-03-26 13:52:01 +01:00
Daniel Rodriguez
1f74bd071c Merge branch 'ent-7221-icono-lupa-cambiado-por-ojo' into 'develop' 
Substituted eye with operation (magnifier) icon on credential store and tasklist

See merge request artica/pandorafms!3964
 2021-03-26 12:05:29 +00:00