artica
|
969d4a36c1
|
Auto-updated build strings.
|
2020-05-30 01:00:19 +02:00 |
fbsanchez
|
b3cf532c16
|
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
|
2020-05-29 12:30:49 +02:00 |
|
artica
|
55496dbf4c
|
Auto-updated build strings.
|
2020-05-29 01:00:17 +02:00 |
Daniel Rodriguez
|
b09ff78a87
|
Merge branch 'ent-5723-control-de-sesiones-selenium' into 'develop'
Cleanup old SEL GRID sessions
See merge request artica/pandorafms!3181
|
2020-05-28 08:27:05 +02:00 |
|
artica
|
cc09361598
|
Auto-updated build strings.
|
2020-05-28 01:00:15 +02:00 |
|
artica
|
7c4e4bb7e1
|
Auto-updated build strings.
|
2020-05-27 01:00:18 +02:00 |
|
fbsanchez
|
2481bcc669
|
Update default value for use_xml_timestamp
|
2020-05-26 13:56:39 +02:00 |
|
artica
|
e3803ac934
|
Auto-updated build strings.
|
2020-05-26 01:00:17 +02:00 |
|
Daniel Rodriguez
|
bab85bcc5e
|
Merge branch 'ent-5744-pandora_ux-pl-con-pandorafms-webdriver' into 'develop'
added missing function read_file
See merge request artica/pandorafms!3193
|
2020-05-25 18:18:28 +02:00 |
Luis
|
9541d3b56d
|
Ent 5553 dangerous behaviour dataserver lifo enabled
|
2020-05-25 16:08:37 +02:00 |
|
artica
|
b595548eee
|
Auto-updated build strings.
|
2020-05-25 01:00:14 +02:00 |
|
artica
|
980582968b
|
Auto-updated build strings.
|
2020-05-24 01:00:15 +02:00 |
|
artica
|
4e4fe147d3
|
Auto-updated build strings.
|
2020-05-23 01:00:17 +02:00 |
|
artica
|
289e56d8df
|
Auto-updated build strings.
|
2020-05-22 01:00:15 +02:00 |
|
fbsanchez
|
b0e8287c61
|
Wip cluster view
|
2020-05-21 19:28:24 +02:00 |
|
artica
|
44991d0b46
|
Auto-updated build strings.
|
2020-05-21 01:00:16 +02:00 |
|
artica
|
09ea6fdb97
|
Auto-updated build strings.
|
2020-05-20 01:00:16 +02:00 |
|
artica
|
d2c2ae7502
|
Auto-updated build strings.
|
2020-05-19 01:00:16 +02:00 |
|
artica
|
e8dd2b13c7
|
Auto-updated build strings.
|
2020-05-18 01:00:13 +02:00 |
|
artica
|
eece9281e2
|
Auto-updated build strings.
|
2020-05-17 01:00:13 +02:00 |
|
artica
|
71cb3e0164
|
Auto-updated build strings.
|
2020-05-16 01:00:14 +02:00 |
|
artica
|
277a610709
|
Auto-updated build strings.
|
2020-05-15 01:00:15 +02:00 |
Alejandro Fraguas
|
aaf64e591c
|
Merge branch 'ent-5708-review-discovery-h-d' into 'develop'
Ent 5708 review discovery h d
See merge request artica/pandorafms!3195
|
2020-05-14 10:32:43 +02:00 |
|
artica
|
44b5f2671e
|
Auto-updated build strings.
|
2020-05-14 01:00:51 +02:00 |
|
fbsanchez
|
206970d143
|
fixes
|
2020-05-13 17:06:18 +02:00 |
|
fbsanchez
|
ee51814650
|
fixes
|
2020-05-13 17:02:07 +02:00 |
|
fbsanchez
|
bd6b57e8c3
|
Improvements in log details v10
|
2020-05-13 16:43:20 +02:00 |
|
fbsanchez
|
6bbb9d5d9b
|
minor fix
|
2020-05-13 12:43:47 +02:00 |
|
fbsanchez
|
694d82e522
|
avoid div by 0 error while scanning networks with no hosts
|
2020-05-13 12:37:08 +02:00 |
|
artica
|
9fc993519b
|
Auto-updated build strings.
|
2020-05-13 01:00:20 +02:00 |
|
artica
|
3dfef47b24
|
Auto-updated build strings.
|
2020-05-12 01:00:20 +02:00 |
|
Alejandro Fraguas
|
f2c0a62cec
|
Merge branch 'ent-1096-integracion-cmdb' into 'develop'
CMDB integration needs
See merge request artica/pandorafms!3045
|
2020-05-11 13:58:50 +02:00 |
|
artica
|
8514cdc378
|
Auto-updated build strings.
|
2020-05-11 01:00:15 +02:00 |
|
artica
|
87445c28ef
|
Auto-updated build strings.
|
2020-05-10 01:00:15 +02:00 |
|
artica
|
3c01526ea9
|
Auto-updated build strings.
|
2020-05-09 01:00:24 +02:00 |
|
artica
|
36d15f3de5
|
Auto-updated build strings.
|
2020-05-08 01:00:18 +02:00 |
|
artica
|
bc3e21af6d
|
Auto-updated build strings.
|
2020-05-07 01:00:17 +02:00 |
|
artica
|
5ad9e5dbd7
|
Auto-updated build strings.
|
2020-05-06 01:00:18 +02:00 |
|
artica
|
b894f63f1f
|
Auto-updated build strings.
|
2020-05-05 01:00:14 +02:00 |
|
fbsanchez
|
4815dce8aa
|
H&D port filtering + control tasks cancellation while restarting server
|
2020-05-04 11:13:15 +02:00 |
|
fbsanchez
|
54a9ebd4ed
|
Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d
Conflicts:
pandora_server/lib/PandoraFMS/Recon/Base.pm
|
2020-05-04 09:52:15 +02:00 |
|
artica
|
12128ea2f1
|
Auto-updated build strings.
|
2020-05-04 01:00:15 +02:00 |
|
artica
|
7006e3febd
|
Auto-updated build strings.
|
2020-05-03 01:00:14 +02:00 |
|
artica
|
f95fed2d79
|
Auto-updated build strings.
|
2020-05-02 01:00:15 +02:00 |
|
artica
|
848503babe
|
Auto-updated build strings.
|
2020-05-01 01:00:14 +02:00 |
|
fbsanchez
|
55392bac47
|
weird json
|
2020-04-30 18:11:50 +02:00 |
|
fbsanchez
|
eaf10f7d6e
|
weird json
|
2020-04-30 18:07:52 +02:00 |
|
fbsanchez
|
c7f0181209
|
fix
|
2020-04-30 16:53:45 +02:00 |
|
fbsanchez
|
7ad06596ff
|
Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d
|
2020-04-30 16:26:47 +02:00 |
|
fbsanchez
|
da92cb53f8
|
rcmd h&d
|
2020-04-30 16:25:00 +02:00 |
|
fbsanchez
|
e9bd646983
|
added missing function read_file
|
2020-04-30 15:19:19 +02:00 |
|
fbsanchez
|
900e25eef1
|
WIP rcmd in H&D
|
2020-04-30 15:00:25 +02:00 |
|
artica
|
8a019bd8f4
|
Auto-updated build strings.
|
2020-04-30 01:00:16 +02:00 |
|
artica
|
456848485e
|
Auto-updated build strings.
|
2020-04-29 01:00:16 +02:00 |
|
fbsanchez
|
dfa31d5227
|
updates
|
2020-04-28 13:26:57 +02:00 |
|
fbsanchez
|
2bfee57a67
|
perl multilib json workaround
|
2020-04-28 12:46:13 +02:00 |
|
fbsanchez
|
3ad1b5f2e3
|
trace if failed to encode json (summary)
|
2020-04-28 12:19:46 +02:00 |
|
fbsanchez
|
744bac6736
|
avoid problems while encoding json
|
2020-04-28 11:21:33 +02:00 |
|
fbsanchez
|
8d73339887
|
Windows environment spaces in binary file names
|
2020-04-28 10:37:09 +02:00 |
|
artica
|
d644714fcb
|
Auto-updated build strings.
|
2020-04-28 01:00:18 +02:00 |
|
artica
|
a986ed0a48
|
Auto-updated build strings.
|
2020-04-27 01:00:15 +02:00 |
|
artica
|
bf0596e978
|
Auto-updated build strings.
|
2020-04-26 01:00:15 +02:00 |
|
artica
|
202816e309
|
Auto-updated build strings.
|
2020-04-25 01:00:18 +02:00 |
|
artica
|
eb9b116311
|
Auto-updated build strings.
|
2020-04-24 01:00:16 +02:00 |
|
artica
|
1b641b81fb
|
Auto-updated build strings.
|
2020-04-23 01:00:15 +02:00 |
|
fbsanchez
|
19f7280c86
|
Cleanup old SEL GRID sessions
|
2020-04-22 16:09:12 +02:00 |
|
artica
|
91d1832f8f
|
Updated version and build strings.
|
2020-04-22 12:42:47 +02:00 |
|
artica
|
60f4f21297
|
Auto-updated build strings.
|
2020-04-22 01:00:15 +02:00 |
|
artica
|
b3d7c56de4
|
Auto-updated build strings.
|
2020-04-21 01:00:18 +02:00 |
|
artica
|
3992b81900
|
Auto-updated build strings.
|
2020-04-20 01:00:19 +02:00 |
|
artica
|
2e44631253
|
Auto-updated build strings.
|
2020-04-19 01:00:15 +02:00 |
|
artica
|
04ecb0afa5
|
Auto-updated build strings.
|
2020-04-18 01:00:19 +02:00 |
|
artica
|
719762105d
|
Auto-updated build strings.
|
2020-04-17 01:00:19 +02:00 |
|
Alejandro Fraguas
|
fdced83e63
|
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
Fixes name resolution
See merge request artica/pandorafms!3167
|
2020-04-16 18:23:31 +02:00 |
|
fbsanchez
|
b3ed5dab63
|
Update new ips detected
|
2020-04-16 14:29:35 +02:00 |
|
fbsanchez
|
fa0b5760a9
|
simplified agents
|
2020-04-16 14:06:41 +02:00 |
|
fbsanchez
|
0614c4b6ce
|
fix alias
|
2020-04-16 13:08:56 +02:00 |
|
fbsanchez
|
f84760e448
|
Avoid candidates without label (indirect related)
|
2020-04-16 12:54:47 +02:00 |
|
fbsanchez
|
f9c3d480ca
|
Avoid empty references
|
2020-04-16 12:50:44 +02:00 |
|
fbsanchez
|
bcb969c3af
|
Fixes name resolution
|
2020-04-16 12:39:55 +02:00 |
|
Daniel Rodriguez
|
eb379ddfa9
|
Merge branch 'ent-5565-9761-Macros-en-alertas-de-correlacion-de-eventos-no-funcionan' into 'develop'
fixed macros for alert of correlated events
See merge request artica/pandorafms!3161
|
2020-04-16 09:50:07 +02:00 |
|
artica
|
1b028be67f
|
Auto-updated build strings.
|
2020-04-16 01:00:14 +02:00 |
|
artica
|
e695a3f5b5
|
Auto-updated build strings.
|
2020-04-15 01:00:17 +02:00 |
alejandro-campos
|
03db071ce4
|
fixed macros for alert of correlated events
|
2020-04-14 16:53:43 +02:00 |
|
fbsanchez
|
7024863fd7
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
pandora_console/extras/mr/37.sql
|
2020-04-14 16:06:17 +02:00 |
|
fbsanchez
|
36daf76cc5
|
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
pandora_console/extras/mr/37.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2020-04-14 12:00:15 +02:00 |
|
fbsanchez
|
3b71297d56
|
escaped single quotes (wmi) + refresh button
|
2020-04-14 11:57:18 +02:00 |
|
fbsanchez
|
0282dae05a
|
Tools.pm definition retrieved from 5575
|
2020-04-14 09:57:01 +02:00 |
|
artica
|
60ee065f8b
|
Auto-updated build strings.
|
2020-04-14 01:00:15 +02:00 |
|
fbsanchez
|
1057f76e5e
|
undo changes, maintain classic ATF calculation
|
2020-04-13 17:50:18 +02:00 |
|
fbsanchez
|
cf67dda2eb
|
prioritize AFT relationships
|
2020-04-13 17:26:49 +02:00 |
|
fbsanchez
|
f6746ba9d8
|
parent calculation
|
2020-04-13 17:16:47 +02:00 |
|
fbsanchez
|
189d85d659
|
minor fix
|
2020-04-13 15:30:13 +02:00 |
|
fbsanchez
|
7395410831
|
fix parent-connection
|
2020-04-13 15:04:03 +02:00 |
|
fbsanchez
|
9c74306e95
|
minor change
|
2020-04-13 14:11:43 +02:00 |
|
fbsanchez
|
32538e659a
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
|
2020-04-13 10:36:47 +02:00 |
|
artica
|
8d27ff9350
|
Auto-updated build strings.
|
2020-04-13 01:00:08 +02:00 |
|
artica
|
8b609e2d26
|
Auto-updated build strings.
|
2020-04-11 01:00:15 +02:00 |
|
artica
|
017fdea2c7
|
Auto-updated build strings.
|
2020-04-10 01:00:14 +02:00 |
|
artica
|
6425d4d86d
|
Auto-updated build strings.
|
2020-04-09 01:00:18 +02:00 |
|
fbsanchez
|
a75964fcba
|
minor fix
|
2020-04-08 16:06:39 +02:00 |
|
fbsanchez
|
8a0215dcc9
|
minor fixes
|
2020-04-08 14:14:03 +02:00 |
|
fbsanchez
|
bb11403c4b
|
Fixes - default module
|
2020-04-08 13:01:11 +02:00 |
|
fbsanchez
|
5c405b1d32
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
|
2020-04-08 10:18:13 +02:00 |
|
fbsanchez
|
ce5868bbc4
|
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
|
2020-04-08 10:03:51 +02:00 |
|
artica
|
987d8f4c75
|
Auto-updated build strings.
|
2020-04-08 01:00:21 +02:00 |
|
fbsanchez
|
f88dceb4ec
|
Some missing functions
|
2020-04-07 19:03:10 +02:00 |
|
fbsanchez
|
762ad3106d
|
Improvements and fixes H&D with review
|
2020-04-07 18:50:56 +02:00 |
|
fbsanchez
|
72d20a6e57
|
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
|
2020-04-07 12:55:27 +02:00 |
|
Daniel Rodriguez
|
18622f4d0a
|
Merge branch 'ent-5517-9676-correlacion-nueva-hace-que-salten-mil-alertas-en-poco-tiempo' into 'develop'
Minor change
See merge request artica/pandorafms!3125
|
2020-04-07 10:58:47 +02:00 |
|
artica
|
77b267c596
|
Auto-updated build strings.
|
2020-04-07 01:00:15 +02:00 |
|
fbsanchez
|
890cfe68aa
|
multiple fixes
|
2020-04-06 18:04:53 +02:00 |
|
fbsanchez
|
eb64fd8758
|
minor fixes
|
2020-04-06 16:10:37 +02:00 |
|
fbsanchez
|
5205e0e06f
|
minor update
|
2020-04-06 12:05:03 +02:00 |
|
fbsanchez
|
2d4b977d26
|
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
|
2020-04-06 11:05:18 +02:00 |
|
fbsanchez
|
72f026f152
|
Minor fixes, group and review while exceeded license
|
2020-04-06 11:04:53 +02:00 |
|
artica
|
a8043e98f9
|
Auto-updated build strings.
|
2020-04-06 01:00:14 +02:00 |
|
artica
|
e013e26892
|
Auto-updated build strings.
|
2020-04-05 01:00:14 +02:00 |
|
artica
|
d18dbc10e7
|
Auto-updated build strings.
|
2020-04-04 01:00:20 +02:00 |
|
Daniel Rodriguez
|
a901e91274
|
Merge branch 'ent-5652-Grafica-de-modulo-en-los-email-gigante' into 'develop'
Ent 5652 grafica de modulo en los email gigante
See merge request artica/pandorafms!3135
|
2020-04-03 12:28:28 +02:00 |
|
artica
|
297693a9d3
|
Auto-updated build strings.
|
2020-04-03 01:00:18 +02:00 |
|
fbsanchez
|
79378994b4
|
schema minor fixes
|
2020-04-02 17:56:17 +02:00 |
Daniel Maya
|
9b1d8a52de
|
Fixed graph height when send email by alert
|
2020-04-02 14:58:03 +02:00 |
|
Daniel Rodriguez
|
1c596ea8af
|
Merge branch 'ent-5640-9818-Alertas-SNMP-no-inserta-grupo-en-creacion-de-eventos' into 'develop'
Ent 5640 9818 alertas snmp no inserta grupo en creacion de eventos
See merge request artica/pandorafms!3127
|
2020-04-02 14:33:00 +02:00 |
|
artica
|
e30b9a32d8
|
Auto-updated build strings.
|
2020-04-02 01:00:16 +02:00 |
|
fbsanchez
|
bb1ad4d2a9
|
Updates sat. compatibility
|
2020-04-01 18:16:57 +02:00 |
|
fbsanchez
|
e249233205
|
minor fixes
|
2020-04-01 16:43:04 +02:00 |
|
artica
|
f68d84940c
|
Auto-updated build strings.
|
2020-04-01 01:00:19 +02:00 |
|
Daniel Maya
|
3f8948bc21
|
Added id_group in snmp alert
|
2020-03-31 15:26:41 +02:00 |
|
fbsanchez
|
fec4f37cf4
|
Minor change
|
2020-03-31 12:02:53 +02:00 |
|
fbsanchez
|
3ad3a07d93
|
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
|
2020-03-31 10:02:52 +02:00 |
|
artica
|
a2106a2056
|
Auto-updated build strings.
|
2020-03-31 01:00:18 +02:00 |
|
fbsanchez
|
acabe543c4
|
csv recon0
|
2020-03-30 19:44:44 +02:00 |
|
fbsanchez
|
c556bf3ba8
|
License validation
|
2020-03-30 15:03:22 +02:00 |
|
fbsanchez
|
86dfcd162b
|
Update
|
2020-03-30 14:28:10 +02:00 |
|
fbsanchez
|
a7c783242d
|
Remaining stuff
|
2020-03-30 12:51:52 +02:00 |
|
artica
|
7991d6f215
|
Auto-updated build strings.
|
2020-03-30 01:00:14 +02:00 |
|
artica
|
ea4b3bff04
|
Auto-updated build strings.
|
2020-03-29 01:00:15 +01:00 |
|
artica
|
9ca21e8768
|
Auto-updated build strings.
|
2020-03-28 01:00:19 +01:00 |
|
artica
|
d2eac81d39
|
Auto-updated build strings.
|
2020-03-27 01:00:18 +01:00 |
|
fbsanchez
|
452f5253e2
|
merge develop
|
2020-03-26 14:43:57 +01:00 |
|
fbsanchez
|
e48ef76f35
|
merge
|
2020-03-26 14:38:23 +01:00 |
|
fbsanchez
|
e923c9f5e0
|
minor fixes
|
2020-03-26 14:33:56 +01:00 |
|
fbsanchez
|
3eadde8a87
|
WMI review Discovery
|
2020-03-26 13:44:08 +01:00 |
|
Alejandro Fraguas
|
48fc714ba3
|
Merge branch 'ent-1775-SNMPServer.pm-CDE' into 'develop'
added exception handler
See merge request artica/pandorafms!3119
|
2020-03-26 10:32:08 +01:00 |
|
artica
|
63fca15ead
|
Auto-updated build strings.
|
2020-03-26 01:00:17 +01:00 |
|
fbsanchez
|
8d8474e67e
|
minor fix
|
2020-03-25 18:13:12 +01:00 |
|
Daniel Rodriguez
|
87f2e434a4
|
Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' into 'develop'
changes to show last status change of modules
See merge request artica/pandorafms!3114
|
2020-03-25 18:10:09 +01:00 |
|
fbsanchez
|
fecff8aa93
|
Discovery review advanced
|
2020-03-25 18:02:58 +01:00 |
|
Daniel Maya
|
db3313c76d
|
added exception handler
|
2020-03-25 15:42:55 +01:00 |
|
artica
|
29cac0477e
|
Auto-updated build strings.
|
2020-03-25 01:00:16 +01:00 |
|
Alejandro Campos
|
b56076044b
|
Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado'
# Conflicts:
# pandora_console/extras/mr/37.sql
|
2020-03-24 13:55:57 +01:00 |
|
artica
|
ce2353d54d
|
Auto-updated build strings.
|
2020-03-24 01:00:17 +01:00 |
|
fbsanchez
|
23c19856b8
|
minor fixes
|
2020-03-23 19:09:22 +01:00 |
Ramon Novoa
|
7f0ce1cbda
|
Add a macro for the last status change.
|
2020-03-23 11:44:45 +01:00 |
|
Daniel Maya
|
c7e6f9fd34
|
Added disable event in alert template
|
2020-03-23 11:34:37 +01:00 |
|
artica
|
d7b576d079
|
Auto-updated build strings.
|
2020-03-23 01:00:14 +01:00 |
|
artica
|
d312c76fcf
|
Auto-updated build strings.
|
2020-03-22 01:00:14 +01:00 |
|
artica
|
3f271ee9f7
|
Auto-updated build strings.
|
2020-03-21 01:00:16 +01:00 |
|
artica
|
958c17168a
|
Auto-updated build strings.
|
2020-03-20 01:00:16 +01:00 |
|
fbsanchez
|
17eae7d97f
|
updates
|
2020-03-19 18:33:04 +01:00 |
|
Ramon Novoa
|
4815c9c29b
|
Update the change of status timestamp.
|
2020-03-19 17:44:22 +01:00 |
|
fbsanchez
|
32c6e7f30c
|
Minor fixes
|
2020-03-19 14:26:01 +01:00 |
|
fbsanchez
|
99cb286274
|
Pre-check modules (SNMP, TCP, ICMP) Discovery
|
2020-03-19 14:11:09 +01:00 |
|
artica
|
6cea6f62c2
|
Auto-updated build strings.
|
2020-03-19 01:00:16 +01:00 |
|
fbsanchez
|
f58276ddbb
|
Templates
|
2020-03-18 19:31:58 +01:00 |
|
fbsanchez
|
6504fe49b5
|
intentation to spaces (2) and minor fix
|
2020-03-18 10:28:50 +01:00 |
|
artica
|
d7eaa4355b
|
Auto-updated build strings.
|
2020-03-18 01:00:17 +01:00 |
|
artica
|
b0e8a12df6
|
Auto-updated build strings.
|
2020-03-17 01:00:16 +01:00 |
|
fbsanchez
|
f3da919abc
|
WIP multiple changes
|
2020-03-16 23:52:20 +01:00 |
|
artica
|
b2de9eeef2
|
Auto-updated build strings.
|
2020-03-16 01:00:14 +01:00 |
|
artica
|
7cd987321e
|
Auto-updated build strings.
|
2020-03-15 01:00:13 +01:00 |
|
artica
|
a4c44bf68b
|
Auto-updated build strings.
|
2020-03-14 01:00:15 +01:00 |
|
artica
|
3c4c659d95
|
Auto-updated build strings.
|
2020-03-13 01:00:16 +01:00 |
|
artica
|
48f014ee7d
|
Auto-updated build strings.
|
2020-03-12 01:00:17 +01:00 |
|
fbsanchez
|
f0a71e01de
|
minor fixes
|
2020-03-11 13:35:31 +01:00 |
|
artica
|
c8ee27ed2b
|
Auto-updated build strings.
|
2020-03-11 01:00:17 +01:00 |
|
fbsanchez
|
9211396134
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
|
2020-03-10 15:40:16 +01:00 |
|
artica
|
8b3dafc48f
|
Auto-updated build strings.
|
2020-03-10 01:00:15 +01:00 |
|
fbsanchez
|
d0f1239d9d
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
|
2020-03-09 18:50:23 +01:00 |
|
artica
|
b7408b5e99
|
Auto-updated build strings.
|
2020-03-09 01:00:14 +01:00 |
|
artica
|
1ff7219e06
|
Auto-updated build strings.
|
2020-03-08 01:00:13 +01:00 |
|
artica
|
d995210494
|
Auto-updated build strings.
|
2020-03-07 01:00:14 +01:00 |
|
Ramon Novoa
|
9743f1a2d4
|
Fix storm protection for SNMPv2 traps.
|
2020-03-06 12:59:31 +01:00 |
|
artica
|
bdd6cde6c2
|
Auto-updated build strings.
|
2020-03-06 01:00:16 +01:00 |
|
artica
|
4a5af5da40
|
Auto-updated build strings.
|
2020-03-05 01:00:08 +01:00 |
|
fbsanchez
|
fd23ed30c5
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
|
2020-03-04 11:37:35 +01:00 |
|
artica
|
9d3db50cf4
|
Auto-updated build strings.
|
2020-03-04 01:00:07 +01:00 |
|
artica
|
3e6cc7b2e7
|
Auto-updated build strings.
|
2020-03-03 01:00:09 +01:00 |
artica
|
015b1b55b2
|
Updated version and build strings.
|
2020-03-02 11:01:26 +01:00 |
|
artica
|
97037d1266
|
Auto-updated build strings.
|
2020-03-02 01:00:08 +01:00 |
|
artica
|
501d76b975
|
Auto-updated build strings.
|
2020-03-01 01:00:08 +01:00 |
|
artica
|
b106981613
|
Auto-updated build strings.
|
2020-02-29 01:00:10 +01:00 |
|
Daniel Rodriguez
|
5dff4e572e
|
Merge branch 'ent-5349-Modulos-con-cron-no-ejecutan-cuando-deben' into 'develop'
Changed cron functions to allow inverse intervals
See merge request artica/pandorafms!3075
|
2020-02-28 09:39:14 +01:00 |
|
artica
|
6e594f5503
|
Auto-updated build strings.
|
2020-02-28 01:00:10 +01:00 |
|
artica
|
a9590892bf
|
Auto-updated build strings.
|
2020-02-27 01:00:09 +01:00 |
|
fbsanchez
|
fef98d7315
|
minor change
|
2020-02-26 12:34:48 +01:00 |
|
artica
|
3b9e100f9f
|
Auto-updated build strings.
|
2020-02-26 01:00:08 +01:00 |
Jose Gonzalez
|
b5c5d631c6
|
Changed cron functions to allow inverse intervals
|
2020-02-25 17:50:27 +01:00 |
|
fbsanchez
|
b3467f6746
|
Minor fix: avoid errors if no default vales flipflop (Origin:Wux)
|
2020-02-25 12:15:51 +01:00 |
|
Daniel Rodriguez
|
4284c83f18
|
Merge branch 'fix-alert-action' into 'develop'
Fixed problem of evaluation for last alert execution.
See merge request artica/pandorafms!3061
|
2020-02-25 11:22:40 +01:00 |
|
fbsanchez
|
7fbd8e73eb
|
Control if module is hashref or not
|
2020-02-25 09:28:44 +01:00 |
|
artica
|
400809ce61
|
Auto-updated build strings.
|
2020-02-25 01:00:10 +01:00 |
|
artica
|
03b97f4fdb
|
Auto-updated build strings.
|
2020-02-24 01:00:07 +01:00 |
|
artica
|
bfab0285e5
|
Auto-updated build strings.
|
2020-02-23 01:00:11 +01:00 |
|
artica
|
1667ed4f1c
|
Auto-updated build strings.
|
2020-02-22 01:00:10 +01:00 |
|
artica
|
540fffc6ef
|
Auto-updated build strings.
|
2020-02-21 00:01:14 +01:00 |
|
Daniel Maya
|
5e21916049
|
Updated sending logs
|
2020-02-20 11:11:44 +01:00 |
|
artica
|
70ee4f4e9b
|
Auto-updated build strings.
|
2020-02-20 00:01:12 +01:00 |
|
artica
|
a04b92a0bc
|
Auto-updated build strings.
|
2020-02-19 09:12:12 +01:00 |
|
artica
|
92e1492f2b
|
Auto-updated build strings.
|
2020-02-18 00:01:12 +01:00 |
Junichi Satoh
|
767cb01185
|
Fixed problem of evaluation for last_execution by casting time() to integer.
|
2020-02-17 11:13:44 +09:00 |
|
artica
|
bf0211c9b8
|
Auto-updated build strings.
|
2020-02-17 00:01:09 +01:00 |
|
artica
|
6a3d1b4992
|
Auto-updated build strings.
|
2020-02-16 00:01:08 +01:00 |
|
artica
|
19b59f2819
|
Auto-updated build strings.
|
2020-02-15 00:01:16 +01:00 |
|
artica
|
e60ccb8a68
|
Auto-updated build strings.
|
2020-02-14 00:01:12 +01:00 |
|
artica
|
d1663cd242
|
Auto-updated build strings.
|
2020-02-13 00:01:09 +01:00 |
|
artica
|
79fe01ee56
|
Auto-updated build strings.
|
2020-02-12 00:01:09 +01:00 |
|
Daniel Rodriguez
|
2b9b53f84a
|
Merge branch '4916-macros-no-funciona-versiones-nuevas' into 'develop'
Changed mode of decode_json
See merge request artica/pandorafms!2924
|
2020-02-11 13:20:16 +01:00 |
|
artica
|
0db7abbe9e
|
Auto-updated build strings.
|
2020-02-11 00:01:12 +01:00 |
|
artica
|
583c605b31
|
Auto-updated build strings.
|
2020-02-10 00:01:08 +01:00 |
|
artica
|
47b60c29d6
|
Auto-updated build strings.
|
2020-02-09 00:01:08 +01:00 |
|
artica
|
1be17441e7
|
Auto-updated build strings.
|
2020-02-08 00:01:08 +01:00 |
|
artica
|
0cb2f88540
|
Auto-updated build strings.
|
2020-02-07 00:01:25 +01:00 |
|
Daniel Rodriguez
|
f5cdb34167
|
Merge branch 'ent-5333-7076-encoding-iso-8859-15-enc-genera-badxml' into 'develop'
Ent 5333 7076 encoding iso 8859 15 enc genera badxml
See merge request artica/pandorafms!3037
|
2020-02-06 19:54:40 +01:00 |
|
artica
|
36fdaf3ff7
|
Auto-updated build strings.
|
2020-02-06 00:01:11 +01:00 |
|
artica
|
70e5486ce6
|
Auto-updated build strings.
|
2020-02-05 00:01:11 +01:00 |
|
fbsanchez
|
07e75761dd
|
CMDB integration needs
|
2020-02-04 12:58:35 +01:00 |
|
artica
|
3415838700
|
Auto-updated build strings.
|
2020-02-04 00:01:10 +01:00 |
|
artica
|
af7d1ea5f9
|
Auto-updated build strings.
|
2020-02-03 00:01:08 +01:00 |
|
artica
|
690f6e715d
|
Auto-updated build strings.
|
2020-02-02 00:01:08 +01:00 |
|
artica
|
3136563bba
|
Auto-updated build strings.
|
2020-02-01 00:01:09 +01:00 |
|
artica
|
7aa9a630d0
|
Auto-updated build strings.
|
2020-01-31 00:01:10 +01:00 |
|
artica
|
1134c041f2
|
Auto-updated build strings.
|
2020-01-30 00:01:08 +01:00 |
|
fbsanchez
|
668027e794
|
Merge remote-tracking branch 'origin/develop' into ent-5333-7076-encoding-iso-8859-15-enc-genera-badxml
|
2020-01-29 16:31:14 +01:00 |
|
fbsanchez
|
c8c2141f83
|
Added enc_dir to Encoding_Path (ExpatXS)
|
2020-01-29 16:31:08 +01:00 |
|
Daniel Rodriguez
|
783331d18b
|
Merge branch 'ent-5381-9482-problemas-windows-server-con-742fix' into 'develop'
Fix Windows strftime reference
See merge request artica/pandorafms!3032
|
2020-01-29 13:20:51 +01:00 |
|
artica
|
2f6fed368d
|
Updated version and build strings.
|
2020-01-29 10:13:37 +01:00 |
|
artica
|
395920f8eb
|
Auto-updated build strings.
|
2020-01-29 00:01:09 +01:00 |
|
fbsanchez
|
77863ae150
|
Fix Windows strftime reference
|
2020-01-28 20:15:53 +01:00 |
|
Daniel Rodriguez
|
914a796ce1
|
Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop'
Changed pandora server start for control if is needed add parameters.
See merge request artica/pandorafms!3017
|
2020-01-28 13:41:42 +01:00 |
|
artica
|
71cc1f4951
|
Auto-updated build strings.
|
2020-01-28 00:01:07 +01:00 |
|
artica
|
e35edd92b3
|
Auto-updated build strings.
|
2020-01-27 00:01:09 +01:00 |
|
artica
|
5dbb80287e
|
Auto-updated build strings.
|
2020-01-26 00:01:10 +01:00 |
|
artica
|
b4b1fbb3c1
|
Auto-updated build strings.
|
2020-01-25 00:01:10 +01:00 |
|
artica
|
ea3a317a1b
|
Auto-updated build strings.
|
2020-01-24 00:01:33 +01:00 |
|
artica
|
475517afd7
|
Auto-updated build strings.
|
2020-01-22 00:01:19 +01:00 |
|
artica
|
2a17065065
|
Auto-updated build strings.
|
2020-01-21 00:01:11 +01:00 |
|
artica
|
ba1f0b96b4
|
Auto-updated build strings.
|
2020-01-20 00:01:08 +01:00 |
|
artica
|
8eb77fa6cc
|
Auto-updated build strings.
|
2020-01-19 00:01:07 +01:00 |
|
artica
|
14de9f3c59
|
Auto-updated build strings.
|
2020-01-18 00:01:15 +01:00 |
|
Jose Gonzalez
|
867ae40b17
|
Changed pandora server start for control if is needed add parameters. Also, deleted default parameters
|
2020-01-17 22:58:45 +01:00 |
|
artica
|
cf4362e433
|
Auto-updated build strings.
|
2020-01-17 00:01:10 +01:00 |
|
Alejandro Fraguas
|
4e1c3a72a8
|
Merge branch 'ent-5187-modulos-remote_cmd-no-funcionan' into 'develop'
Set default rcmd_timeout=10 and new rcmd_timeout_bin token
See merge request artica/pandorafms!2990
|
2020-01-16 19:16:20 +01:00 |
|
Alejandro Fraguas
|
2189709cf6
|
Merge branch 'ent-5240-9303-bloqueos-discovery' into 'develop'
Fixed method calls in Base.pm
See merge request artica/pandorafms!2996
|
2020-01-16 13:06:28 +01:00 |
|
artica
|
40f03e5682
|
Auto-updated build strings.
|
2020-01-16 00:01:08 +01:00 |
|
artica
|
6bf5d07a2c
|
Auto-updated build strings.
|
2020-01-15 00:01:09 +01:00 |
|
artica
|
8038e16c25
|
Auto-updated build strings.
|
2020-01-14 00:01:11 +01:00 |
|
artica
|
2fa637ee4d
|
Auto-updated build strings.
|
2020-01-13 00:01:08 +01:00 |
|
artica
|
f7ea19863f
|
Auto-updated build strings.
|
2020-01-12 00:01:08 +01:00 |
|
artica
|
f4bc172355
|
Auto-updated build strings.
|
2020-01-11 00:01:09 +01:00 |
|
artica
|
467db373b7
|
Auto-updated build strings.
|
2020-01-10 00:01:55 +01:00 |
|
artica
|
d8b97885a9
|
Auto-updated build strings.
|
2020-01-09 00:01:13 +01:00 |
|
artica
|
64e63dad63
|
Auto-updated build strings.
|
2020-01-08 00:01:15 +01:00 |
|
artica
|
6e6e7ba249
|
Auto-updated build strings.
|
2020-01-07 00:01:09 +01:00 |
|
artica
|
ba9f6cd1a7
|
Auto-updated build strings.
|
2020-01-06 00:01:15 +01:00 |
|
artica
|
3f2884b282
|
Auto-updated build strings.
|
2020-01-05 00:01:08 +01:00 |
|
artica
|
9e5032e1e0
|
Auto-updated build strings.
|
2020-01-04 00:01:08 +01:00 |
|
fbsanchez
|
69be5aec24
|
Merge branch 'ent-5244-modulos-no-inicializan' into 'develop'
Fix perl date issue
See merge request artica/pandorafms!2997
|
2020-01-03 13:03:49 +01:00 |
|
artica
|
e66b8ca4e3
|
Auto-updated build strings.
|
2020-01-03 00:01:13 +01:00 |
|
fbsanchez
|
2e5a771663
|
timelocal to strftime
|
2020-01-02 16:00:01 +01:00 |
|
fbsanchez
|
14a2da39b1
|
minor fix
|
2020-01-02 15:49:32 +01:00 |
|
fbsanchez
|
dfca202dc4
|
Merge branch 'ent-5244-modulos-no-inicializan' of brutus.artica.es:artica/pandorafms into ent-5244-modulos-no-inicializan
Conflicts:
pandora_server/lib/PandoraFMS/Core.pm
|
2020-01-02 15:47:00 +01:00 |
|
fbsanchez
|
70d51413c9
|
timelocal to strftime
|
2020-01-02 15:46:27 +01:00 |
|
fbsanchez
|
fb3e395958
|
Fix perl date issue
|
2020-01-02 14:03:14 +01:00 |
|
fbsanchez
|
a3fdf4007d
|
Fixed method calls in Base.pm
|
2020-01-02 10:04:41 +01:00 |
|
artica
|
713737986b
|
Auto-updated build strings.
|
2020-01-02 00:01:10 +01:00 |
|
artica
|
d386d3c390
|
Auto-updated build strings.
|
2020-01-01 00:01:10 +01:00 |
|
artica
|
5b346c1ed9
|
Auto-updated build strings.
|
2019-12-31 00:01:11 +01:00 |
|
artica
|
287d377520
|
Auto-updated build strings.
|
2019-12-26 00:01:08 +01:00 |
|
artica
|
4294ec6d1b
|
Auto-updated build strings.
|
2019-12-25 00:01:11 +01:00 |
Enrique Martin
|
ea86205b36
|
Merge branch 'develop' into 'ent-5187-modulos-remote_cmd-no-funcionan'
Conflicts:
pandora_server/conf/pandora_server.conf.new
|
2019-12-24 10:49:44 +01:00 |
|
Alejandro Fraguas
|
5c0636b074
|
Merge branch 'ent-5203-incluir-ssh_launcher-en-config-pm' into 'develop'
Added ssh_launcher settings to pandora_Server
See merge request artica/pandorafms!2979
|
2019-12-24 10:03:37 +01:00 |
|
artica
|
d653b4d685
|
Auto-updated build strings.
|
2019-12-24 00:01:22 +01:00 |
|
Kike
|
0f34528f6f
|
Set default rcmd_timeout=10 and new rcmd_timeout_bin token
|
2019-12-23 17:28:40 +01:00 |
|
artica
|
cf8bf74cd4
|
Auto-updated build strings.
|
2019-12-23 00:01:17 +01:00 |
|
artica
|
59e91c0ed4
|
Auto-updated build strings.
|
2019-12-22 00:01:09 +01:00 |
|
artica
|
df704997e3
|
Auto-updated build strings.
|
2019-12-21 00:01:24 +01:00 |
|
artica
|
45a8904578
|
Auto-updated build strings.
|
2019-12-20 00:01:10 +01:00 |
|
fbsanchez
|
4197b7036b
|
Added ssh_launcher settings to pandora_Server
|
2019-12-19 11:48:20 +01:00 |
|
artica
|
f69d243330
|
Auto-updated build strings.
|
2019-12-19 00:01:09 +01:00 |
|
artica
|
dcd1bbd527
|
Auto-updated build strings.
|
2019-12-18 00:01:20 +01:00 |
|
artica
|
0b0c38f9c0
|
Auto-updated build strings.
|
2019-12-17 00:01:10 +01:00 |
|
artica
|
79cad3eaa9
|
Updated version and build strings.
|
2019-12-16 11:43:58 +01:00 |
|
artica
|
f7b0372e53
|
Auto-updated build strings.
|
2019-12-16 00:01:07 +01:00 |
|
artica
|
20f3583fc5
|
Auto-updated build strings.
|
2019-12-15 00:01:06 +01:00 |
|
artica
|
ebe0ba25c8
|
Auto-updated build strings.
|
2019-12-14 00:01:09 +01:00 |
|
artica
|
37c5acf4d1
|
Auto-updated build strings.
|
2019-12-13 00:01:12 +01:00 |
|
artica
|
dd49f0c91c
|
Auto-updated build strings.
|
2019-12-12 00:01:11 +01:00 |
|
artica
|
772b26ffcb
|
Auto-updated build strings.
|
2019-12-11 00:01:11 +01:00 |
|
Luis
|
01e3c8bcda
|
Ent 5004 crete event cli no funciona bien
|
2019-12-10 11:31:45 +01:00 |
|
artica
|
7a858fbc25
|
Auto-updated build strings.
|
2019-12-10 00:01:07 +01:00 |
|
artica
|
180d5842ee
|
Auto-updated build strings.
|
2019-12-09 00:01:08 +01:00 |
|
artica
|
8128f2605a
|
Auto-updated build strings.
|
2019-12-08 00:01:07 +01:00 |
|
artica
|
8f31fc21f1
|
Auto-updated build strings.
|
2019-12-07 00:01:07 +01:00 |
|
artica
|
f477014a1b
|
Auto-updated build strings.
|
2019-12-06 00:01:10 +01:00 |
|
artica
|
0263060639
|
Auto-updated build strings.
|
2019-12-05 00:01:09 +01:00 |
|
artica
|
0ba2d86971
|
Auto-updated build strings.
|
2019-12-04 00:01:08 +01:00 |
|
fbsanchez
|
a8a1b2bcc8
|
Fix ELK alerts
|
2019-12-03 19:54:09 +01:00 |
|
artica
|
60aaf4363e
|
Auto-updated build strings.
|
2019-12-03 00:01:07 +01:00 |
|
artica
|
80d5eea467
|
Auto-updated build strings.
|
2019-12-02 00:01:08 +01:00 |
|
artica
|
882198798a
|
Auto-updated build strings.
|
2019-12-01 00:01:06 +01:00 |
|
artica
|
a6f881c6fa
|
Auto-updated build strings.
|
2019-11-30 00:01:08 +01:00 |
|
artica
|
14999b7b84
|
Auto-updated build strings.
|
2019-11-29 00:01:08 +01:00 |
|
Jose Gonzalez
|
70780070bd
|
Changed mode of decode_json
|
2019-11-28 17:15:26 +01:00 |
|
artica
|
ec6d317bd4
|
Auto-updated build strings.
|
2019-11-28 00:01:09 +01:00 |
|
artica
|
d2fdc0cf9d
|
Auto-updated build strings.
|
2019-11-27 00:01:08 +01:00 |
|
fbsanchez
|
bf22ff7a50
|
minor fixes
|
2019-11-26 17:08:18 +01:00 |
|
fbsanchez
|
69b813390d
|
minor fix - removed trace
|
2019-11-26 15:49:28 +01:00 |
|
fbsanchez
|
a4db8483d1
|
Discovery Applications minor fixes - SAP backend
|
2019-11-26 15:47:04 +01:00 |
|
fbsanchez
|
c985f2d5f9
|
Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-26 10:50:51 +01:00 |
|
artica
|
b3fa4b7b7d
|
Auto-updated build strings.
|
2019-11-26 00:01:08 +01:00 |
|
fbsanchez
|
a854809247
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
|
2019-11-25 09:39:25 +01:00 |
|
artica
|
1592773b46
|
Auto-updated build strings.
|
2019-11-25 00:01:07 +01:00 |
|
artica
|
44311c0438
|
Auto-updated build strings.
|
2019-11-24 00:01:07 +01:00 |
|
artica
|
09e6615611
|
Auto-updated build strings.
|
2019-11-23 00:01:09 +01:00 |
|
fbsanchez
|
4e2bd7ed55
|
minor fixes
|
2019-11-22 20:49:46 +01:00 |
|
fbsanchez
|
5423e78d62
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/godmode/wizards/Wizard.main.php
pandora_console/include/functions_agents.php
pandora_console/include/styles/alert.css
pandora_console/pandoradb.sql
pandora_server/lib/PandoraFMS/Recon/Base.pm
|
2019-11-22 15:49:07 +01:00 |
|
artica
|
561e73d524
|
Updated version and build strings.
|
2019-11-22 10:03:53 +01:00 |
|
artica
|
b386da7da6
|
Auto-updated build strings.
|
2019-11-22 00:01:10 +01:00 |
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +01:00 |
|
fbsanchez
|
362837f856
|
updated default values for tevent_rule, new tokens for correlated alerts
|
2019-11-21 17:47:21 +01:00 |
|
artica
|
23e64ab781
|
Auto-updated build strings.
|
2019-11-21 00:01:18 +01:00 |
|
fbsanchez
|
e9432aaaa5
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-20 15:51:47 +01:00 |
|
artica
|
12123d68df
|
Auto-updated build strings.
|
2019-11-20 00:01:37 +01:00 |
|
fbsanchez
|
9cea131378
|
WIP CorrelatedAlerts
|
2019-11-19 23:35:29 +01:00 |
|
fbsanchez
|
471389a72a
|
Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-19 14:11:38 +01:00 |
|
fbsanchez
|
be1e4324d2
|
missed port
|
2019-11-19 12:02:10 +01:00 |
|
fbsanchez
|
0fd95647ea
|
log_window
|
2019-11-19 11:56:11 +01:00 |
|
artica
|
04076a04b1
|
Auto-updated build strings.
|
2019-11-19 00:01:12 +01:00 |
|
fbsanchez
|
83e7d5a701
|
Minor fixes
|
2019-11-18 19:32:57 +01:00 |
|
fbsanchez
|
1cacbbc08f
|
fix tools
|
2019-11-18 10:40:02 +01:00 |
|
fbsanchez
|
6fb2e3af81
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-18 10:05:40 +01:00 |
|
artica
|
73389a7164
|
Auto-updated build strings.
|
2019-11-18 00:01:07 +01:00 |
|
artica
|
39b449be9c
|
Auto-updated build strings.
|
2019-11-17 00:01:07 +01:00 |
|
artica
|
727b3bde5d
|
Auto-updated build strings.
|
2019-11-16 00:01:11 +01:00 |
|
fbsanchez
|
32466a5f0f
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-15 16:36:06 +01:00 |
|
artica
|
378192a449
|
Auto-updated build strings.
|
2019-11-15 00:01:12 +01:00 |
|
fbsanchez
|
f69b86663a
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
|
2019-11-14 21:40:35 +01:00 |
|
fbsanchez
|
3c87efe113
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-14 17:13:38 +01:00 |