284 Commits

Author SHA1 Message Date
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
fermin831
6dbeaf6307 Added more attributes to swith HTML element
Former-commit-id: aa567ef6f16e1e89489b16f808b00e772866ef86
2019-02-07 12:20:34 +01:00
fermin831
37d02ddf59 Added disabled status to switches
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
fermin831
b589826c86 Added HTML switch element
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
artica
b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
daniel
7d4fc056ca fixed errors Qa
Former-commit-id: 9eea2ee2a3ec6bd51d0e7ef88b560e0475fe7504
2019-01-25 11:18:15 +01:00
daniel
4e6cf0182a fixed error create modules network
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
Samuel Carcases
f14acf12d2 Merge branch '1931_Cambiar_el_cuerpo_del_email_al_enviar_reportes' into 'develop'
Be able to change the subject and body of the report message when necessary

See merge request artica/pandorafms!1925

Former-commit-id: 18ef1606525fd0cf1ecd692fd156e3fd72f7ca43
2019-01-10 14:49:18 +01:00
vgilc
33f014695d Merge branch '3057-Agregar-token-barras-desplazamiento-en-vista-datos-de-modulo' into 'develop'
Fixed overflow in module data view

See merge request artica/pandorafms!1967

Former-commit-id: bfcf0c9c08953e1fa49e8731db808bc78ecc826b
2018-12-21 10:23:29 +01:00
Alejandro Gallardo Escobar
9ca56c40ea Added a new color input and a debug function
Former-commit-id: 657724102e35c49465119d2ef75e3363d4d0d878
2018-12-10 09:20:06 +01:00
manuel.montes
dd7e623782 Fixed overflow in module data view 2018-11-13 17:04:14 +01:00
samucarc
0f3717a268 Be able to change the subject and body of the report message when necessary 2018-11-02 12:57:52 +01:00
daniel
34bb73ac4b add new params html_debug for strig in one line and new alias hd 2018-09-20 16:00:08 +02:00
fermin831
764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
fermin831
d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
fermin831
a5ff91185b Fixed text format in html historic data 2018-08-13 12:41:09 +02:00
daniel
590373ab93 fixed minor error post process create agent 2018-07-31 15:25:44 +02:00
Alejandro Gallardo Escobar
01997ff479 Added a select component to choose a timezone 2018-04-30 15:34:18 +02:00
danielmaya
6799f5f504 Added massive edit policy modules 2018-04-12 15:42:39 +02:00
fermin831
f653fb0f26 Fixed month order on cron 2018-01-10 18:31:13 +01:00
daniel
fd66f84d0b fixed minor errors 2017-12-19 09:57:52 +01:00
Daniel Maya
076e9cfec0 Changed period in functions_html 2017-10-09 12:25:01 +02:00
Daniel Maya
f67a4d90ae Dynamic unit in massive edit modules 2017-09-25 14:51:45 +02:00
Daniel Maya
d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
vgilc
6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'
# Conflicts:
#   pandora_console/extras/mr/4.sql
2017-07-18 12:24:49 +02:00
Daniel Maya
f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Daniel Maya
57f6ad097a update 2017-07-11 10:10:48 +02:00
Daniel Maya
cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +02:00
Daniel Maya
e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
artu30
faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
2017-05-23 09:50:22 +02:00
Arturo Gonzalez
727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
Arturo Gonzalez
8531e9847b Added lost id to dynamic threshold select 2017-04-18 17:46:50 +02:00
daniel
07e5274d0d fixed error in login page errors and change icon pdf report 2017-03-22 15:26:54 +01:00
fermin831
9354e845f7 Changed some icons 2017-02-28 19:17:38 +01:00
daniel
d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00
Arturo Gonzalez
2cfce8979e Added new funtion to module cron interval with "from" and "to" forms. Ticket #246 2017-02-13 11:32:04 +01:00
enriquecd
5d7d655833 Fix sound console for snmp traps alert, multiple selection and fix icons - #38 2017-02-02 17:46:59 +01:00
Arturo Gonzalez
f9d6bbf323 UX console in progress... (ux console v3.0) 2017-01-20 12:20:00 +01:00
Arturo Gonzalez
defdd619ba Added new field to input text. (Transactional maps develop) 2016-11-22 14:16:56 +01:00
m-lopez-f
904ab2ba52 Fixed problems with post process select in updated module form. Ticket: #4182
(cherry picked from commit 789fde7eb140c136d05168200b59b2a46af76cec)
2016-11-14 10:56:43 +01:00
enriquecd
21ddb758ba Fix Dark background and comments for Enterprise popup community version - #65 2016-10-28 18:11:53 +02:00
daniel
bc5f00a2e7 fixed ticket 4123 and 4124 2016-10-24 17:43:54 +02:00
Arturo Gonzalez
6c185386ac Data precision... (Added integer controll between 0 and 5) 2016-10-18 11:25:36 +02:00
Arturo Gonzalez
13a19c42c2 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:30 +02:00
Arturo Gonzalez
3e50676e19 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:00 +02:00
daniel
d5d1727fe7 add new field for modules 2016-10-14 10:16:21 +02:00
Arturo Gonzalez
e3a6fada7f New networkmaps in progress... (To much changes in the maps form and more minor things) 2016-10-03 16:09:07 +02:00
enriquecd
78f5d79638 fix visual errors 2016-09-29 15:02:12 +02:00
enriquecd
e5c82954f3 repair visual bugs
(cherry picked from commit 79281250925232530bfc59297e51c43cef06f482)
2016-09-28 18:20:42 +02:00