Commit Graph

14040 Commits

Author SHA1 Message Date
m-lopez-f 7dc9f9f21b Fixed styles of diferents graphs in dashboards when active mobile version. 2017-03-27 17:06:55 +02:00
vgilc ff55cd831a Merge branch 'cambio_logo_login_for_defect' into 'develop'
fixed custom logo login

See merge request !303
2017-03-27 12:25:58 +02:00
daniel 13620b1489 fixed custom logo login 2017-03-27 12:01:31 +02:00
vgilc ad77133ebd Merge branch '532-autenticacion-doble-metaconsola' into 'develop'
Fixed bug in qr

See merge request !271
2017-03-27 10:14:23 +02:00
artica 10b145463f Auto-updated build strings. 2017-03-27 00:01:16 +02:00
artica 149e8be750 Auto-updated build strings. 2017-03-26 00:01:17 +01:00
artica d1c4512977 Auto-updated build strings. 2017-03-25 00:01:19 +01:00
vgilc efa8a2c779 Merge branch 'feature/mr_um_online_open' into 'develop'
Fixed mr and um mix in um online open

See merge request !299
2017-03-24 11:40:55 +01:00
Arturo Gonzalez 277a3b656d Fixed mr and um mix in um online open 2017-03-24 11:22:30 +01:00
Ramon Novoa b574a92f35 Fix a typo. 2017-03-24 11:02:05 +01:00
artica bac8b24853 Auto-updated build strings. 2017-03-24 00:01:21 +01:00
vanessa gil 644eeaa7aa delete file 2017-03-23 16:51:00 +01:00
Ramon Novoa e5d29d4c3b Small speed optimization. Check parent_detection from the outer loop. 2017-03-23 16:15:57 +01:00
Ramon Novoa 895ec34a4f Remove the layer 2 recon script from the DB (not from the disk yet, for
upgrades).
2017-03-23 16:15:57 +01:00
vanessa gil d006c81eb0 delete files. 2017-03-23 15:53:44 +01:00
Ramon Novoa 81fc537426 Merge the Recon module from the Satellite Server. 2017-03-23 14:33:46 +01:00
Ramon Novoa 4886c8ffb7 Disable the VLAN cache by default. 2017-03-23 14:33:46 +01:00
Ramon Novoa c957faad18 Add support for high capacity counters. 2017-03-23 14:33:46 +01:00
vgilc 7f4bbb70df Merge branch 'cambio-menor-en-network-map-por-defecto-spring2' into 'develop'
fixed minor error in networkmap for defect spring2

See merge request !295
2017-03-23 13:26:32 +01:00
daniel 26acc537a4 fixed minor error in networkmap for defect spring2 2017-03-23 13:10:50 +01:00
daniel a57cf46179 Merge branch 'cambios_visuales_recorn_task' into 'develop'
fixed visual error in recorn task

See merge request !290
2017-03-23 10:13:36 +01:00
daniel 0c52b0487f fixed visual error in recorn task 2017-03-23 09:57:50 +01:00
artica db7d154aa9 Auto-updated build strings. 2017-03-23 00:01:20 +01:00
daniel a1b3c448a0 fixed macro prevdata for modules type string 2017-03-22 17:52:05 +01:00
daniel 173141c90a add news field trecorn-task migrate 2017-03-22 16:31:34 +01:00
daniel 81cf7aba11 add news checkbox for vlan_enabled and snmp_enabled 2017-03-22 16:30:15 +01:00
daniel aeb8e74bdc delete help in visual setup 2017-03-22 15:54:53 +01:00
daniel c309ec3ed4 fixed minor error 2017-03-22 15:41:34 +01:00
daniel 07e5274d0d fixed error in login page errors and change icon pdf report 2017-03-22 15:26:54 +01:00
vanessa gil b00ddd9beb new file. 2017-03-22 11:29:28 +01:00
vanessa gil 5cf45a08ec new file 2017-03-22 11:10:09 +01:00
vanessa gil 2b7e5de6a1 new file 2017-03-22 11:03:38 +01:00
vanessa gil f1a33bcc3e Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-22 10:48:37 +01:00
vanessa gil be188dcf68 new file 2017-03-22 10:47:51 +01:00
Junichi Satoh e1dea64ed7 Updated japanese translations. 2017-03-22 18:45:32 +09:00
vanessa gil 7c94400e7b MR 2017-03-22 10:29:10 +01:00
artica dc085fa339 Auto-updated build strings. 2017-03-22 00:01:19 +01:00
m-lopez-f 34ecf27ac4 Revert "Fixed name of agents in report Agents/Modules. Gitlab: #553"
This reverts commit b333e79ea8.
2017-03-21 16:53:03 +01:00
m-lopez-f b333e79ea8 Fixed name of agents in report Agents/Modules. Gitlab: #553 2017-03-21 16:50:27 +01:00
Arturo Gonzalez 6731eb7da4 Fixed async error 2017-03-21 15:13:04 +01:00
Arturo Gonzalez 576b834d25 Fixed error in rr 2017-03-21 14:58:42 +01:00
Arturo Gonzalez 8ae921402c Added mr folder cleaner 2017-03-21 14:48:12 +01:00
vanessa gil 0b564c2866 new file 2017-03-21 13:43:01 +01:00
vanessa gil 2994a9f8a1 new file. 2017-03-21 13:32:08 +01:00
Arturo Gonzalez f6b7c5ce19 Clean mr folder before um process 2017-03-21 13:29:06 +01:00
Arturo Gonzalez a8e1cdba8f Added a change when mr is in updated folder. 2017-03-21 13:24:15 +01:00
m-lopez-f e34ec2109a Fixed problem with extension backup. Add new column in migrate sql. 2017-03-21 13:15:45 +01:00
vanessa gil c23767c5d7 new mr file. 2017-03-21 13:11:17 +01:00
fermin c1f00a63a4 Merge branch 'ent-526-Las-graficas-estaticas-en-la-7-estan-mal' into 'develop'
Position watermark inside the static graphs

See merge request !284
2017-03-21 13:07:52 +01:00
Arturo Gonzalez e8fbd1f7d1 Added minor change to um and rr system 2017-03-21 12:57:02 +01:00