fbsanchez
|
d6681cedd1
|
33 => 34
|
2019-10-28 12:18:13 +01:00 |
|
Alejandro Fraguas
|
ffb9b9052c
|
Merge branch 'ent-4848-phantomjs-se-queda-congelado' into 'develop'
Ent 4848 phantomjs se queda congelado
See merge request artica/pandorafms!2837
|
2019-10-28 11:53:47 +01:00 |
|
Daniel Rodriguez
|
08247c1952
|
Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop'
changed pandora api functions to include possibility of using agent alias when...
See merge request artica/pandorafms!2819
|
2019-10-28 11:25:38 +01:00 |
|
Alejandro Fraguas
|
405b91a2ac
|
Merge branch 'ent-3584-no-pasa-html_encode-al-alias-de-los-broker_agents' into 'develop'
Encode the agent alias with HTML entities.
See merge request artica/pandorafms!2836
|
2019-10-28 10:01:48 +01:00 |
|
artica
|
89cf58f814
|
Merge remote-tracking branch 'remotes/origin/ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into develop
|
2019-10-28 09:56:59 +01:00 |
|
alejandro-campos
|
b16ef248d6
|
minor fixes in cli and api functions
|
2019-10-28 09:48:52 +01:00 |
|
Daniel Barbero Martin
|
89b030c484
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-28 08:50:02 +01:00 |
|
artica
|
88a56a1f22
|
Auto-updated build strings.
|
2019-10-28 00:01:08 +01:00 |
|
artica
|
874ac0c630
|
Auto-updated build strings.
|
2019-10-27 00:01:07 +02:00 |
|
artica
|
8a03486dfc
|
Auto-updated build strings.
|
2019-10-26 00:01:09 +02:00 |
|
Daniel Barbero
|
f8c9b83a9c
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-25 13:46:08 +02:00 |
|
Daniel Barbero
|
c4aea1ac59
|
add styles validation form of modal
|
2019-10-25 13:28:01 +02:00 |
|
fbsanchez
|
21dd69706d
|
web2image
|
2019-10-25 13:16:06 +02:00 |
|
fbsanchez
|
440874d436
|
More controls for phantom web2image
|
2019-10-25 12:51:33 +02:00 |
|
fbsanchez
|
a2e96270a7
|
Avoid close cron sessions while gc
|
2019-10-25 12:24:02 +02:00 |
|
fbsanchez
|
2a24e22335
|
Avoid close cron sessions while gc
|
2019-10-25 12:23:00 +02:00 |
|
Ramon Novoa
|
d3971a3f90
|
Encode the agent alias with HTML entities.
Ref pandora_enterprise#3584
|
2019-10-25 11:08:47 +02:00 |
|
Daniel Barbero
|
22a2b7cd0b
|
Add feedback phpInfo
|
2019-10-25 10:43:03 +02:00 |
|
artica
|
86fd1275be
|
Auto-updated build strings.
|
2019-10-25 00:01:11 +02:00 |
|
Daniel Barbero Martin
|
3dee6888d6
|
fix
|
2019-10-24 17:42:37 +02:00 |
|
Tatiana Llorente
|
38b3490e4e
|
Changed color of constant to severity minor in events
|
2019-10-24 17:42:27 +02:00 |
|
Jose Gonzalez
|
c4c7d916e7
|
Applying of better way for save config
|
2019-10-24 17:21:21 +02:00 |
|
marcos
|
e725a0185b
|
cambios semi finales
|
2019-10-24 16:56:13 +02:00 |
|
Jose Gonzalez
|
b0db7c729d
|
Solved minor issues
|
2019-10-24 16:23:58 +02:00 |
|
Jose Gonzalez
|
742329336e
|
Added link with visual consoles
|
2019-10-24 14:30:34 +02:00 |
|
alejandro-campos
|
ee587a3117
|
Merge remote-tracking branch 'origin/develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name
|
2019-10-24 13:21:08 +02:00 |
|
alejandro-campos
|
a4988fe9af
|
modified get_events functions in functions_api
|
2019-10-24 13:18:26 +02:00 |
|
fbsanchez
|
a0c610d988
|
WS fixed audit origin address
|
2019-10-24 12:18:49 +02:00 |
|
fbsanchez
|
045d42d2bb
|
quickShell auth
|
2019-10-24 12:05:00 +02:00 |
|
Jose Gonzalez
|
29bcd379f7
|
Added changes for liking with visual consoles
|
2019-10-24 11:53:35 +02:00 |
|
fbsanchez
|
276879d8ee
|
clean cmd ws code style
|
2019-10-24 11:06:03 +02:00 |
|
fbsanchez
|
32cb12ca03
|
gotty refresh on ws restart
|
2019-10-24 11:04:38 +02:00 |
|
fbsanchez
|
df576a3b86
|
ws gotty credentials and ws gotty proxy redirection
|
2019-10-24 10:59:08 +02:00 |
|
fbsanchez
|
d34aa0917b
|
WS tick interval, WS manager able to limit connections per session
|
2019-10-24 10:35:16 +02:00 |
|
artica
|
38dfa5cf35
|
Auto-updated build strings.
|
2019-10-24 00:01:09 +02:00 |
|
fbsanchez
|
709f4cac81
|
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
|
2019-10-23 19:56:48 +02:00 |
|
Daniel Barbero Martin
|
de22fb70e3
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-23 19:51:49 +02:00 |
|
Daniel Barbero Martin
|
f06a55c6bb
|
continue feedback mail
|
2019-10-23 19:50:57 +02:00 |
|
fbsanchez
|
0d67d23cb6
|
quickShell support for ws_proxy_url
|
2019-10-23 19:19:38 +02:00 |
|
alejandro-campos
|
a06f56a413
|
added function to convert cidr prefixes to mask
|
2019-10-23 17:22:18 +02:00 |
|
Alejandro Fraguas
|
5364ef0fa1
|
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into 'develop'
Fix and control API sessions
See merge request artica/pandorafms!2830
|
2019-10-23 16:12:19 +02:00 |
|
Daniel Rodriguez
|
48fa310aa9
|
Merge branch 'ent-4819-No-funciona-llamada-API-get-events' into 'develop'
Ent 4819 no funciona llamada api get events
See merge request artica/pandorafms!2827
|
2019-10-23 15:53:30 +02:00 |
|
Tatiana Llorente
|
31c36dc015
|
Ent 4819 no funciona llamada api get events
|
2019-10-23 15:53:30 +02:00 |
|
fbsanchez
|
5cf7a0026e
|
minor changes and init.d script for websocket engine
|
2019-10-23 15:23:35 +02:00 |
|
fbsanchez
|
66ceb93d04
|
minor changes and init.d script for websocket engine
|
2019-10-23 15:23:21 +02:00 |
|
Alejandro Fraguas
|
8fd6f28070
|
Merge branch 'ent-4851-Cambio-de-color-en-la-union-de-agentes-del-GIS-map' into 'develop'
Changed color
See merge request artica/pandorafms!2831
|
2019-10-23 12:28:04 +02:00 |
|
Daniel Rodriguez
|
39b3a00276
|
Merge branch 'ent-4690-revision-completa-de-informes-templates-en-meta' into 'develop'
Fixed bugs in reports
See merge request artica/pandorafms!2796
|
2019-10-23 11:41:07 +02:00 |
|
Daniel Maya
|
c01a856826
|
Changed color
|
2019-10-23 11:17:16 +02:00 |
|
artica
|
1470241783
|
Auto-updated build strings.
|
2019-10-23 00:01:11 +02:00 |
|
fbsanchez
|
9edb77d288
|
proper logout (api)
|
2019-10-22 20:48:45 +02:00 |
|