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

14484 Commits

Author SHA1 Message Date
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
vgilc c66810afea Merge branch '847-networkmap-autorefresh-dev' into 'develop' 
Fixed networkmap path in auto-refresh white list

See merge request !452
 2017-05-31 17:09:00 +02:00
vgilc 7c038459d1 Merge branch '880-Barra-gris-en-consola-dev' into 'develop' 
Updated id module group

See merge request !505
 2017-05-31 17:06:44 +02:00
vgilc 08642eacd3 Merge branch '311-Filtrar-por-campo-personalizado-en-eventos' into 'develop' 
Free search input in event list view filter also by custom_data - #311

See merge request !486
 2017-05-31 17:06:10 +02:00
vgilc 956a4a1b20 Merge branch '866-fixed-free-search-field-in-monitor-detail-view-dev' into 'develop' 
Fixed free search

See merge request !499
 2017-05-31 17:03:10 +02:00
vgilc 00e73a8213 Merge branch '675-search-filter-by-start-date-and-end-date-dev' into 'develop' 
Added date filter in snmp console

See merge request !471
 2017-05-31 17:02:14 +02:00
vgilc 164e279dd5 Merge branch '849-remove-strict-acl-from-user-form-dev' into 'develop' 
Checkbox removed

See merge request !524
 2017-05-31 16:59:15 +02:00
vgilc 8eb4300e1a Merge branch '888-Last-contact-en-rojo-en-Agent-detail-Ext-4032' into 'develop' 
Ignore 0 value modules interval when check last contact in agent details - #888

See merge request !480
 2017-05-31 16:58:18 +02:00
vgilc 0b084667ad Merge branch '950-Bad-translation-do-networkmap-fail-dev' into 'develop' 
Changed text to fix it

See merge request !536
 2017-05-31 12:24:21 +02:00
Arturo Gonzalez bca10d7b5a Changed text to fix it 2017-05-31 12:16:18 +02:00
vgilc bad1a72c69 Merge branch 'update-japanese-help' into 'develop' 
japanese help for cascade protection.

See merge request !474
 2017-05-31 11:30:30 +02:00
vgilc 55d94f386e Merge branch 'update-japanese-help-alert_macros' into 'develop' 
Update japanese help for alert macros.

See merge request !483
 2017-05-31 11:30:19 +02:00
vgilc d4a448e2db Merge branch 'update-japanese-translation' into 'develop' 
Update Japanese translations.

See merge request !515
 2017-05-31 11:29:41 +02:00
artica 619014733b Auto-updated build strings. 2017-05-31 00:01:19 +02:00
vgilc 854b3ea0b7 Merge branch '940-visual-changes-from-MR-in-meta-and-node-dev' into 'develop' 
Changed text in header when mr file is available

See merge request !532
 2017-05-30 17:18:26 +02:00
vgilc 8cc7489650 Merge branch '941-Added-lost-querys-to-migrate-dev' into 'develop' 
Added los querys to migrate

See merge request !533
 2017-05-30 15:41:59 +02:00
Arturo Gonzalez 47862600a4 Added los querys to migrate 2017-05-30 15:33:16 +02:00
Arturo Gonzalez fe7b4257f0 Changed text in header when mr file is available 2017-05-30 13:59:47 +02:00
artica 3b481af7d6 Updated version and build strings. 2017-05-30 11:22:26 +02:00
vgilc a66cfdf9b0 Merge branch '931-spanish-translations-dev' into 'develop' 
Changes spanish translations

See merge request !530
 2017-05-30 11:02:17 +02:00
Arturo Gonzalez ab86e62cd9 Changes spanish translations 2017-05-30 10:43:24 +02:00
artica 05c9b7c4da Auto-updated build strings. 2017-05-30 00:01:17 +02:00
Arturo Gonzalez 90012f43ff Checkbox removed 2017-05-29 15:29:41 +02:00
vgilc f78288d556 Merge branch '930-reset-pass-translations-dev' into 'develop' 
Translations changed

