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
28,300 Commits 34 Branches 30 Tags
Commit Graph

28300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artica
0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Ramon Novoa
8d5acc0d74 Improvements to the SNMP Console. 
Add several improvements to the SNMP Console:
- Source-based locking.
- Server-specific 'threshold'.
- Other small improvements.

Ref. pandora_enterprise#7635.
 2021-06-17 18:59:10 +02:00
artica
5857c047e2 Merge remote-tracking branch 'origin/develop' 2021-06-17 18:21:00 +02:00
Daniel Barbero Martin
6366040ec2 Wip command center, check versions php.ini 2021-06-17 17:09:44 +02:00
Rafael Ameijeiras
e56e18d49d Merge branch 'ent-7714-update-memory_limit' into 'develop' 
change memory_limit to 800M for new update manager

See merge request artica/pandorafms!4219
 2021-06-17 13:11:00 +00:00
rafael.ameijeiras
84f1710a87 change memory_limit to 800M for new update manager 2021-06-17 15:06:16 +02:00
marcos
56b6418716 add not condition filter 2021-06-17 15:04:21 +02:00
marcos
dff7220be9 add not condition filter 2021-06-17 14:59:43 +02:00
fbsanchez
1401f30e84 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 2021-06-17 14:49:25 +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
fbsanchez
ae448e6eb8 Some fixes 2021-06-16 20:34:29 +02:00
fbsanchez
d2710b2e66 Clean components when removing plugin (server) 2021-06-16 19:39:25 +02:00
Daniel Barbero Martin
452d5d0b73 Wip command center, error merge 2021-06-16 19:37:09 +02:00
fbsanchez
81254cf3fb WIP Plugins sync 2021-06-16 18:18:38 +02:00
fbsanchez
b032beb559 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 2021-06-16 17:27:06 +02:00
Daniel Barbero Martin
c6877154fb Wip command center, Plugins in meta 2021-06-16 17:26:19 +02:00
José González
09d5657650 Solve typo 2021-06-16 16:36:14 +02:00
Calvo
06f3b0ea36 Fixed SNMP interface wizard modules with special chars 2021-06-16 16:30:45 +02:00
fbsanchez
b701b2be32 Plugin sync 2021-06-16 15:53:05 +02:00
José González
00d4f0c57d Clean code and fix issue with lateral main menu 2021-06-16 15:29:28 +02:00
artica
de5bf4421b Merge remote-tracking branch 'origin/develop' 2021-06-16 14:52:46 +02:00
Daniel Rodriguez
02dad9a27d Merge branch 'ent-7705-error-500-en-vista-de-licence-management' into 'develop' 
Minor CDE (bonus)

See merge request artica/pandorafms!4211
 2021-06-16 12:38:44 +00:00
marcos
493047ae40 fixed visual error 2021-06-16 14:17:45 +02:00
fbsanchez
b8d3d962a0 Minor CDE 2021-06-16 12:44:03 +02:00
fbsanchez
9ed895d457 Fixes in pie coauth: daniel 2021-06-16 11:41:57 +02:00
marcos
716c82bd30 fixed error with pagination user filter 2021-06-16 10:41:12 +02:00
José González
39f3e1987e Fixed bye bye 2021-06-16 10:15:53 +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 Barbero Martin
5b1498e08c Wip command center, Plugins in meta 2021-06-15 17:40:48 +02:00
Daniel Barbero Martin
64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
Daniel Maya
38ad3574f3 scape meta characters 2021-06-15 15:57:13 +02:00
artica
b4f7efbf60 Merge remote-tracking branch 'origin/develop' 2021-06-15 15:13:48 +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 Rodriguez
b64f15e4d7 Merge branch 'ent-7703-error-en-update-manager-online-en-open' into 'develop' 
Avoid using old data when parsing progress

See merge request artica/pandorafms!4206
 2021-06-15 12:55:26 +00:00
alejandro.campos@artica.es
e8b62561b7 fixed entities 2021-06-15 14:53:00 +02:00
fbsanchez
04e2919497 Avoid using old data when parsing progress 2021-06-15 14:43:11 +02:00
fbsanchez
c009451d62 Fulfill all variables FX from SNMPTRAP alerts 2021-06-15 13:06:23 +02:00
fbsanchez
14495ebdc3 Current package updates 2021-06-15 11:06:46 +02:00
Daniel Barbero Martin
9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
Daniel Barbero Martin
f9bbc132a6 Wip command center, collections merge restore 2021-06-15 10:35:34 +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
artica
8214f1032c Merge remote-tracking branch 'origin/develop' 2021-06-14 16:33:38 +02:00
Daniel Rodriguez
b110fde614 Merge branch 'ent-6280-firmar-instalador-de-agente-macos' into 'develop' 
Added signing and notarizing process

See merge request artica/pandorafms!4156
 2021-06-14 14:30:46 +00:00
Daniel Rodriguez
31871bb792 Merge branch 'ent-7687-modificar-image-um-2' into 'develop' 
new background image UM

See merge request artica/pandorafms!4201
 2021-06-14 14:18:10 +00:00
marcos
2e5073e1ba new background image UM 2021-06-14 16:12:48 +02:00