fbsanchez
|
332c53b098
|
change behaviour to avoid mr slow updates. Event extended
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
|
2019-02-11 19:46:46 +01:00 |
|
fbsanchez
|
72a57bfbec
|
minor changes in message edit
Former-commit-id: a36fe911f191c3a187c8c70032f3b1aaa0977fea
|
2019-02-11 19:27:21 +01:00 |
|
fbsanchez
|
be8877563b
|
Merge branch 'ent-3371-sistema-de-notificaciones-pandora' of brutus.artica.lan:artica/pandorafms into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: 5a0ef1ab4b8627f72158e3d012dd1d65e9852bcc
|
2019-02-11 18:28:05 +01:00 |
|
fbsanchez
|
0dbabd3ba3
|
Improved conversation view (messages) some filters and fixes in functions_messages
Former-commit-id: 13597c6556939bbe772d5ed749930e30e5377c47
|
2019-02-11 18:28:00 +01:00 |
fermin831
|
c355a581ff
|
Added toasts to notifications
Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821
|
2019-02-11 17:53:37 +01:00 |
daniel
|
4aae62ba36
|
Fixed error in reports
Former-commit-id: d3ad6cd8e1dd052fedc3dfe65bd5938537033f34
|
2019-02-11 17:05:05 +01:00 |
manuel.montes
|
8beba4569a
|
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
pandora_console/install.php
Former-commit-id: b910529699b6e6afaeea286ac43c89779b11a26e
|
2019-02-11 16:26:58 +01:00 |
|
manuel.montes
|
7150b8b758
|
restore install.php
Former-commit-id: 917f3d5d07b1bce92fa06836c5b2872dc06390d2
|
2019-02-11 16:08:36 +01:00 |
|
fbsanchez
|
d2649bb51c
|
fixed double count in read messages
Former-commit-id: e3661ad675c7dcd70fbea3bc5a41b3f103a376a0
|
2019-02-11 15:28:38 +01:00 |
Alejandro Fraguas
|
2ebbaf83c5
|
Merge branch '3241-Etiqueta_en_el_Menu_de_la_metaconsola' into 'develop'
Fixed Label in the Console Menu
See merge request artica/pandorafms!2123
Former-commit-id: ec997b149c6c480f74cb4fd71b7bc600cec40c19
|
2019-02-11 14:58:05 +01:00 |
|
fbsanchez
|
7893827652
|
fixed query notifications pending
Former-commit-id: ac8c5b5cb1276c16b9339e2e86c88d856540be0d
|
2019-02-11 14:51:59 +01:00 |
Daniel Rodriguez
|
e51864ac6f
|
Merge branch 'ent-3392-7367-estado-de-elemento-incorrecto-en-consola-visual' into 'develop'
Fixed agent status in visual map
See merge request artica/pandorafms!2148
Former-commit-id: d2dd7165a3dac9228948b8a1b8878b9fb3e2b491
|
2019-02-11 14:49:59 +01:00 |
|
fermin831
|
17c012cd83
|
Added update ball notifications
Former-commit-id: 60c253a1b64d1084ae732e88e0a6fb1f98cf8a12
|
2019-02-11 14:44:14 +01:00 |
|
fermin831
|
1223ce69da
|
Added missing docs
Former-commit-id: d0477e479f4ba4d138112de73746ca8173c9d563
|
2019-02-11 13:49:03 +01:00 |
|
fermin831
|
a50a251b00
|
Added filter to get last messages by notification ball
Former-commit-id: 57619fe6cd46f3f723c5b2c3bdbe3aa9ba155a0c
|
2019-02-11 13:35:36 +01:00 |
|
fermin831
|
e6dc69e3be
|
Added last_id to notification ball
Former-commit-id: f7095e633ce5799cf79bd20393e13e5b6233bf4c
|
2019-02-11 13:05:31 +01:00 |
|
manuel.montes
|
b9a09cef45
|
fixed bug in functions_reporting_html
Former-commit-id: 53fd11f9b6ff51c55c0009b1e1448834ed7f0161
|
2019-02-11 12:11:23 +01:00 |
|
manuel.montes
|
99c0da3a06
|
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
Conflicts:
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
Former-commit-id: 10d4c89ad8c6a124c9f31634dc4183e7380d49d7
|
2019-02-11 11:11:56 +01:00 |
|
Alejandro Fraguas
|
067d4e6c52
|
Merge branch '3265-Enlaces_cronjobs_desde_la_metaconsola' into 'develop'
Fixed link in cron job and visual console manager
See merge request artica/pandorafms!2115
Former-commit-id: f517823f225aee5e9739cce310e648400a99ebdc
|
2019-02-11 09:52:29 +01:00 |
artica
|
3acd6b8d31
|
Auto-updated build strings.
Former-commit-id: bb603dd63396712b8a649e3c08320653021c1289
|
2019-02-11 00:01:26 +01:00 |
|
artica
|
56797e717b
|
Auto-updated build strings.
Former-commit-id: 728a4013a020328735f2e76b4ecb49e87d815d10
|
2019-02-10 00:01:25 +01:00 |
|
artica
|
f992e7b1f4
|
Auto-updated build strings.
Former-commit-id: 7eb19cce56cb06b70ee9269f4b51d7b45b19f5d9
|
2019-02-09 00:01:35 +01:00 |
|
fbsanchez
|
e1d87ce0c8
|
minor fix falsse => false
Former-commit-id: 938e161b179736a3b72cad3f35db90a02e5d632c
|
2019-02-08 19:09:36 +01:00 |
|
fbsanchez
|
49cf9d5db0
|
Extended events
Former-commit-id: f2e0925ce58042dc9c9505a0d0fcf1a424c8a0bb
|
2019-02-08 19:07:49 +01:00 |
|
Fermin
|
d5d58e5b2b
|
Added outter shadow to notifications messages box
Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca
|
2019-02-08 18:53:28 +01:00 |
|
fbsanchez
|
091f6ace96
|
minor fixes and revised code style
Former-commit-id: aad587c578de99432dd759d6c82b622f6cd6c6e7
|
2019-02-08 17:30:47 +01:00 |
|
fbsanchez
|
a3a1bbb778
|
added missed new field extended_info for events
Former-commit-id: 8edb7cb854364259ffca27585e423464d213137a
|
2019-02-08 17:30:13 +01:00 |
|
manuel.montes
|
76259c3026
|
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 1ab951e0bf8984214f30d71c9585d232ba7c182c
|
2019-02-08 15:03:59 +01:00 |
|
daniel
|
801d67e690
|
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
Conflicts:
pandora_console/install.php
Former-commit-id: 0176b7cddb80b80e9a56571f89559a17e525cb79
|
2019-02-08 14:35:58 +01:00 |
|
Fermin
|
0124bd0a17
|
Added real notifications (not AJAX jet)
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
|
2019-02-08 14:23:05 +01:00 |
|
daniel
|
16c742bd83
|
fixed report pdf
Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
|
2019-02-08 14:10:19 +01:00 |
|
fbsanchez
|
7077d5d1ef
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3381-eventos-extendidos
Former-commit-id: e67aa2dd0d9aac3040bd1708cbf598e6d17dd2c8
|
2019-02-08 14:02:18 +01:00 |
|
fbsanchez
|
348a10cfe4
|
Added tevent_extended to db scripts
Former-commit-id: 5391b8dc0da2bc30bf92735f8604fe84456e992e
|
2019-02-08 13:59:48 +01:00 |
|
Fermin
|
4b86683d23
|
Fixed style
Former-commit-id: bd4c0370bb3c63eddb9a7b36b0e8f6938c48b4ae
|
2019-02-08 11:39:17 +01:00 |
Daniel Maya
|
63d589c918
|
Parameter changes deprecated in LDAP
Former-commit-id: 2accf38ffe089c19475b1956cf04da7769dca2e9
|
2019-02-08 11:34:47 +01:00 |
|
Fermin
|
80a5d0b0b9
|
Removed unused code and format some files
Former-commit-id: 5f8da31efc5241dd16002565fdb89d774072b7b3
|
2019-02-08 10:32:04 +01:00 |
|
Daniel Maya
|
ba7540c9ee
|
improvement of optimization for list event
Former-commit-id: a7788b01160c661139e6a3a6aac70c69441265a1
|
2019-02-08 09:51:08 +01:00 |
|
artica
|
e6abb61a13
|
Auto-updated build strings.
Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32
|
2019-02-08 00:01:29 +01:00 |
|
fbsanchez
|
e90d4b7256
|
Supervisor added blacklist to avoid mail twice
Former-commit-id: e2f03306076d90f9abe312694ea1fa2298ee7c62
|
2019-02-07 18:29:20 +01:00 |
|
fbsanchez
|
42b0afb884
|
Supervisor minor fixes
Former-commit-id: 84171e197df0a016a9a4b7d0e49f0412b65ee864
|
2019-02-07 18:07:52 +01:00 |
|
fermin831
|
04b2cb8665
|
Use real ids instead fake ids
Former-commit-id: 2360a14d1865f918247d23b2f3181626052cad60
|
2019-02-07 18:04:14 +01:00 |
|
Daniel Maya
|
c2a44e073f
|
Update events.build_query.php
Former-commit-id: 4622b27b1ce9e81ce81d89d7bc9d2eeb1b30fb93
|
2019-02-07 18:03:28 +01:00 |
|
fbsanchez
|
681ad67028
|
ConsoleSuperviso - mailing support and minor fixes
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
|
2019-02-07 18:00:51 +01:00 |
samucarc
|
f2f0578582
|
Fixed conflict
Former-commit-id: 9f2981e43d0ffc6f90c532c985944b32a82f6c3e
|
2019-02-07 17:59:55 +01:00 |
|
fermin831
|
7fa344c2a4
|
Change the global configuration notification to AJAX
Former-commit-id: a9017377c8ed6780170c0f418ec3e9bc39f7782c
|
2019-02-07 17:53:09 +01:00 |
|
samucarc
|
b96bf0e4b0
|
Fixed conflict
Former-commit-id: 9db99a8652b794c3e98c0372de6a43066886c5e4
|
2019-02-07 17:33:43 +01:00 |
Samuel Carcases
|
23a8d0640f
|
Update events.build_query.php
Former-commit-id: 189244aa57d58eb33dd43f707eb6ac929f58e537
|
2019-02-07 17:05:05 +01:00 |
|
samucarc
|
92af9f84bc
|
Fixed conflict
Former-commit-id: c0e0826c5a70772c049d9e0ce168f3d0b35118c0
|
2019-02-07 17:00:52 +01:00 |
enriquecd
|
8041c66f4c
|
Add _id_trap_ macro to snmp alert macros - #3439
Former-commit-id: 81fca58b445355834e136be8f0c09d6ea3a8f54f
|
2019-02-07 16:28:05 +01:00 |
|
fbsanchez
|
dc9decde42
|
ConsoleSupervisor
Former-commit-id: 3c40e628883f032a449862d0161659586819e6df
|
2019-02-07 16:24:49 +01:00 |