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

5792 Commits

Author SHA1 Message Date
Daniel Barbero Martin
8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
artica
bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica
656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica
2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
Daniel Barbero Martin
ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
artica
8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Barbero Martin
030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica
e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
Daniel Barbero Martin
18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica
2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin
ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica
b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00
Daniel Barbero Martin
33618af381 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-31 08:40:09 +02:00
artica
ff3eb72420 Auto-updated build strings. 2021-05-31 01:00:34 +02:00
artica
20d3399d39 Auto-updated build strings. 2021-05-30 01:00:20 +02:00
artica
ec8ffea249 Auto-updated build strings. 2021-05-29 01:00:10 +02:00
Daniel Barbero Martin
8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
artica
059b14dbf6 Auto-updated build strings. 2021-05-28 01:00:43 +02:00
Daniel Barbero Martin
a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
artica
9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00
Daniel Barbero Martin
d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
artica
22a9043378 Auto-updated build strings. 2021-05-26 01:00:45 +02:00
Daniel Barbero Martin
933f679d27 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-25 08:51:48 +02:00
artica
f3d6dafad2 Auto-updated build strings. 2021-05-25 01:00:38 +02:00
Daniel Barbero Martin
337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
artica
3388bfa699 Auto-updated build strings. 2021-05-24 01:00:35 +02:00
artica
5366b40ac3 Auto-updated build strings. 2021-05-23 01:00:27 +02:00
artica
01e811254e Auto-updated build strings. 2021-05-22 01:00:37 +02:00
Daniel Barbero Martin
5bc6fa9394 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-21 08:35:49 +02:00
artica
f86c1c50c6 Auto-updated build strings. 2021-05-21 01:01:12 +02:00
Daniel Barbero Martin
73454dd4ea Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-20 08:21:31 +02:00
artica
63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Barbero Martin
3eba993c5c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-19 08:36:26 +02:00
artica
f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
Daniel Barbero Martin
a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
artica
739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Maya
fd372d53d1 Ent 6978 umbrales inversos fallan 2021-05-17 13:00:59 +00:00
Ramon Novoa
ecdd28fe0a Do not enforce SSL. 
Enforcing SSL (mysql_ssl_optional=0) does not work with the version of
DBD::mysql used to generate Pandora FMS binaries.
 2021-05-17 13:37:36 +02:00
Ramon Novoa
c3d81b7d4b Revert "Do not enforce SSL." 
This reverts commit 6b0aa45ebc77be5dd54524e50c3c215c1729b030.
 2021-05-17 13:36:58 +02:00
Ramon Novoa
6b0aa45ebc Do not enforce SSL. 
Enforcing SSL (mysql_ssl_optional=0) does not work with the version of
DBD::mysql used to generate Pandora FMS binaries.
 2021-05-17 13:21:16 +02:00
Ramon Novoa
439bc2405c Add SSL support for database connections. 
Ref. pandora_enterprise#4759.
 2021-05-17 13:12:42 +02:00
Daniel Barbero Martin
1526dac01d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-17 08:35:52 +02:00
artica
d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica
8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica
bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
fbsanchez
b3ac981681 Gracefully stop pandorafms threads 2021-05-14 12:43:18 +02:00
Daniel Barbero Martin
3f509ebd09 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-14 08:36:58 +02:00
artica
9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
Daniel Barbero Martin
5b376568a4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/47.sql
 2021-05-13 08:25:59 +02:00
artica
afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00