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

1413 Commits

Author SHA1 Message Date
vgilc 4cc3f0d426 Merge branch '1368-Problems-with-empty-networkmaps-dev' into 'develop' 
Fixed id of pandora node

See merge request !873
 2017-10-04 10:37:26 +02:00
Arturo Gonzalez 65bfedf404 Fixed id of pandora node 2017-10-03 10:32:22 +02:00
Arturo Gonzalez 8cd7b3205b Merge branch 'develop' into 1134-url-routes-analyzer-feature-dev 2017-09-28 16:29:23 +02:00
daniel e032f40525 fixed minor error TIP 2017-09-26 12:03:00 +02:00
daniel 00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
Arturo Gonzalez 7b437d612a Added with quiet agent to 2017-09-25 10:29:34 +02:00
Arturo Gonzalez 83e9276f1b Added iconin agent view 2017-09-25 10:25:12 +02:00
daniel 9337d33ceb tip in graph interfaces 2017-09-21 15:35:28 +02:00
Arturo Gonzalez 3652f0a0ea Merge branch 'develop' into 1134-url-routes-analyzer-feature-dev 2017-09-20 11:05:35 +02:00
Arturo Gonzalez eb03e4753e Minor change 2017-09-11 11:51:08 +02:00
vgilc ffdafce87b Merge branch '1094-no-filter-by-agent-in-status-monitor-dev' into 'develop' 
Added correct filter name

See merge request !652
 2017-09-11 09:26:40 +02:00
vgilc 99fa1d0aad Merge branch '1216-error-in-edit-networkmaps-open-dev' into 'develop' 
Fixed combo in editor

See merge request !747
 2017-09-11 09:19:59 +02:00
vgilc 054c13695c Merge branch '1203-Hora-descuadrada-en-caja-de-eventos-del-agente' into 'develop' 
Apply padding to event 24h event history bar for agent view - #1203

See merge request !738
 2017-09-08 10:01:47 +02:00
Arturo Gonzalez 2bb5c1e3b3 Added section to agent tabs 2017-09-08 09:01:58 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
daniel a64e0feba3 fixed minor error view snapshot WUX 2017-08-31 16:13:28 +02:00
enriquecd 68aa0f91ac Fix agent view remote config column order - #124 2017-08-30 17:30:36 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
Enrique Camargo 092bbd12ff Merge branch 'develop' into '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes' 
# Conflicts:
#   pandora_console/operation/agentes/estado_agente.php
 2017-08-28 12:32:06 +02:00
daniel 94cb6ee060 documentation wux 2017-08-24 14:04:12 +02:00
Arturo Gonzalez bc557573ec Fixed combo in editor 2017-08-23 10:19:56 +02:00
enriquecd f70763d739 Apply padding to event 24h event history bar for agent view - #1203 2017-08-21 10:48:03 +02:00
daniel 1b5979113a hidden tab wux 2017-08-18 12:42:48 +02:00
daniel ab3cd7dcc0 wux console view 2017-08-17 18:38:12 +02:00
Daniel Maya fba5a38482 Fixed time range with user no admin 2017-08-16 10:38:02 +02:00
Daniel Maya 2bcc01c9ba Fixed time range with user no admin 2017-08-09 11:33:12 +02:00
vgilc e250e0eeae Revert "Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop'" 
This reverts merge request !722
 2017-08-09 09:27:06 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
vgilc bbc54cfcfc Merge branch '890-No-esta-funcionando-el-GIS-en-Pandora-dev' into 'develop' 
Fixed display of data

See merge request !617
 2017-07-13 11:53:00 +02:00
vgilc 43f7bcde39 Merge branch '1041-module-charts-with-standar-perms-dev' into 'develop' 
Added second check to period field in module charts (admin have diferent field name)

See merge request !610
 2017-07-13 11:42:11 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
Arturo Gonzalez dac5b6f237 Added correct filter name 2017-07-10 10:04:04 +02:00
Arturo Gonzalez 242667e162 Fixed selector 2017-06-27 11:10:07 +02:00
Daniel Maya 8d378b4b60 Fixed display of data 2017-06-26 11:29:56 +02:00
vgilc a151a7e0b8 Merge branch '884-groups-hierachy-in-select-dev' into 'develop' 
Fixed groups select width

See merge request !523
 2017-06-23 14:02:50 +02:00
Arturo Gonzalez ec2872b83b Added second check to period field in module charts (admin have diferent field name) 2017-06-21 16:41:31 +02:00
daniel 80a38cbd9f add checkbox for show all events in view agent detail 2017-06-14 12:45:40 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
vgilc ef5680c718 Merge branch '877-bad-colours-and-status-hierachy-in-group-view-dev' into 'develop' 
Added changes to group view

See merge request !504
 2017-05-31 17:44:56 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
vgilc 70db081222 Merge branch '862-search-fields-going-wrong-dev' into 'develop' 
Added alias search to general search and case no case sensitive search to agent details search field

See merge request !466
 2017-05-31 17:39:44 +02:00
vgilc 05397a876f Merge branch '841-boolean-charts-in-agent-charts-section-dev' into 'develop' 
Added boolean modules to agent graphs section

See merge request !455
 2017-05-31 17:10:52 +02:00
Arturo Gonzalez f467d6d466 Fixed groups select width 2017-05-29 14:31:46 +02:00
Arturo Gonzalez 8b849efc3c Added changes to group view 2017-05-24 15:39:44 +02:00
Arturo Gonzalez 63129641eb Fixed free search 2017-05-23 16:54:24 +02:00
Arturo Gonzalez 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Arturo Gonzalez 4b94e7ce2b Added tag filter to module massive operations (edit and modules selection first) 2017-05-17 09:59:10 +02:00