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

563 Commits

Author SHA1 Message Date
vgilc 14d683b003 Merge branch '2917-Error-al-cambiar-de-página-en-eventos-agrupados-por-agente' into 'develop' 
Changed url - #2917

See merge request artica/pandorafms!1869
 2018-11-30 13:08:53 +01:00
alejandro-campos 8371e75757 modified event list visualization 2018-11-26 16:40:20 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
vgilc 9b4eeb5c84 Merge branch '2723-Fallo-hint-en-eventos' into 'develop' 
new function that adds a border to the image if the status is warning - #2723

See merge request artica/pandorafms!1743
 2018-10-25 12:07:58 +02:00
tatiana.llorente@artica.es f96c626823 Changed url - #2917 2018-10-18 16:34:03 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
danielmaya 4558c909ef Changed source filter in event list 2018-10-10 16:57:04 +02:00
tatiana.llorente@artica.es eeba7b9350 Added two missing parameters in the url - #2884 2018-10-09 09:58:28 +02:00
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
samucarc 3c54710d1b Fixed conflicts 2018-10-03 13:09:39 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
tatiana.llorente@artica.es d36c10fa08 new function that adds a border to the image if the status is warning - #2723 2018-09-10 13:22:02 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
vgilc a4d1cfc9e6 Merge branch '2641-no-se-filtran-eventos-por-grupo-secundario-en-meta' into 'develop' 
2641 no se filtran eventos por grupo secundario en meta

See merge request artica/pandorafms!1688
 2018-08-16 11:03:02 +02:00
vgilc dc8020dbdc Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios' into 'develop' 
[Secondary groups] Fixed modules permissions in some views

See merge request artica/pandorafms!1669
 2018-08-16 09:46:28 +02:00
fermin831 05a0eb0db6 Fixed events secondary groups filter in metaconsole 2018-08-14 17:06:15 +02:00
fermin831 d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
alejandro-campos 097661d82b implemented sort filter to event view custom fields 2018-08-03 10:38:53 +02:00
alejandro-campos 01656f2e76 conflict resolution on branch 2389-Ordenar-eventos-por-campo 2018-08-02 10:27:31 +02:00
manuel.montes a476d008ac fix bug in metaconsole view events 2018-07-26 15:30:49 +02:00
samucarc 202f72d1c3 Fixed fields list in manage events-custom fields 2018-07-25 17:23:13 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
alejandro-campos 6ec4787c38 added order filters to events table 2018-07-10 15:11:18 +02:00
fermin831 288d2bafb6 Added in progres selected button to events view 2018-06-20 18:56:44 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 6bd672fd38 Fixed free search in events view 2018-05-31 20:32:04 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 ed18d58676 [Rebranding] Open operation/* 2018-05-14 15:52:51 +02:00
fermin831 fe124bff5f Fixed rss events due to secondary groups 2018-05-14 14:41:11 +02:00
vgilc d746af9c28 Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop' 
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso

See merge request artica/pandorafms!1442
 2018-05-09 10:24:19 +02:00
vgilc 96df6938fa Merge branch 'ent-1917-tmb-personalizacion-exportacion-csv-de-eventos' into 'develop' 
Ent 1917 tmb personalizacion exportacion csv de eventos

See merge request artica/pandorafms!1438
 2018-05-09 10:23:38 +02:00
fermin831 7162241ef9 Change the extension of CSV events file to .csv 2018-04-30 15:55:15 +02:00
fermin831 57c928ec8a [Events] Fixed csv export after secondary groups 2018-04-30 12:38:29 +02:00
fermin831 9c9f75152d Added custom confirm dialog to events 2018-04-25 12:34:33 +02:00
fermin831 112bbac527 Added id to in progress status bin icon (disabled) 2018-04-24 12:11:04 +02:00
fermin831 e09e1c4cd4 Fixed in progress event button in metaconsole and other problems 2018-04-24 11:54:45 +02:00
fermin831 a21eaafc61 Added in progress button to events list 2018-04-23 18:41:44 +02:00
fermin831 32f96c45ba [Events] Added ID to export CSV 2018-04-18 19:50:13 +02:00
fermin831 0b23f25455 [Events] Fixed csv export after secondary groups 2018-04-18 19:47:20 +02:00
danielmaya 70bf27f48a Added checking user tags in event list 2018-04-17 10:10:18 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
fermin831 f6e03c0faa [Secondary groups] Added secondary groups in some events queries 2018-04-09 17:01:39 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
fermin831 2839388e9e [Secondary Groups] More events fixes 2018-03-27 18:07:43 +02:00
fermin831 4d78b28d17 [Secondary Groups] Fixed grouped agents events in node 2018-03-27 17:53:11 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00