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

26177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jose Gonzalez
c3044b5d13 WIP: Backup upload 2020-11-12 17:15:33 +01:00
fbsanchez
14db9c63c6 Sticky lines (VC) 2020-11-12 16:57:14 +01:00
Jose Gonzalez
5e8e37494d WIP: Backup upload 2020-11-12 16:55:31 +01:00
Rafael Ameijeiras
dda7912511 Merge branch 'ent-6732-change-docker-compose' into 'develop' 
change compose to use latest

See merge request artica/pandorafms!3609
 2020-11-12 15:45:03 +01:00
rafael
023c72b44b change compose to use latest 2020-11-12 15:42:43 +01:00
Daniel Maya
0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
marcos
915c039fcd fixed sql error with secundary groups ZOS 2020-11-12 12:13:57 +01:00
artica
834b102ad2 Auto-updated build strings. 2020-11-12 01:00:32 +01:00
alejandro-campos
2632256c10 fixed agent creation with unique ip condition 2020-11-11 17:45:21 +01:00
Luis Calvo
78df603c07 Fixed alert count bug on tactical view 2020-11-11 17:07:03 +01:00
alejandro-campos
c6cf4ab9ee fixed query 2020-11-11 16:25:58 +01:00
fbsanchez
b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00
alejandro-campos
fc429efce2 fixed wrong error message: recon task is not necessarily linked to script 2020-11-11 09:52:15 +01:00
artica
33fbdd1819 Auto-updated build strings. 2020-11-11 01:00:32 +01:00
fbsanchez
edb0ebd508 minor changes 2020-11-10 19:31:14 +01:00
fbsanchez
7ea84a4384 added tentacle common dir, TODO clean copies, group in CICD tasks 2020-11-10 19:24:08 +01:00
fbsanchez
b8fde5e8f5 Tools (trim) added 2020-11-10 17:56:56 +01:00
Jose Gonzalez
d172aad1d2 Fix error with category 2020-11-10 16:51:28 +01:00
Jose Gonzalez
702b5025e9 Ended development 2020-11-10 16:48:09 +01:00
Daniel Rodriguez
bc8d769c73 Merge branch 'ent-6706-Faltan-varias-ventanas-modales-al-acceder-por-primera-vez-a-la-consola' into 'develop' 
Ent 6706 faltan varias ventanas modales al acceder por primera vez a la consola

See merge request artica/pandorafms!3598
 2020-11-10 15:53:36 +01:00
Daniel Maya
ac762469b6 Added trim in search 2020-11-10 13:54:15 +01:00
Jose Gonzalez
665deaa5c8 WIP: Backup upload 2020-11-10 12:23:50 +01:00
Daniel Maya
ea0e229951 Fixed license expired and license trial 2020-11-10 12:10:25 +01:00
Jose Gonzalez
f501d19539 Solved issue with main view 2020-11-10 10:58:06 +01:00
artica
2046689b00 Auto-updated build strings. 2020-11-10 01:01:19 +01:00
artica
767397ceb6 Auto-updated build strings. 2020-11-09 01:00:33 +01:00
artica
4887dc3e3d Auto-updated build strings. 2020-11-08 01:00:36 +01:00
artica
5010cd7313 Auto-updated build strings. 2020-11-07 01:00:30 +01:00
fbsanchez
067a19f69b WIP sticky lines 2020-11-06 20:37:37 +01:00
Jose Gonzalez
8a6a11fee6 WIP: Backup upload 2020-11-06 12:38:35 +01:00
Jose Gonzalez
22ae632850 Added html_print_anchor function for link tags 2020-11-06 12:38:06 +01:00
artica
2cbe4643bc Auto-updated build strings. 2020-11-06 01:00:35 +01:00
Luis Calvo
64bd9bfc79 Fixed safe input on cli delete_group 2020-11-05 16:14:06 +01:00
Luis Calvo
6337fd3667 Fixed CLI update_group 2020-11-05 14:31:26 +01:00
alejandro-campos
d75bb46f34 changed action/alert priority of fields for snmp alerts 2020-11-05 12:47:25 +01:00
artica
6662b4f286 Auto-updated build strings. 2020-11-05 01:00:35 +01:00
Daniel Rodriguez
b0ccfc89b1 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop' 
SAML with pandora sessions

See merge request artica/pandorafms!3533
 2020-11-04 18:42:42 +01:00
Daniel Rodriguez
c811f0b85d Merge branch 'ent-6573-error-nuevo-sistema-de-cambio-de-password-ad' into 'develop' 
removed extra messages while login using AD after change password in AD

See merge request artica/pandorafms!3557
 2020-11-04 18:09:33 +01:00
Daniel Rodriguez
577093ea89 Merge branch 'ent-6680-ventana-de-perdida-de-conexion-incorrecta' into 'develop' 
Ent 6680 ventana de perdida de conexion incorrecta

See merge request artica/pandorafms!3592
 2020-11-04 16:41:25 +01:00
Luis
2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
Daniel Rodriguez
01b315de3f Merge branch 'ent-#10872-GUARDIA-Problemas-menus-de-modulos' into 'develop' 
added check for element

See merge request artica/pandorafms!3577
 2020-11-04 16:40:36 +01:00
Jose Gonzalez
b5dc75ce93 WIP: Backup upload 2020-11-04 16:40:18 +01:00
Daniel Rodriguez
a786f5e132 Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop' 
Added server component status - crash -

See merge request artica/pandorafms!3547
 2020-11-04 16:39:28 +01:00
Luis Calvo
31a8eefd2f Fixed bug allowing updating group with duplicated name 2020-11-04 16:22:44 +01:00
Daniel Rodriguez
d920b62d9a Merge branch 'ent-6513-fix-macos-para-high-sierra' into 'develop' 
force folders creation

See merge request artica/pandorafms!3534
 2020-11-04 11:55:16 +01:00
artica
081e46c9c2 Auto-updated build strings. 2020-11-04 01:00:47 +01:00
fbsanchez
c59042c034 WIP 2020-11-03 18:01:24 +01:00
Jose Gonzalez
938860dff2 Added wrapper attributes 2020-11-03 17:15:01 +01:00
fbsanchez
b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
fbsanchez
d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00