Commit Graph

10872 Commits

Author SHA1 Message Date
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
m-lopez-f 77ee30df20 Fixed merge request 2017-03-21 13:44:41 +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
fermin831 e3341ab15f Position watermark inside the static graphs 2017-03-21 12:33:00 +01:00
Daniel Maya 8cc316ff83 Fixed sql bug in custom report 2017-03-21 12:28:30 +01:00
vanessa gil d6fb515034 new file. 2017-03-21 12:23:46 +01:00
vanessa gil d5a70bc15e Deleted files. 2017-03-21 12:04:05 +01:00
daniel 8365afbe76 fixed errors in helps pandora and visual styles 2017-03-21 11:44:46 +01:00
Arturo Gonzalez b64afb7d6f Added a few changes to um and rr 2017-03-21 10:39:39 +01:00
vgilc 5278d2a8a8 Merge branch '98-agentes-codificados-en-vista-de-gis-data-dentro-de-la-vista-de-agente' into 'develop'
Show agent alias in gis maps with entities - #98

See merge request !281
2017-03-21 10:35:47 +01:00
artica e6ffb47535 Auto-updated build strings. 2017-03-21 00:01:17 +01:00
artica 53837de343 Auto-updated build strings. 2017-03-20 00:01:18 +01:00
artica 6610391bc3 Auto-updated build strings. 2017-03-19 00:01:15 +01:00
artica 40b3c318cd Auto-updated build strings. 2017-03-18 00:01:19 +01:00
Arturo Gonzalez d426cbbe4a Added the last correction to UM online open 2017-03-17 15:00:14 +01:00
Arturo Gonzalez c9fd56df75 Fixed errors in um online open 2017-03-17 14:22:04 +01:00
Arturo Gonzalez 8fc433f2a8 Added code to control the ocassional errors 2017-03-17 14:13:45 +01:00
Arturo Gonzalez 750203033f Added minor fixes to um open 2017-03-17 14:05:53 +01:00
Arturo Gonzalez 89727824a4 Fixed error in um online open 2017-03-17 13:56:38 +01:00
daniel aec7df9137 fixed minor error 2017-03-17 13:40:17 +01:00
daniel 4277661cc4 fixed minor errors in login page 2017-03-17 13:29:26 +01:00
Arturo Gonzalez aebbc783df Added changes to um online open to integrate mr 2017-03-17 13:27:06 +01:00
enriquecd 27d4a6c316 Show agent alias in gis maps with entities - #98 2017-03-17 11:55:34 +01:00
daniel 8d4b730b6c fixed minor errors 2017-03-17 11:37:43 +01:00
vanessa gil cb1cd58d83 new file 2017-03-17 11:36:10 +01:00
Arturo Gonzalez 011517f61d Fixed "cancel" text in offline um dialogs 2017-03-17 11:29:31 +01:00
m-lopez-f 26b3754ee8 Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541 2017-03-17 10:13:57 +01:00
daniel 060e8f1ddc merge develop 2017-03-17 10:12:53 +01:00
daniel 3c19207961 fixed images custom logo 2017-03-17 10:03:18 +01:00
Arturo Gonzalez 25fb6bd894 Added minor fixes to rr 2017-03-17 09:57:10 +01:00
fermin831 65033788f0 Added macro _agentos_ 2017-03-17 09:37:10 +01:00
daniel 3ff7d28240 fixed minor error in icon open source 2017-03-17 09:34:31 +01:00
daniel 3b54116147 fixed errors in css 2017-03-17 09:20:38 +01:00
Arturo Gonzalez 5a1192c412 Added more changes to um online open with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez ff596fa797 Added a lot of changes in update manager online open to integrate with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez cadfc0a30f Added code to rr system 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 54642bef87 Added more code to um and rr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 2e7f7a1a38 Added changes to rr apply 2017-03-17 09:19:55 +01:00
Arturo Gonzalez d5fd732d8c Added a few modifications in RR system 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 0321f8a895 Revert "Added some modifications about RR"
This reverts commit e9cb769cbf.
2017-03-17 09:19:55 +01:00
Arturo Gonzalez cc79905e6a Added some modifications about RR 2017-03-17 09:19:55 +01:00
enriquecd f0cbe509f9 Not show graph icons legend - #96 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 0ce515197b new sql mr 2017-03-17 09:19:55 +01:00
vanessa gil 08c20fcfab new file 2017-03-17 09:19:55 +01:00
Hirofumi Kosaka 6ef5614904 Fixed 2 wrong ACL check about reporting.
- 'IR' was required for listing custom graphs at editting items.
  - 'IW' was required for add/delete SLA items at editting SLA items
