Commit Graph

9786 Commits

Author SHA1 Message Date
fbsanchez c49c8bc0b5 discovery minor style changes
Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed
2019-02-15 18:44:59 +01:00
fbsanchez 5093094d7d H&D tasklist and some visual changes
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
2019-02-15 18:05:59 +01:00
manuel e04a61df98 Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices
Former-commit-id: 1744720e44aea863fb01c328cb2d25382d2c40a8
2019-02-15 14:03:29 +01:00
fbsanchez e397353f71 minor fix get_parameter_switch
Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a
2019-02-15 14:03:16 +01:00
manuel 32d34cd09b Changed styles in host and devices
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
2019-02-15 14:02:32 +01:00
fbsanchez efdc17b801 WIP: H&D
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
2019-02-15 13:08:44 +01:00
fbsanchez f777c59a83 WIP: H&D skel files css wiz&discov
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
2019-02-15 10:00:23 +01:00
fbsanchez 7df9d4f78b WIP: H&D merge
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
2019-02-14 17:14:01 +01:00
fbsanchez 8acb658266 WIP: H&D
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
2019-02-14 13:27:49 +01:00
fbsanchez 3e9e668e00 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
2019-02-14 10:59:27 +01:00
fbsanchez 6e7369d672 Merge branch 'ent-3381-eventos-extendidos' into 'ent-3430-discovery'
Ent 3381 eventos extendidos

See merge request artica/pandorafms!2169

Former-commit-id: b8a4fd52a30b8cc34c2417499ce3b4a60c027edf
2019-02-14 10:51:04 +01:00
fermin831 57991495e4 Use the CSV extension to import CSV on host and devices
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
2019-02-14 10:30:01 +01:00
fbsanchez 5b4cadf138 minor style fix
Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec
2019-02-13 17:16:12 +01:00
fbsanchez f75a292b34 minor fixes/updates in notifications UI
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
2019-02-13 16:40:37 +01:00
fbsanchez 7f4353c4bc optimized. events_has_extended_info
Former-commit-id: 2435badcea24fd5777bde358658409bf947a2d4b
2019-02-13 15:55:03 +01:00
fbsanchez 453c639c53 optimized. events_has_extended_info
Former-commit-id: 805b80f1a9e09425b0e5710906886ae39e791753
2019-02-13 15:54:40 +01:00
fermin831 9951aadab3 Fixed typo
Former-commit-id: 469f46c34caefcb6b810e99f88a9223434959182
2019-02-13 15:04:53 +01:00
fermin831 74e16b656b Disable max postpone select
Former-commit-id: 43460b3304b70d6d0248ace672d51c2b48c3d22c
2019-02-13 15:03:59 +01:00
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
fermin831 0ecf2bb9c4 Added pandora db messages purgue
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
2019-02-13 14:43:55 +01:00
fermin831 855822f61e Fixed arrow on notifications area
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
2019-02-13 12:44:30 +01:00
fermin831 fe50d6caff Open toasts and messages into new window
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
2019-02-13 11:09:15 +01:00
fermin831 48724fe033 Added onclick to notification-item's
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
2019-02-12 16:46:21 +01:00
fermin831 cc2b2709f9 Show the notifications with AJAX
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
2019-02-12 16:25:59 +01:00
fermin831 35ea03ddf6 Fixed notifications global configuration. Do not disable the multiple selects.
Former-commit-id: c5148e3adad63300c2b938a78eb46974cceff761
2019-02-12 15:36:41 +01:00
fermin831 325f5e8775 Added onclik con notification toasts
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
2019-02-12 15:27:14 +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 e744dd50eb [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 42dc0c60be supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +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 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
fbsanchez d2649bb51c fixed double count in read messages
Former-commit-id: e3661ad675c7dcd70fbea3bc5a41b3f103a376a0
2019-02-11 15:28:38 +01:00
fbsanchez 7893827652 fixed query notifications pending
Former-commit-id: ac8c5b5cb1276c16b9339e2e86c88d856540be0d
2019-02-11 14:51:59 +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
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
Fermin 0124bd0a17 Added real notifications (not AJAX jet)
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
2019-02-08 14:23:05 +01:00
Fermin 4b86683d23 Fixed style
Former-commit-id: bd4c0370bb3c63eddb9a7b36b0e8f6938c48b4ae
2019-02-08 11:39:17 +01:00
Fermin 80a5d0b0b9 Removed unused code and format some files
Former-commit-id: 5f8da31efc5241dd16002565fdb89d774072b7b3
2019-02-08 10:32:04 +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