20cebbe988
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
ca6fe42298
Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria
2019-09-13 12:00:04 +02:00
b18f72dcdd
Add new visual console Host Alive Keep Alive
2019-09-03 13:04:12 +02:00
11cb53582c
backup changes
2019-09-02 17:01:41 +02:00
0cb0a63a8f
Re-uploaded visual-console rack images and db data
2019-08-09 10:42:44 +02:00
17dc0b82ac
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-17 17:19:58 +02:00
3bbd01026e
WIP agent deployment
2019-07-15 19:37:04 +02:00
cac34e3311
Changed gray image in discovery - #4351
2019-07-12 10:21:54 +02:00
a8019fd223
Changed images with transparent borders - #4351
2019-07-11 10:49:48 +02:00
96fbca35a4
Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop'
...
Created black theme - #4194
See merge request artica/pandorafms!2564
2019-07-10 11:47:21 +02:00
0cccafc7be
Heartbeat gifs with black background - #4194
2019-07-08 10:37:34 +02:00
b6d551d583
Changed images with white background - #4194
2019-07-08 10:08:04 +02:00
1aa0131a81
Merge branch 'develop' into 'ent-4195-Status-sets-Visual'
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-07-02 11:42:19 +02:00
c24d7dbbda
new hearbeat designs
2019-06-24 19:28:19 +02:00
43b83af2c6
Changed default images status set for css - #4195
2019-06-24 11:59:17 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
c3ebe88178
style review
2019-06-18 17:40:31 +02:00
a87e3ce97e
Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop'
...
Fixed bug in Agent-Module fullscreen view
See merge request artica/pandorafms!2299
2019-06-18 17:00:15 +02:00
31905f005a
Visual changes in Agent/Module View - #3739
2019-06-11 17:34:13 +02:00
44803b6403
Merge remote-tracking branch 'origin/develop' into ent-3614-Vista-de-Servicios
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-05-30 11:09:15 +02:00
445cc8aab0
New styles for Services table view - #3614
2019-05-30 10:58:59 +02:00
22de7964c2
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 08:52:34 +02:00
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
0b4a076798
Changed image for severity in modal events window - #4102
2019-05-27 15:49:10 +02:00
5fe4a240be
se añade imagen y se quita de bbdd
...
Former-commit-id: 4d9174e95ffb6f5a35aa194177363c27dcd2c4a1
2019-05-14 09:47:45 +02:00
297f53b9de
Merge branch 'ent-3608-Update-Manager-Online' into 'develop'
...
Ent 3608 update manager online
See merge request artica/pandorafms!2379
2019-05-08 11:20:12 +02:00
5f729ef314
Changed success icon - #3608
...
Former-commit-id: 8e472206f96c7ea78184c330c57f4f79dc2556b6
2019-04-24 13:01:29 +02:00
194f4400f7
Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
...
Ent 3647 revision estilos discovery con la nueva linea de estilos
See merge request artica/pandorafms!2370
Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
ecd63667e5
New style for update manager online - #3608
...
Former-commit-id: 3cb6fb7aae2f73bc60e11cd97e3af0fda1c89354
2019-04-23 11:33:19 +02:00
0e02d71712
add missing image
...
Former-commit-id: 0e5c0140a919223403c33a7dde15f64fdde62ed8
2019-04-22 17:47:30 +02:00
973ce07811
New style for update manager online - #3608
...
Former-commit-id: 377766a3a53d111f3531bff9ea7796cc6d02c143
2019-04-22 16:56:31 +02:00
518a9a1eed
New style for update manager online - #3608
...
Former-commit-id: 8fb65c7064238d8f2180db6fedd99058667f804e
2019-04-22 15:41:57 +02:00
6594095de7
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop'
...
Ent 3707 nuevo diseño para las tablas
See merge request artica/pandorafms!2352
Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
2019-04-17 10:19:42 +02:00
7c8b1fcf27
Merge branch 'ent-3625-Aviso-No-acceso-a-página' into 'develop'
...
Ent 3625 aviso no acceso a página
See merge request artica/pandorafms!2357
Former-commit-id: 7e4824a223e85f73b02bf6b85c37a83dc137979b
2019-04-15 18:32:54 +02:00
29c282dc79
Changed popup no access - #3625
...
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
2019-04-15 14:42:58 +02:00
b50ed1c810
New arrow and timestamp images - #3707
...
Former-commit-id: 908928e47d7e635eee1e18925b176835f8e9c928
2019-04-12 10:41:55 +02:00
59c2734b5a
Deleted old files. Centered the map. Fixed broken image in meta. - #3806
...
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
2019-04-12 09:20:55 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
dcf40fed3d
Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop'
...
Ent 3610 vista edicion de usuario
See merge request artica/pandorafms!2278
Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0
2019-03-25 18:16:07 +01:00
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
151fe6ac78
Fixed a bug: show map image alternative when offline
...
Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810
2019-03-21 18:13:21 +01:00
d27c509817
Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario
...
Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c
2019-03-20 13:28:07 +01:00
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
0593e72f3e
move custom net scan and script to OPEN
...
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
99b1aadacb
discovery icon set
...
Former-commit-id: d88ba9c57d7a4c590e7a6965b2a4a9f7fd473790
2019-03-14 17:21:16 +01:00
750c64fbd7
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
aaf5d7bf89
New view user edit
...
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
Alejandro Campos
Tatiana Llorente
marcos.alconada
Luis Calvo
fbsanchez
Daniel Rodriguez
Alejandro Fraguas
Daniel Barbero