2017-03-17 09:19:55 +01:00
vanessa gil cb3c9c0cdb New file 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 5f72dbafcc Debug UM and RR system 2017-03-17 09:19:55 +01:00
artica a7fdf6b579 Auto-updated build strings. 2017-03-17 09:19:55 +01:00
enriquecd 8da7194590 Show agent - module in pdf reports item - #528 2017-03-17 09:19:55 +01:00
m-lopez-f 9b5a8773c3 Revert "Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533"
This reverts commit 4563ef34a4.
2017-03-17 09:19:55 +01:00
vanessa gil 16febc3d67 New mr. 2017-03-17 09:19:55 +01:00
m-lopez-f 4446cd1425 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-17 09:19:55 +01:00
Arturo Gonzalez f1ca499cd9 Update translations 2017-03-17 09:19:55 +01:00
vanessa gil f4051b825a Deleted files. 2017-03-17 09:19:55 +01:00
Arturo Gonzalez e7b811c39d Fixed error in um offline oum path to get mrs. 2017-03-17 09:02:40 +01:00
artica a9cc5cd593 Auto-updated build strings. 2017-03-17 00:01:18 +01:00
Arturo Gonzalez e713b843dc Added a message whe system have a mr pending 2017-03-16 19:18:42 +01:00
Arturo Gonzalez 831b5e2c7d Added a lot of modifications to integrate mr with um 2017-03-16 19:14:33 +01:00
Daniel Maya 317b5cfb04 Fixed the migration to pandora 7 2017-03-16 19:03:15 +01:00
daniel e888675766 fixed minor error 2017-03-16 18:43:07 +01:00
daniel 1325601082 fixed errors 2017-03-16 18:41:53 +01:00
Arturo Gonzalez 01b9572edc Added more changes to um online open with mr 2017-03-16 18:23:07 +01:00
Arturo Gonzalez b9702a5b00 Added a lot of changes in update manager online open to integrate with mr 2017-03-16 18:07:19 +01:00
Arturo Gonzalez c8a0946eda Added code to rr system 2017-03-16 16:28:27 +01:00
Daniel Maya 44231b6515 Fixed bug in qr 2017-03-16 16:14:11 +01:00
Arturo Gonzalez 54959257c0 Added more code to um and rr 2017-03-16 16:00:57 +01:00
Arturo Gonzalez 2b9e75237a Added changes to rr apply 2017-03-16 15:45:26 +01:00
Arturo Gonzalez c7fb00b46a Added a few modifications in RR system 2017-03-16 14:56:10 +01:00
daniel b9b040665e add new custom field in visual styles meta 2017-03-16 14:35:31 +01:00
Arturo Gonzalez 0c51650590 Revert "Added some modifications about RR"
This reverts commit e9cb769cbf.
2017-03-16 14:31:33 +01:00
Arturo Gonzalez e9cb769cbf Added some modifications about RR 2017-03-16 14:22:42 +01:00
enriquecd 8a547961c4 Not show graph icons legend - #96 2017-03-16 12:45:33 +01:00
fermin831 d7dcd7f339 Modified Zombie processes local_component 2017-03-16 12:23:43 +01:00
Arturo Gonzalez 37fd8f8851 new sql mr 2017-03-16 12:23:25 +01:00
vanessa gil 5d09cfdef3 new file 2017-03-16 12:03:29 +01:00
Hirofumi Kosaka f4c812c469 Fixed 2 wrong ACL check about reporting.
- 'IR' was required for listing custom graphs at editting items.
  - 'IW' was required for add/delete SLA items at editting SLA items
