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
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
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
0124bd0a17
Added real notifications (not AJAX jet)
...
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
2019-02-08 14:23:05 +01:00
16c742bd83
fixed report pdf
...
Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
2019-02-08 14:10:19 +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
ba7540c9ee
improvement of optimization for list event
...
Former-commit-id: a7788b01160c661139e6a3a6aac70c69441265a1
2019-02-08 09:51:08 +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
c2a44e073f
Update events.build_query.php
...
Former-commit-id: 4622b27b1ce9e81ce81d89d7bc9d2eeb1b30fb93
2019-02-07 18:03:28 +01:00
681ad67028
ConsoleSuperviso - mailing support and minor fixes
...
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
2019-02-07 18:00:51 +01:00
f2f0578582
Fixed conflict
...
Former-commit-id: 9f2981e43d0ffc6f90c532c985944b32a82f6c3e
2019-02-07 17:59:55 +01:00
7fa344c2a4
Change the global configuration notification to AJAX
...
Former-commit-id: a9017377c8ed6780170c0f418ec3e9bc39f7782c
2019-02-07 17:53:09 +01:00
b96bf0e4b0
Fixed conflict
...
Former-commit-id: 9db99a8652b794c3e98c0372de6a43066886c5e4
2019-02-07 17:33:43 +01:00
23a8d0640f
Update events.build_query.php
...
Former-commit-id: 189244aa57d58eb33dd43f707eb6ac929f58e537
2019-02-07 17:05:05 +01:00
92af9f84bc
Fixed conflict
...
Former-commit-id: c0e0826c5a70772c049d9e0ce168f3d0b35118c0
2019-02-07 17:00:52 +01:00
8041c66f4c
Add _id_trap_ macro to snmp alert macros - #3439
...
Former-commit-id: 81fca58b445355834e136be8f0c09d6ea3a8f54f
2019-02-07 16:28:05 +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
92e2262440
Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
...
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
4d4b8bbc0d
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 792472b0cc9b3f1ae56894c53407419c7fbd573e
2019-02-07 10:30:23 +01:00
58f68438e6
Merge remote-tracking branch 'origin/develop' into ent-3214-exact-oid-matches
...
Former-commit-id: cd673c501161eebf338b95289cee01906d5fa0b7
2019-02-07 10:10:28 +01:00
f05011956f
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/install.php
Former-commit-id: cbe20ba58ef82cd1d8c833f34b20e74f16062434
2019-02-07 09:02:56 +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
8e20aab9f5
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/install.php
Former-commit-id: 71af17b203571dacf4f5e1976a0a8599d5b8730d
2019-02-07 08:43:18 +01:00
f14684b22d
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup.php
Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
2019-02-07 07:58:33 +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
d82529438c
Fixed commit
...
Former-commit-id: 6b2f2ee955c63da4e73fa0e2bef4c10496ea42eb
2019-02-06 20:12:17 +01:00
da14bbb66e
Fixed commit
...
Former-commit-id: 2d03897bfb48d40a85b24b9f7ee573dd1fadd7e2
2019-02-06 20:08:39 +01:00
9c623148f5
Fixed conflict
...
Former-commit-id: 02b3e0656041e5bdadf295177f0c29a81abf8c3f
2019-02-06 19:14:46 +01:00
fcb9275d11
Fixed conflict
...
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
f098b72fe4
Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop'
...
Fixed height in slicesbar graph of table interface snmp - #3274
See merge request artica/pandorafms!2144
Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf
2019-02-06 18:56:47 +01:00
986dfcb74d
Added basic and dummy user edit notifications
...
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
37d02ddf59
Added disabled status to switches
...
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
bf7e7f1e5c
Fixed merge errors
...
Former-commit-id: 30312c4b1ae7a3615576abbae90776f278586f27
2019-02-06 18:11:50 +01:00
Fermin
fbsanchez
manuel.montes
daniel
Daniel Maya
artica
samucarc
Samuel Carcases
enriquecd
Daniel Rodriguez
Alejandro Fraguas
Ramon Novoa
Tatiana Llorente