c886dd1dfa
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
875d7ecaba
Unified sizes of the checkbox switch
...
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
d9e0f2ea42
Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
...
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
dc4d5b1bd7
fixed error in widget
...
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +01:00
7df9d4f78b
WIP: H&D merge
...
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
2019-02-14 17:14:01 +01:00
444b5c4bfd
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/install.php
Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
2019-02-14 07:51:53 +01:00
93edda07ee
fixed errors
...
Former-commit-id: 167c9a725e5dbd4f4ae1db0b6fb6c573a364c122
2019-02-13 07:55:21 +01:00
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
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
16c742bd83
fixed report pdf
...
Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
2019-02-08 14:10:19 +01:00
6dbeaf6307
Added more attributes to swith HTML element
...
Former-commit-id: aa567ef6f16e1e89489b16f808b00e772866ef86
2019-02-07 12:20:34 +01:00
37d02ddf59
Added disabled status to switches
...
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
dee7c769f2
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup_auth.php
pandora_console/godmode/setup/setup_ehorus.php
pandora_console/godmode/setup/setup_general.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/styles/pandora.css
modificado: pandora_console/include/functions_html.php
Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
2019-02-06 16:11:46 +01:00
b589826c86
Added HTML switch element
...
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
7d4fc056ca
fixed errors Qa
...
Former-commit-id: 9eea2ee2a3ec6bd51d0e7ef88b560e0475fe7504
2019-01-25 11:18:15 +01:00
fd2dcb3281
Changed radio buttons by toogle switch checkbox
...
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +01:00
4e6cf0182a
fixed error create modules network
...
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
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
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
9ca56c40ea
Added a new color input and a debug function
...
Former-commit-id: 657724102e35c49465119d2ef75e3363d4d0d878
2018-12-10 09:20:06 +01:00
dd7e623782
Fixed overflow in module data view
2018-11-13 17:04:14 +01:00
0f3717a268
Be able to change the subject and body of the report message when necessary
2018-11-02 12:57:52 +01:00
34bb73ac4b
add new params html_debug for strig in one line and new alias hd
2018-09-20 16:00:08 +02:00
764b1125bd
Generate session csrf code to avoid attacks in user edition
2018-09-13 15:19:08 +02:00
d3c3304976
Fixed pagination and added filter to All events
2018-08-14 10:40:56 +02:00
a5ff91185b
Fixed text format in html historic data
2018-08-13 12:41:09 +02:00
590373ab93
fixed minor error post process create agent
2018-07-31 15:25:44 +02:00
01997ff479
Added a select component to choose a timezone
2018-04-30 15:34:18 +02:00
6799f5f504
Added massive edit policy modules
2018-04-12 15:42:39 +02:00
f653fb0f26
Fixed month order on cron
2018-01-10 18:31:13 +01:00
fd66f84d0b
fixed minor errors
2017-12-19 09:57:52 +01:00
076e9cfec0
Changed period in functions_html
2017-10-09 12:25:01 +02:00
f67a4d90ae
Dynamic unit in massive edit modules
2017-09-25 14:51:45 +02:00
d7f3e1ecde
New feature. Dynamic units
2017-09-14 12:10:41 +02:00
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
f0e43e252c
New feature: Add groups to policies
2017-07-18 12:06:57 +02:00
57f6ad097a
update
2017-07-11 10:10:48 +02:00
cfc7050bab
Fixed post process in Edit modules in bulk
2017-06-30 14:18:23 +02:00
e243067c4b
New feature: Graphic grouping
2017-05-23 17:13:47 +02:00
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
727bd095f5
Added function to reset password in node
2017-04-20 10:59:32 +02:00
8531e9847b
Added lost id to dynamic threshold select
2017-04-18 17:46:50 +02:00
07e5274d0d
fixed error in login page errors and change icon pdf report
2017-03-22 15:26:54 +01:00
9354e845f7
Changed some icons
2017-02-28 19:17:38 +01:00
d0faeb3ec1
fixed errors in graphs
2017-02-16 11:18:42 +01:00
2cfce8979e
Added new funtion to module cron interval with "from" and "to" forms. Ticket #246
2017-02-13 11:32:04 +01:00
5d7d655833
Fix sound console for snmp traps alert, multiple selection and fix icons - #38
2017-02-02 17:46:59 +01:00
f9d6bbf323
UX console in progress... (ux console v3.0)
2017-01-20 12:20:00 +01:00
manuel
fbsanchez
daniel
fermin831
artica
Samuel Carcases
vgilc
Alejandro Gallardo Escobar
samucarc
danielmaya
artu30
enriquecd