2017-03-16 19:54:05 +09:00
vanessa gil e7fa5d1f00 New file 2017-03-16 11:15:36 +01:00
Arturo Gonzalez 51cd53b3b3 Debug UM and RR system 2017-03-16 10:46:41 +01:00
m-lopez-f b937db8f35 remove debug console.log traces. 2017-03-16 09:10:22 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
enriquecd 00f0a171b4 Show agent - module in pdf reports item - #528 2017-03-15 18:45:52 +01:00
m-lopez-f 5d1088dfa9 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-15 17:23:26 +01:00
m-lopez-f 18123ac62d Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-15 17:23:08 +01:00
m-lopez-f 7a7a42b04e Revert "Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533"
This reverts commit 4563ef34a4.
2017-03-15 17:22:50 +01:00
vanessa gil 309ed42a8f New mr. 2017-03-15 17:20:16 +01:00
m-lopez-f 994432c335 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-15 17:19:07 +01:00
m-lopez-f 4563ef34a4 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-15 17:18:53 +01:00
Arturo Gonzalez e5011a010b Update translations 2017-03-15 17:13:21 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
vanessa gil def9172bb9 Deleted files. 2017-03-15 17:04:40 +01:00
daniel 6191ac705a delete img 2017-03-15 16:53:15 +01:00
daniel 3d4bd9f23a delete img 2017-03-15 16:52:15 +01:00
Arturo Gonzalez fa885faf8e Added a new fine filter to RR 2017-03-15 16:45:55 +01:00
Arturo Gonzalez 41f40d8310 Update translations in develop 2017-03-15 16:00:19 +01:00
vgilc 41c774ac99 Merge branch 'cherry-pick-22138f62' into 'develop'
DEVELOP::: Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529

See merge request !257
2017-03-15 15:58:45 +01:00
vanessa gil a094f67dd9 New file. 2017-03-15 15:50:36 +01:00
daniel aec0d91109 login page new 2017-03-15 15:23:28 +01:00
Arturo Gonzalez 794b292078 Changed translations in mr 2017-03-15 14:37:52 +01:00
Arturo Gonzalez d9d01a453a Added a last modifications to um offline and online open 2017-03-15 13:53:44 +01:00
Enrique Camargo b580793d5f Merge branch '95-query-sql-con-usuario-especifico-en-consola-snmp' into 'develop'
Filter snmp console sql sentence by user profile and group - #95

