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

21023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Calvo
702926cf85 solved merge conflict mr 28.sql 
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
 2019-05-16 10:15:46 +02:00
artica
f5f66fc144 Auto-updated build strings. 
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
 2019-05-16 00:01:06 +02:00
artica
9c08aa7b57 Auto-updated build strings. 
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
 2019-05-15 00:01:11 +02:00
Alejandro Fraguas
3548070ec1 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop' 
Add new message to News board

See merge request artica/pandorafms!2415

Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
 2019-05-14 17:56:43 +02:00
Daniel Rodriguez
be20163073 Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop' 
Ent 3799 bug en configuracion ehorus

See merge request artica/pandorafms!2421

Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
 2019-05-14 17:38:55 +02:00
marcos.alconada
35c7ea1f48 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews 
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
 2019-05-14 17:14:02 +02:00
marcos.alconada
bc849c16fb Only one image for welcome new board 
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
 2019-05-14 17:13:44 +02:00
Daniel Rodriguez
f807c23df7 Merge branch 'ent-3264-importa-politicas-desde-resource-registration-en-modo-centralizado' into 'develop' 
Fixed policy import with centralized management in node

See merge request artica/pandorafms!2217

Former-commit-id: abe02564ab3d19101e37f02bd9cc9f37739e1992
 2019-05-14 16:50:42 +02:00
Marcos Alconada
d9dbc60eb5 Update pandoradb_migrate_6.0_to_7.0.mysql.sql 
Former-commit-id: cb2edea9dca48e33260ce2fb707ed48b04d23bde
 2019-05-14 16:45:28 +02:00
Daniel Rodriguez
0229ca9d33 Merge branch 'ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA' into 'develop' 
Ent 1372 poder escoger fecha de inicio y fin en hourly weekly y monthly sla

See merge request artica/pandorafms!2399

Former-commit-id: 687a8dcf165a1cf4c6103ea560120ad871e0634d
 2019-05-14 15:48:51 +02:00
marcos.alconada
ff8abf9b40 updated function for show and hide ehorus form 
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
 2019-05-14 15:34:22 +02:00
Daniel Maya
26bc3af1d1 Fixed centralized mode message 2019-05-14 15:16:24 +02:00
Daniel Barbero Martin
79701bba60 Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA 
Conflicts:
	pandora_console/extras/mr/28.sql


Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
 2019-05-14 12:34:40 +02:00
Alejandro Fraguas
8ff62a58ce Merge branch 'ent-3695-ipam-oids' into 'develop' 
IPAM vlan wizard ExtremeXOS

See merge request artica/pandorafms!2409

Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
 2019-05-14 11:30:55 +02:00
Daniel Rodriguez
15446453fb Merge branch 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' into 'develop' 
Ent 3771 nueva tipo de macro password en comandos acciones de alerta

See merge request artica/pandorafms!2397

Former-commit-id: bd4887079f93ed26eef66f5b5047dcc07caf56a6
 2019-05-14 10:53:44 +02:00
Daniel Rodriguez
865796ed5e Merge branch 'visual-console-phase-2' into 'develop' 
Visual console phase 2

See merge request artica/pandorafms!2404

Former-commit-id: af616c2346655fcf1f5732c00c0ef2f053126d86
 2019-05-14 10:21:14 +02:00
Marcos Alconada
cf45be2c60 Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
 2019-05-14 10:03:37 +02:00
marcos.alconada
9501187ebc Se cambian las consultas sql sin la imagen en la consulta 
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
 2019-05-14 10:01:30 +02:00
marcos.alconada
bad2a330fd Se muestra en la pantalla mediante html la imganen 
Former-commit-id: ddd86fc0b4768ed5c3750c304fded70de3389864
 2019-05-14 09:48:41 +02:00
marcos.alconada
5fe4a240be se añade imagen y se quita de bbdd 
Former-commit-id: 4d9174e95ffb6f5a35aa194177363c27dcd2c4a1
 2019-05-14 09:47:45 +02:00
artica
b7ebb44c48 Auto-updated build strings. 
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
 2019-05-14 00:01:09 +02:00
Alejandro Fraguas
81f7cf699b Merge branch 'ent-3768-no-funciona-selector-de-nodo-event-group-report-meta' into 'develop' 
Ternary condition is added

See merge request artica/pandorafms!2311

Former-commit-id: c7e9365d322c9f2bf7b52a58c4e6f077f3e68288
 2019-05-13 18:36:34 +02:00
Luis Calvo
860a4cdbf2 Updated pandoradb and migrate 
Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
 2019-05-13 17:57:21 +02:00
Luis Calvo
8c1c337522 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
 2019-05-13 17:36:32 +02:00