See merge request !522
 2017-05-29 13:27:23 +02:00
Arturo Gonzalez a1063e9b50 Translations changed 2017-05-29 12:35:31 +02:00
vgilc 2664067813 Merge branch '635-moved-reset-password-token-in-setup-dev' into 'develop' 
Moved from ent to password

See merge request !521
 2017-05-29 12:31:24 +02:00
Arturo Gonzalez 9133f2edca Moved from ent to password 2017-05-29 12:20:07 +02:00
artica 0fe95248c1 Auto-updated build strings. 2017-05-29 00:01:13 +02:00
artica 63d3cefe0b Auto-updated build strings. 2017-05-28 00:01:12 +02:00
artica 5ca2065013 Auto-updated build strings. 2017-05-27 00:01:14 +02:00
Junichi Satoh b42bfb7793 Updated Japanese translations. 2017-05-26 18:03:05 +09:00
vgilc cca5f7d2ef Merge branch '922-fallo-en-menú-con-perfil-Operator-Read' into 'develop' 
Hide admin tools empty link in left menu bar for operator read users without permissions - #922

See merge request !514
 2017-05-26 10:03:24 +02:00
artica 474d22ed30 Auto-updated build strings. 2017-05-26 00:01:14 +02:00
enriquecd d413b7d22d Hide admin tools empty link in left menu bar for operator read users without permissions - #922 2017-05-25 18:37:26 +02:00
vgilc 8a1136d99e Merge branch '704-Agrupar-gráficas-dev' into 'develop' 
Fixed problem without graphics

See merge request !512
 2017-05-25 17:30:09 +02:00
vgilc 1ba43f4661 Merge branch '696-wrong-id-in-export-server-id-in-module-massive-operations-dev' into 'develop' 
Fixed wrong ids

See merge request !507
 2017-05-25 16:56:52 +02:00
Daniel Maya b3e530658a Fixed problem without graphics 2017-05-25 16:54:07 +02:00
vgilc 42c7474ceb Merge branch '903-No-funciona-agent-daemon-start-en-AIX' into 'develop' 
Load agent daemon for AIX in UNIX Daemon - #903

See merge request !510
 2017-05-25 12:57:34 +02:00
enriquecd 37d6d4aca0 Load agent daemon for AIX in UNIX Daemon - #903 2017-05-25 11:31:05 +02:00
vgilc d4c635d5f1 Merge branch '537-Removed-menu-options-in-dashboard-but-keep-cancel-zoom-dev' into 'develop' 
Works in good dashboards module graphs

See merge request !509
 2017-05-25 10:54:58 +02:00
Arturo Gonzalez 09b90be1ca Works in good dashboards module graphs 2017-05-25 10:08:30 +02:00
artica faa96927dd Auto-updated build strings. 2017-05-25 00:01:12 +02:00
Arturo Gonzalez 71b809ac25 Fixed wrong ids 2017-05-24 18:01:58 +02:00
Daniel Maya a8cae99747 Updated id module group 2017-05-24 16:17:43 +02:00
vgilc 44dc9128b2 Merge branch '537-Module-graphs-dev' into 'develop' 
537 module graphs dev

See merge request !503
 2017-05-24 14:14:16 +02:00
Arturo Gonzalez 20c205fbc9 Added good styles to graphs 2017-05-24 13:12:47 +02:00
Arturo Gonzalez 4a03298b69 Added unit to module name and recolocate yaxis label 2017-05-24 12:18:43 +02:00
vgilc 20599871a1 Merge branch '711-agent-name-en-lugar-de-alias' into 'develop' 
Remove quotation marks in agent deletion

See merge request !501
 2017-05-24 09:26:18 +02:00
vgilc af898c8b3d Merge branch '704-agrupar-gráficas-combinadas' into 'develop' 
704 agrupar gráficas combinadas

See merge request !500
 2017-05-24 09:25:11 +02:00
artica 42704e5981 Auto-updated build strings. 2017-05-24 00:01:10 +02:00