See merge request !255
2017-03-15 13:35:37 +01:00
Arturo Gonzalez 0db1dc50c7 Added a lot of code to um offline and online open. 2017-03-15 13:20:05 +01:00
m-lopez-f 22f7bae5ae Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529 2017-03-15 12:17:01 +01:00
Daniel Maya f00cf520ce Fixed problem with the module graph type line in the public visual console 2017-03-15 11:43:13 +01:00
enriquecd 52fb7ccfd7 Filter snmp console sql sentence by user profile and group - #95 2017-03-15 11:37:47 +01:00
vanessa gil 025b8329ea Deleted oracle and postgre files. 2017-03-15 10:34:25 +01:00
Arturo Gonzalez adb055b13c Added a lot of code to um and rr new system 2017-03-15 10:24:29 +01:00
daniel a87839bd07 login page 2017-03-15 10:12:18 +01:00
Arturo Gonzalez a4512ceae2 Added a few modifications to rr 2017-03-15 09:36:31 +01:00
Arturo Gonzalez ebf6c26e0a Added new translations to pandorafms. Ticket #347 2017-03-15 09:05:23 +01:00
Junichi Satoh c835f48b6f Updated Japanese translations. 2017-03-15 13:44:55 +09:00
artica 904e3142c8 Auto-updated build strings. 2017-03-15 00:01:18 +01:00
Arturo Gonzalez 3485497639 Remuve traces 2017-03-14 19:14:56 +01:00
Arturo Gonzalez 1adb43bfb0 Added a few things to um and rr 2017-03-14 19:11:39 +01:00
Arturo Gonzalez a582cb9204 Added a few things to mr 2017-03-14 18:53:49 +01:00
Arturo Gonzalez e7339e3f87 Added few things to mr 2017-03-14 18:37:24 +01:00
Arturo Gonzalez cdcd48ca17 Debug traces 2017-03-14 18:24:23 +01:00
Arturo Gonzalez cfcac5e95f Added a few things to mr 2017-03-14 18:17:06 +01:00
vanessa gil a85298d432 new file 2017-03-14 17:11:47 +01:00
vanessa gil 26339b39f0 delete file 2017-03-14 16:57:51 +01:00
vanessa gil 01945c3cb5 new mr 2017-03-14 16:56:00 +01:00
vanessa gil 32f984020b new mr
o
2017-03-14 16:51:38 +01:00
vanessa gil 2ccde70442 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-14 16:46:57 +01:00
vanessa gil cc39f6d1a8 New file. 2017-03-14 16:46:21 +01:00
Arturo Gonzalez 252b43122e Added a new index.pot 2017-03-14 16:29:58 +01:00
Arturo Gonzalez aa157b575d Added new translation and fix an error. 2017-03-14 16:28:30 +01:00
Arturo Gonzalez 00ffbb6fcb New index.pot. Ticket #347 2017-03-14 16:21:07 +01:00
Arturo Gonzalez 0b62513fea Updated translations. Ticket #347 2017-03-14 16:17:13 +01:00
Daniel Maya f4350aed6b Ticket 477. Fixed some bug in the visual console 2017-03-14 15:54:46 +01:00
vanessa gil fd4b62f604 Delete files 2017-03-14 15:47:11 +01:00
Arturo Gonzalez 6aa97917f2 Added new verification when mr filename is wrong. Ticket #510 2017-03-14 15:20:22 +01:00
Enrique Camargo 8b2c0d2e51 Merge branch '94-icono-fantasma-extension-fantasma' into 'develop'
Not show Check ACL extension tab in agent view - #94

See merge request !252
2017-03-14 14:10:57 +01:00
Arturo Gonzalez be6cc9ea79 Added the last dialog to um. Ticket #486 2017-03-14 13:52:29 +01:00
Arturo Gonzalez fe23e81481 Fixed negative id to pandorafms node in networkmaps. 2017-03-14 13:38:19 +01:00
enriquecd 79b5f73844 Not show Check ACL extension tab in agent view - #94 2017-03-14 13:28:39 +01:00
Daniel Maya cdd2363912 ticket 348. Fixed problem of access to the database 2017-03-14 13:14:39 +01:00
Arturo Gonzalez 36fda7a23d Added interface modules to db (to next relations with this interfaces) 2017-03-14 12:24:37 +01:00
vanessa gil f18f2e1068 New file. 2017-03-14 12:11:16 +01:00
Arturo Gonzalez 9cd9eb6fb4 Added filter to non-relation modules. (networkmap) 2017-03-14 11:30:41 +01:00
Arturo Gonzalez cb84e69ada Added warning img to mr advice. Ticket #486 2017-03-14 10:48:29 +01:00
Arturo Gonzalez 73c31012d9 Added new visual styles to um and rr systems. Ticket #486 2017-03-14 10:36:10 +01:00
vanessa gil f49d7f3eec New file. 2017-03-14 10:21:38 +01:00
Arturo Gonzalez 6f935f27ce Fixed recon task field to get subnet (networkmaps) 2017-03-14 08:53:41 +01:00
Arturo Gonzalez b70e8b8f6f Added all type of recon task to networkmap editor. 2017-03-14 08:35:16 +01:00
Ramon Novoa e12b7f0b58 Recon tasks do not generate random names currently. 2017-03-14 08:28:30 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
Enrique Camargo 294477a982 Merge branch '517-footer-metaconsola-vs-footer-consola-open' into 'develop'
Print metaconsole footer in buttom and change marks order - open - #517