Daniel Maya
539f416cc4 Merge 
Former-commit-id: ab93502ce1140ff37c513f2c574b4ca22f552ee9
 2019-05-13 17:30:35 +02:00
Luis Calvo
ce34adb9d8 Fixed errors and corrected style 
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
 2019-05-13 17:28:23 +02:00
Alejandro Campos
9347fc17aa Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' 
# Conflicts:
#   pandora_console/extras/mr/28.sql

Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
 2019-05-13 17:10:06 +02:00
Daniel Rodriguez
a38ef3e729 Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop' 
Added condition type not normal in alert templates

See merge request artica/pandorafms!2376

Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
 2019-05-13 16:51:34 +02:00
Tatiana Llorente
b6e8578d1d Fixed a minor sintax error - #3611 
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
 2019-05-13 15:54:06 +02:00
Luis Calvo
14717a6c6d Fixed merge conflict 
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
 2019-05-13 15:15:14 +02:00
Tatiana Llorente
e6fa42ddca Fixed a minor bug in remote config - #3611 
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
 2019-05-13 15:02:13 +02:00
Luis Calvo
895588ebe0 Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
 2019-05-13 15:00:35 +02:00
Luis Calvo
27096276ec agent view user acces ehorus 
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
 2019-05-13 15:00:29 +02:00
Tatiana Llorente
e9082c5d8a Fixed a minor bug in remote config - #3611 
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
 2019-05-13 14:55:15 +02:00
Daniel Rodriguez
ecacf2d3f5 Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop' 
Ent 3799 bug en configuracion ehorus

See merge request artica/pandorafms!2403

Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
 2019-05-13 14:54:25 +02:00
Daniel Rodriguez
f281dda622 Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual' into 'develop' 
Fixed error window in visual console

See merge request artica/pandorafms!2412

Former-commit-id: 312950779bb4cd02938f1e825d86ab3c1fef01ff
 2019-05-13 14:52:17 +02:00
Ramon Novoa
f48dd94c65 Check not_normal alerts when evaluating unknown modules. 
Former-commit-id: 80f58d4ebfaf5179312a19eae8ea09a4a8d0bff5
 2019-05-13 13:44:08 +02:00
Tatiana Llorente
5f2bd0bc8d Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
 2019-05-13 13:17:17 +02:00
Alejandro Fraguas
20f77f5393 Merge branch 'ent-4004-Estilos-Discovery' into 'develop' 
Unify the styles of Discovery with Pandora - #4004

See merge request artica/pandorafms!2411

Former-commit-id: 463116b12ece33846a8d86514145e2d97e7eaec1
 2019-05-13 13:05:34 +02:00
Luis Calvo
3d66fca5d6 Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: df2707c912cccfa684dc82e5ad8a777819b2b9e8
 2019-05-13 10:08:37 +02:00
artica
40af2205b1 Auto-updated build strings. 
Former-commit-id: bde62e989e369e296a685f7d2050a92f4b8417e2
 2019-05-13 00:01:06 +02:00
artica
3fc5f183fd Auto-updated build strings. 
Former-commit-id: bcb6a01291e16430de319d27a04f21723e39a5c5
 2019-05-12 00:01:06 +02:00
artica
0008f57e35 Auto-updated build strings. 
Former-commit-id: 62f8df997289fe4c8e8e63eedbb8dcdb1a08da1f
 2019-05-11 00:01:09 +02:00
Luis Calvo
c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
marcos.alconada
b51cdb93df arreglo con la vista del formulario 
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
 2019-05-10 15:00:21 +02:00
Alejandro Fraguas
0f3ff09b82 Merge branch 'ent-3894-Bug-Feature-labels-weigh-en-graficas' into 'develop' 
fixed error labels graphs and weight in chart

See merge request artica/pandorafms!2401

Former-commit-id: f70c0c55a7159d235ca30f1a2cd42d66205eaa7a
 2019-05-10 12:52:39 +02:00
marcos.alconada
793304b52d Se habilita el boton de ehorus 
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
 2019-05-10 12:26:09 +02:00
Daniel Barbero Martin
ab2bf737d5 Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas 
Conflicts:
	pandora_console/include/functions.php


Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
 2019-05-10 12:18:10 +02:00
Daniel Rodriguez
948c4eb7b4 Merge branch 'ent-3726-WUX_no_se_puede_aplicar_FF_Interval' into 'develop' 
fixed change status WUX

See merge request artica/pandorafms!2385

Former-commit-id: c203a7a321303a33843b8ab85a96b69cc041a8c5
 2019-05-10 11:44:08 +02:00
marcos.alconada
ac60e296c1 Add new message to News board 
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
 2019-05-10 11:17:46 +02:00