36dd59b250
Added changes without delete install.php
...
Former-commit-id: 686b0dc8e519283508f8f83ff663f6d3b79e7b80
2019-02-12 13:29:43 +01:00
af90734436
Revert "Merged from discovery and validated"
...
This reverts commit e744dd50eb
2019-02-12 13:29:04 +01:00
e744dd50eb
Merged from discovery and validated
...
Former-commit-id: af2047a38913f2763b68a8ec15b8f0cd58b8e676
2019-02-12 13:14:22 +01:00
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
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
9a3140baf2
notifications. Up to date
...
Former-commit-id: 80b94d79e7ad393fcaea63cbbd7f734a805da751
2019-02-12 12:27:32 +01:00
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
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
d40ced2043
alert_command send notification
...
Former-commit-id: ff0eb13b51cdab9c2d188362da0c8b2c4191b2cf
2019-02-12 11:16:34 +01:00
738443445c
minor fix in tevento db script
...
Former-commit-id: cb75a25c47f8025c4d9482ec0f8ebd64365073a7
2019-02-11 20:20:23 +01:00
851050f04e
message_edit.css added
...
Former-commit-id: f4e88b813dc1b39e50b0f997ace3768a10f406f1
2019-02-11 19:48:20 +01:00
332c53b098
change behaviour to avoid mr slow updates. Event extended
...
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
2019-02-11 19:46:46 +01:00
72a57bfbec
minor changes in message edit
...
Former-commit-id: a36fe911f191c3a187c8c70032f3b1aaa0977fea
2019-02-11 19:27:21 +01:00
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
0dbabd3ba3
Improved conversation view (messages) some filters and fixes in functions_messages
...
Former-commit-id: 13597c6556939bbe772d5ed749930e30e5377c47
2019-02-11 18:28:00 +01:00
c355a581ff
Added toasts to notifications
...
Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821
2019-02-11 17:53:37 +01:00
d2649bb51c
fixed double count in read messages
...
Former-commit-id: e3661ad675c7dcd70fbea3bc5a41b3f103a376a0
2019-02-11 15:28:38 +01:00
7893827652
fixed query notifications pending
...
Former-commit-id: ac8c5b5cb1276c16b9339e2e86c88d856540be0d
2019-02-11 14:51:59 +01:00
17c012cd83
Added update ball notifications
...
Former-commit-id: 60c253a1b64d1084ae732e88e0a6fb1f98cf8a12
2019-02-11 14:44:14 +01:00
1223ce69da
Added missing docs
...
Former-commit-id: d0477e479f4ba4d138112de73746ca8173c9d563
2019-02-11 13:49:03 +01:00
a50a251b00
Added filter to get last messages by notification ball
...
Former-commit-id: 57619fe6cd46f3f723c5b2c3bdbe3aa9ba155a0c
2019-02-11 13:35:36 +01:00
e6dc69e3be
Added last_id to notification ball
...
Former-commit-id: f7095e633ce5799cf79bd20393e13e5b6233bf4c
2019-02-11 13:05:31 +01:00
e1d87ce0c8
minor fix falsse => false
...
Former-commit-id: 938e161b179736a3b72cad3f35db90a02e5d632c
2019-02-08 19:09:36 +01:00
49cf9d5db0
Extended events
...
Former-commit-id: f2e0925ce58042dc9c9505a0d0fcf1a424c8a0bb
2019-02-08 19:07:49 +01:00
d5d58e5b2b
Added outter shadow to notifications messages box
...
Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca
2019-02-08 18:53:28 +01:00
091f6ace96
minor fixes and revised code style
...
Former-commit-id: aad587c578de99432dd759d6c82b622f6cd6c6e7
2019-02-08 17:30:47 +01:00
a3a1bbb778
added missed new field extended_info for events
...
Former-commit-id: 8edb7cb854364259ffca27585e423464d213137a
2019-02-08 17:30:13 +01:00
0124bd0a17
Added real notifications (not AJAX jet)
...
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
2019-02-08 14:23:05 +01:00
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
348a10cfe4
Added tevent_extended to db scripts
...
Former-commit-id: 5391b8dc0da2bc30bf92735f8604fe84456e992e
2019-02-08 13:59:48 +01:00
4b86683d23
Fixed style
...
Former-commit-id: bd4c0370bb3c63eddb9a7b36b0e8f6938c48b4ae
2019-02-08 11:39:17 +01:00
80a5d0b0b9
Removed unused code and format some files
...
Former-commit-id: 5f8da31efc5241dd16002565fdb89d774072b7b3
2019-02-08 10:32:04 +01:00
e6abb61a13
Auto-updated build strings.
...
Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32
2019-02-08 00:01:29 +01:00
e90d4b7256
Supervisor added blacklist to avoid mail twice
...
Former-commit-id: e2f03306076d90f9abe312694ea1fa2298ee7c62
2019-02-07 18:29:20 +01:00
42b0afb884
Supervisor minor fixes
...
Former-commit-id: 84171e197df0a016a9a4b7d0e49f0412b65ee864
2019-02-07 18:07:52 +01:00
04b2cb8665
Use real ids instead fake ids
...
Former-commit-id: 2360a14d1865f918247d23b2f3181626052cad60
2019-02-07 18:04:14 +01:00
681ad67028
ConsoleSuperviso - mailing support and minor fixes
...
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
2019-02-07 18:00:51 +01:00
7fa344c2a4
Change the global configuration notification to AJAX
...
Former-commit-id: a9017377c8ed6780170c0f418ec3e9bc39f7782c
2019-02-07 17:53:09 +01:00
dc9decde42
ConsoleSupervisor
...
Former-commit-id: 3c40e628883f032a449862d0161659586819e6df
2019-02-07 16:24:49 +01:00
8054809dda
Merge branch '2931-Fallos_en_el_conteo_de_modulos_en_la_tabla_tagente' into 'develop'
...
Added new functionality in CLI and API to update module counts and alert counts
See merge request artica/pandorafms!2133
Former-commit-id: e5ee2c87fc7281ece82ace2d8b5654a1c278f60a
2019-02-07 13:10:56 +01:00
6781db847e
Merge branch 'fix/ipam' into 'develop'
...
added extra arguments to get_snmpwalk
See merge request artica/pandorafms!2165
Former-commit-id: 228fb731497708529ebbb2214f74688deff6d70e
2019-02-07 13:08:28 +01:00
f4c22d2250
added extra arguments to get_snmpwalk
...
Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153
2019-02-07 13:01:21 +01:00
fb814680db
Added some well formatted docs
...
Former-commit-id: 30aa9de2e1b3835f96adf2fbec24bfd5ab17e7c2
2019-02-07 12:57:51 +01:00
cf5716e569
supervisor added subtype to tmensajes
...
Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16
2019-02-07 12:56:48 +01:00
39d0bf0d0a
Merge branch '3446-Imagen-grupos-no-se-muestra-None' into 'develop'
...
Don't show image for groups without icon - #3446
See merge request artica/pandorafms!2145
Former-commit-id: 6bdfdcc0b84e7dcb228faf98470ea062f850c613
2019-02-07 12:38:50 +01:00
d5fb9f1051
Added AJAX to user notification config window
...
Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b
2019-02-07 12:22:50 +01:00
6dbeaf6307
Added more attributes to swith HTML element
...
Former-commit-id: aa567ef6f16e1e89489b16f808b00e772866ef86
2019-02-07 12:20:34 +01:00
4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
1f3fe51f69
Auto-updated build strings.
...
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
2019-02-07 00:01:40 +01:00
9ea3980b26
wip supervisor
...
Former-commit-id: 991922a7dd18ace8fd831d02ada2cf20e81d27c2
2019-02-06 20:22:22 +01:00
fermin831
fbsanchez
artica
Daniel Rodriguez
Alejandro Fraguas
Tatiana Llorente