See merge request !244
2017-03-13 17:46:42 +01:00
Arturo Gonzalez ca8910ad90 Added an image to new dialog styles. Ticket #486 2017-03-13 17:33:49 +01:00
artu30 2c8af1d54a Merge branch 'new_jquery_dialog_view' into 'develop'
New styles to jquery dialog. (Header done)

See merge request !250
2017-03-13 17:06:00 +01:00
artu30 7bca59dee1 Merge branch 'move_mr_to_um' into 'develop'
Move mr to um

See merge request !249
2017-03-13 16:45:54 +01:00
Arturo Gonzalez 6a39147940 Added rr to um offline. Ticket #510 2017-03-13 16:30:04 +01:00
Arturo Gonzalez 44ac96ae5e Added mr to um menu (online open and enterprise). Ticket #510 2017-03-13 15:52:30 +01:00
daniel 4e18b82165 Merge branch '493-fallan-los-adjuntos-de-graficas-en-los-envios-de-mail-de-alerta-open' into 'develop'
493 fallan los adjuntos de graficas en los envios de mail de alerta open

See merge request !248
2017-03-13 14:03:12 +01:00
daniel 5872cd1f49 fixed errors in install.php mysql 2017-03-13 13:32:05 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
enriquecd d87dae44db Select user_id(name inserted manually by user) info to show and order (fullname is empty often) - 92 2017-03-13 11:50:37 +01:00
daniel 43aaee9ae3 add templates for email in templates alerts and mail to admin command 2017-03-13 11:16:35 +01:00
m-lopez-f ed83c756e2 Fixed problems with search data in general search. Gitlab: #508 2017-03-13 09:49:19 +01:00
Arturo Gonzalez b5168928e8 Merge branch 'develop' into move_mr_to_um 2017-03-13 08:42:08 +01:00
daniel 7605de5794 Revert "add new templates for email in mail to admin and templates field3 and recovery"
This reverts commit c347164f73.
2017-03-13 08:40:20 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
enriquecd 6b625197ec Print metaconsole footer in buttom and change marks order - open - #517 2017-03-10 17:42:55 +01:00
daniel c347164f73 add new templates for email in mail to admin and templates field3 and recovery 2017-03-10 15:30:56 +01:00
Alejandro Gallardo Escobar c795f56feb Fixed functions_agents.php 2017-03-10 14:58:19 +01:00
Enrique Camargo 3902314e82 Merge branch '92-ordenacion-de-usuarios' into 'develop'
Massive operation profile actions - users select box  now is  ordered by user_id(primary name) - #92

