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

5042 Commits

Author SHA1 Message Date
artica
8a4e51bf1b Auto-updated build strings. 2021-07-03 01:00:31 +02:00
artica
1328b2055c Auto-updated build strings. 2021-07-02 01:00:32 +02:00
artica
911d9fe8fe Auto-updated build strings. 2021-07-01 01:00:09 +02:00
Daniel Rodriguez
b67e6a3f85 Merge branch 'ent-7480-dejar-fino-rpm-de-servidor-enterprise' into 'develop' 
Add a base pandora_ha.service.

See merge request artica/pandorafms!4252
 2021-06-30 08:04:44 +00:00
artica
7dc2245f2e Auto-updated build strings. 2021-06-30 01:00:32 +02:00
fbsanchez
074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
Daniel Rodriguez
35e889be15 Merge branch 'ent-4759-compatibilidad-ssl-y-certificados-conexiones-mysql' into 'develop' 
Add SSL support for database connections.

See merge request artica/pandorafms!4134
 2021-06-29 14:50:25 +00:00
fbsanchez
c64b972564 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 10:51:55 +02:00
artica
7f58a93bfd Auto-updated build strings. 2021-06-29 01:00:15 +02:00
Ramon Novoa
e073e634b9 Add a base pandora_ha.service. 2021-06-28 17:15:50 +02:00
fbsanchez
771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
artica
6fc94f3fad Auto-updated build strings. 2021-06-28 01:00:29 +02:00
artica
69c1a5fdad Auto-updated build strings. 2021-06-27 01:00:26 +02:00
artica
b7d956041d Auto-updated build strings. 2021-06-26 01:01:41 +02:00
fbsanchez
c0d56f8563 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-25 09:48:52 +02:00
artica
4438dad309 Auto-updated build strings. 2021-06-25 01:00:39 +02:00
fbsanchez
4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Luis
497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
artica
f18e8141fe Updated version and build strings. 2021-06-24 13:06:06 +02:00
Ramon Novoa
f9b090d857 Merge branch 'ent-5620-nuevo-compilador-para-backend' into master-alt 2021-06-24 12:58:44 +02:00
artica
86abd75206 Auto-updated build strings. 2021-06-24 01:00:51 +02:00
fbsanchez
2fe6092d37 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-23 20:08:59 +02:00
artica
e99183e1f0 Auto-updated build strings. 2021-06-23 01:00:51 +02:00
artica
17bae49b21 Auto-updated build strings. 2021-06-22 01:00:56 +02:00
fbsanchez
faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez
7b7265baa5 Merge branch 'ent-7179-cli-update-agent-duplica-referencias-ip' into 'develop' 
Fixed CLI update_agent adding duplicate agent address references

See merge request artica/pandorafms!4010
 2021-06-21 09:30:17 +00:00
artica
447d463518 Auto-updated build strings. 2021-06-21 01:00:36 +02:00
artica
dd5e7e550d Auto-updated build strings. 2021-06-20 01:00:37 +02:00
artica
682a977ef1 Auto-updated build strings. 2021-06-19 01:00:49 +02:00
Daniel Barbero Martin
1e183c2b60 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-18 08:49:57 +02:00
artica
0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Daniel Barbero Martin
50c7394e7d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-17 08:23:46 +02:00
artica
e5cbcd070b Auto-updated build strings. 2021-06-17 01:00:42 +02:00
Daniel Barbero Martin
841842da59 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/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
artica
90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Rodriguez
9fcde88ebf Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop' 
pandora_ha enterprise components fixed

See merge request artica/pandorafms!4202
 2021-06-15 13:11:21 +00:00
Daniel Barbero Martin
9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
artica
2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
fbsanchez
7e5a082e22 pandora_ha enterprise components fixed 2021-06-14 19:29:24 +02:00
fbsanchez
04a9b10904 Pandora HA verified 2021-06-14 19:18:45 +02:00
fbsanchez
94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
Daniel Rodriguez
08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop' 
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
 2021-06-14 11:56:43 +00:00
fbsanchez
cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
Daniel Barbero Martin
a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
artica
595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica
e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica
8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
Daniel Barbero Martin
75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica
876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez
ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00