fermin831
|
3c3d9daa09
|
Removed unwanted traces
Former-commit-id: 23e41d90e1ee5d94758c050de942b6f8fb779613
|
2019-02-12 15:29:28 +01:00 |
|
fermin831
|
325f5e8775
|
Added onclik con notification toasts
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
|
2019-02-12 15:27:14 +01:00 |
|
Ramon Novoa
|
fa7f519d34
|
Merged from develop.
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
|
2019-02-12 14:52:18 +01:00 |
|
manuel
|
27da41c7da
|
WIP Host&devices
Former-commit-id: cc18e55a30f72c606bb5b5736a5fa771987e0a45
|
2019-02-12 14:39:01 +01:00 |
|
manuel
|
0b26faad87
|
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
Conflicts:
pandora_console/install.php
Former-commit-id: 5f24ae2f22b85f461ee69c97b61f2ea3fd3c42f5
|
2019-02-12 13:54:52 +01:00 |
|
Ramon Novoa
|
6e236c404b
|
Merge remote-tracking branch 'origin' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
Former-commit-id: fa717670f0b841f81f0f8ee566be36203cd7eba6
|
2019-02-12 13:47:44 +01:00 |
|
fermin831
|
36dd59b250
|
Added changes without delete install.php
Former-commit-id: 686b0dc8e519283508f8f83ff663f6d3b79e7b80
|
2019-02-12 13:29:43 +01:00 |
|
fermin831
|
af90734436
|
Revert "Merged from discovery and validated"
This reverts commit e744dd50ebec8dfc7a2250dfad764371b855fcc8 [formerly af2047a38913f2763b68a8ec15b8f0cd58b8e676].
Former-commit-id: b32e3295f770a72ee587754b0d63ac8df1fd70f8
|
2019-02-12 13:29:04 +01:00 |
|
fbsanchez
|
e744dd50eb
|
Merged from discovery and validated
Former-commit-id: af2047a38913f2763b68a8ec15b8f0cd58b8e676
|
2019-02-12 13:14:22 +01:00 |
|
fbsanchez
|
166c3bbe88
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
|
2019-02-12 12:41:11 +01:00 |
|
fbsanchez
|
daa72a031a
|
Merge branch 'ent-3371-sistema-de-notificaciones-pandora' of brutus.artica.lan:artica/pandorafms into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: 9c321b0841261f1c44f7c809190c22acf20f5fa5
|
2019-02-12 12:27:48 +01:00 |
|
fbsanchez
|
9a3140baf2
|
notifications. Up to date
Former-commit-id: 80b94d79e7ad393fcaea63cbbd7f734a805da751
|
2019-02-12 12:27:32 +01:00 |
|
fbsanchez
|
54248661cf
|
Merge branch 'ent-1959-cron-supervisor-de-estado' into 'ent-3430-discovery'
Ent 1959 cron supervisor de estado
See merge request artica/pandorafms!2159
Former-commit-id: 806a9b9d0d26010eb98f59eaca8860d237cf13d8
|
2019-02-12 11:59:23 +01:00 |
|
fbsanchez
|
42dc0c60be
|
supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
|
2019-02-12 11:41:21 +01:00 |
|
fbsanchez
|
d40ced2043
|
alert_command send notification
Former-commit-id: ff0eb13b51cdab9c2d188362da0c8b2c4191b2cf
|
2019-02-12 11:16:34 +01:00 |
|
artica
|
bbd3cb79ce
|
Auto-updated build strings.
Former-commit-id: ca52afd38b1d242e4823639dd6c1e8cbc265ef04
|
2019-02-12 00:01:37 +01:00 |
|
fbsanchez
|
738443445c
|
minor fix in tevento db script
Former-commit-id: cb75a25c47f8025c4d9482ec0f8ebd64365073a7
|
2019-02-11 20:20:23 +01:00 |
|
fbsanchez
|
851050f04e
|
message_edit.css added
Former-commit-id: f4e88b813dc1b39e50b0f997ace3768a10f406f1
|
2019-02-11 19:48:20 +01:00 |
|
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 |
|