See merge request !243
2017-03-10 14:20:14 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
enriquecd 1dce7623f8 Massive operation profile actions - users select box now is ordered by user_id(primary name) - #92 2017-03-10 13:58:36 +01:00
Alejandro Gallardo Escobar cc16225e31 Added a function to generate random identifiers for the agent name 2017-03-10 13:46:53 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
Arturo Gonzalez dfa7552fcd New styles to jquery dialog. (Header done) 2017-03-10 09:41:07 +01:00
artica 67a31f8a70 Auto-updated build strings. 2017-03-10 00:01:21 +01:00
enriquecd 94fceaaa5d Fix printing elements in visual console (revert) - #90 2017-03-09 19:52:37 +01:00
m-lopez-f a06389b652 Change size of rows in bulk add alerts. Gitlab: #490 2017-03-09 16:09:50 +01:00
m-lopez-f 8de4984faf Fixed dialog of system warning alerts. Gitlab: #506 2017-03-09 15:40:59 +01:00
m-lopez-f cb2ff6e9f8 Fixed problems with resize imgs when dont do it. Gitlab: #504 2017-03-09 12:50:51 +01:00
m-lopez-f 54d2ee6790 Remove file 2017-03-09 12:41:16 +01:00
daniel 66e7d71858 fixed errors in search tree view 2017-03-09 12:16:35 +01:00
m-lopez-f b0f600e9f0 Add AW acl in network exteension tool. Gitlab: #498 2017-03-09 11:55:12 +01:00
m-lopez-f baf16db154 Fixed problems with bulk delete alerts opertation. Gitlab: #492 2017-03-09 11:40:32 +01:00
Arturo Gonzalez 944f891f93 Added modules nodes to non interface relacions. 2017-03-09 11:20:06 +01:00
daniel b7d44c4c62 add new macro in helps 2017-03-09 11:14:58 +01:00
Arturo Gonzalez 65fcfd7f4c Fixed module type in map relations, again, and now its true. 2017-03-09 11:06:51 +01:00
daniel e5c0440d0b fixed errors in mail module_graph 2017-03-09 08:58:53 +01:00
Arturo Gonzalez 7dd279b902 Rewrite code to modules type cause it was broken. 2017-03-09 08:58:11 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00
artica b61f552649 Auto-updated build strings. 2017-03-09 00:01:19 +01:00
Arturo Gonzalez 6548443c82 Removed module tipe filter in networkmaps. 2017-03-08 16:09:08 +01:00
Ramon Novoa a832ae99ab Add icons for the Mainframe and Sync servers. 2017-03-08 14:59:24 +01:00
Arturo Gonzalez 7d6aae01cd Fixed interval field in recon task form 2017-03-08 13:56:10 +01:00
m-lopez-f 68803706d4 Add querys to remove from DB graph availability widget. Gitlab: #470 2017-03-08 13:53:24 +01:00
vanessa gil d79f2b421a Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-08 13:26:53 +01:00
vanessa gil 469c276512 Added file. 2017-03-08 13:26:06 +01:00
Arturo Gonzalez 1b1ab69edc Fixed holding area checking 2017-03-08 13:25:13 +01:00
Ramon Novoa dff80fed84 Add a new Recon module that will be used by the Satellite Server too. 2017-03-08 13:20:00 +01:00
vanessa gil d77ebf9c72 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-08 13:12:51 +01:00
vanessa gil bbab12f50e added file. 2017-03-08 13:12:31 +01:00
Enrique Camargo f9e52343df Merge branch '90-static-graph-se-redimensionan-en-consolas-visuales' into 'develop'
Use original size for elements smaller than 70 in render and viewer vconsole - #90

