tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,678 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

106 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
alejandro.campos@artica.es 71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es 5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
Daniel Rodriguez 1ab4e89a14 Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop' 
fix empty check condition

See merge request artica/pandorafms!3359
 2020-08-07 09:46:09 +02:00
Luis 35f231ac8c Restored alert actions help (needed for macros) 2020-08-07 09:36:43 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
alejandro-campos 0ef7ff1198 fix empty check condition 2020-07-06 14:35:22 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Tatiana Llorente 8c86019037 Ent 5583 bug comando de alerta 2020-03-18 12:25:29 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
manuel 85f4301e4c Fixed bugs in alert actions 2019-12-05 16:43:26 +01:00
vgilc 810fe8f860 Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'" 
This reverts merge request !2886
 2019-12-03 15:59:08 +01:00
Jose Gonzalez d181d5357b Created function for initialize TinyMCE 2019-11-26 13:19:28 +01:00
Tatiana Llorente 9a17a02d61 Fixed bug with line breaks in alert commands 2019-11-14 12:29:02 +01:00
Daniel Rodriguez c5be8e55ae Merge branch 'ent-3807-html-special-chars-conversion' into 'develop' 
Ent 3807 html special chars conversion

See merge request artica/pandorafms!2320
 2019-06-25 12:19:01 +02:00
manuel 6bd8221bc0 changed helps 
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
 2019-04-29 14:36:02 +02:00
Luis Calvo 4c95a160de Changed Jquery .text for .html for html conversion 
Former-commit-id: 9dd9c63e637e504ff51e38165687bacfae59ed38
 2019-04-01 17:57:22 +02:00
Alejandro Gallardo Escobar d38236091b Format fixes 
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
 2019-02-01 09:55:29 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
fermin831 4308c3f92e Added acl to alert commands select 2018-10-23 10:53:09 +02:00
fermin831 d8a7ebea08 Only change the group to all grupo if neccesary when command is changed 2018-10-22 16:26:58 +02:00
fermin831 f537dbb961 Validate the group command on action creation 2018-10-22 16:19:29 +02:00
fermin831 acad8d537b [Rebranding] Added tooltip to avoid Monitoring Event name will be changed 2018-05-24 11:37:26 +02:00
fermin831 db16a797f3 [Secondary Groups] Assign secondary groups by AJAX on agent edit view 2018-03-22 13:34:15 +01:00
danielmaya 3a3de49802 Fixed text/html option in alert action 2018-01-15 11:04:53 +01:00
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
vgilc 27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'" 
This reverts merge request !862
 2017-10-16 16:44:44 +02:00
daniel 9a66aa52f2 add send mail plain/text 2017-09-27 13:42:02 +02:00
Arturo Gonzalez 600f4bc364 Changed bad jquery get call in alert actions and alerts snmp. 2017-05-08 15:54:35 +02:00
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
 2015-05-06 17:02:40 +02:00
m-lopez-f 50e6fd2bab Fixed error when load data in action alert in manage alerts, tiquet: #2088 2015-05-06 13:09:45 +02:00
mdtrooper f84863540f Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
m-lopez-f c7b3104224 In alert command preview is not array but contain data, create textarea instead of select 2015-03-26 15:33:37 +01:00
mdtrooper 7883e08af5 Working in the files for the next cherry pick. 2015-03-10 15:36:23 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
Alejandro Gallardo Escobar a3783f70e1 Now the alert action command fields can have a HTML wysiwyg editor 2015-02-04 16:52:28 +01:00