See merge request !237
2017-03-08 13:03:08 +01:00
Arturo Gonzalez 0fa2f9b355 Added service image in update, visual console. Ticket #473 2017-03-08 12:19:46 +01:00
enriquecd 07f0c405b3 Use original size for elements smaller than 70 in render and viewer vconsole - #90 2017-03-08 12:18:06 +01:00
m-lopez-f c7e1d682df Add access node in auth ad method in all cases. Gitlab: #367 2017-03-08 12:05:15 +01:00
vanessa gil ef0f55e2c2 added file. 2017-03-08 11:44:49 +01:00
daniel 07a58aa944 changes css for widget 2017-03-08 10:56:25 +01:00
artica 342bcbb4ef Auto-updated build strings. 2017-03-08 00:01:20 +01:00
daniel f0ca7d51ee add new images dashboard 2017-03-07 18:47:27 +01:00
enriquecd 65c31e9b7a Creator and updater palette respect original size for elements with lower than 150 size - #90 2017-03-07 17:28:22 +01:00
m-lopez-f e5ec0cb35a Kill pink unicorns 2017-03-07 16:30:40 +01:00
m-lopez-f ba423c93d8 Only view of system event of user that have admin powers. Gitlab: #455 2017-03-07 16:30:01 +01:00
Arturo Gonzalez 18848536be Added icons to services in viual consoles. Ticket #473 2017-03-07 16:07:21 +01:00
Daniel Maya b26863d7ac Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-03-07 15:36:25 +01:00
Daniel Maya d1302731b6 Added alias when creating and modifying agent 2017-03-07 15:36:04 +01:00
daniel a7a7a27225 fixed widgets groups status 2017-03-07 15:31:24 +01:00
Enrique Camargo 7be73cbfce Merge branch 'develop' into '84-el-tamano-de-las-graficas-no-respeta-lo-que-se-previsualiza-en-el-editor'
# Conflicts:
#   pandora_console/operation/visual_console/render_view.php
2017-03-07 13:19:34 +01:00
Arturo Gonzalez 121b57650f Fixed error in installation 2017-03-07 12:07:48 +01:00
Junichi Satoh c50fd249be Fixed error without enterprise. 2017-03-07 19:20:18 +09:00
Arturo Gonzalez 15bcd0add8 Changed visual styls of install page. Ticket #448 2017-03-07 10:59:22 +01:00
Daniel Maya 4b8ec8e5ae Added alias in api 2017-03-07 10:31:23 +01:00
daniel 7ecfe679ea fixed graph pie legend 2017-03-07 09:46:40 +01:00
daniel 9d3caa826d fixed label custom graph 2017-03-07 09:28:22 +01:00
daniel afecd9f4a4 fixed color in verical graph 2017-03-07 09:10:15 +01:00
daniel 24c4060ab1 fixed last in legend combined graph 2017-03-07 08:37:45 +01:00
Junichi Satoh c39657f233 Translated a help file into japanese. 2017-03-07 15:33:36 +09:00
Junichi Satoh df9bb41dea Updated Japanese translations. 2017-03-07 15:21:34 +09:00
artica 03741b62d9 Auto-updated build strings. 2017-03-07 00:01:16 +01:00
enriquecd a0b87859c5 Resize incident by status graph to have similar size to other graphs - #89 2017-03-06 18:11:58 +01:00
enriquecd 0acfe23e9d Fix newlines in reporting viewer and pdf generatos - #88 2017-03-06 17:07:29 +01:00
daniel 631a4d0777 fixed minor error in table metaconsole_agent 2017-03-06 16:19:03 +01:00
daniel 8bab8bbada add checkbox alias_as_name recon task 2017-03-06 16:10:07 +01:00
Arturo Gonzalez 5a612b3ab6 Added check to PNG extensions. Ticket #51 2017-03-06 15:32:24 +01:00
daniel c25595f64b add new checkbox for alias 2017-03-06 15:22:01 +01:00
daniel 74c8bf5539 fixed errors in custom graph pdf percentil 2017-03-06 15:19:19 +01:00
vgilc 7fc2e47b56 Merge branch '86-generacion-paquetes-para-pruebas-rolling-release' into 'develop'
Added new files.

See merge request !230
2017-03-06 14:19:39 +01:00
enriquecd db370619b4 Change url and params on hbar_graph, now show grpah in html and pdf - #87 2017-03-06 13:52:28 +01:00
vanessa gil eea926255b Added new files. 2017-03-06 13:44:41 +01:00
fermin831 223a9a6d0e Fixed events list view to Read only users 2017-03-06 13:23:29 +01:00
Arturo Gonzalez a46d4502e6 Removed oracle and postgre support on installation. Ticket #457 2017-03-06 12:55:54 +01:00
m-lopez-f 7f0359283d Fixed problems with ACL permmisions. Gitlab: #451 2017-03-06 12:54:48 +01:00
fermin831 395a73a868 Order top N ascending pie chart 2017-03-06 12:37:23 +01:00
daniel 96ca62b677 fixed error icons incidents for agents 2017-03-06 12:18:23 +01:00
Arturo Gonzalez 49204b6864 Changed generation method in agent_modules image. Ticket #376 2017-03-06 11:50:38 +01:00