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

14610 Commits

Author SHA1 Message Date
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +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
enriquecd d33621ffa7 Fill empty data in graphs with last known data, no with nodata point - #937 2017-05-30 16:34:30 +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 33534244c8 Fixed general item in reports 2017-05-29 17:03:52 +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
Arturo Gonzalez 54b70e5927 Changed custom graph size specs in visual console 2017-05-26 12:55:37 +02:00
Daniel Maya b7e7e9e66a Changed current_package_enterprise 2017-05-26 11:15:00 +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
Arturo Gonzalez 2e71af2568 Added new visual styles to event sound console 2017-05-25 17:11:35 +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
enriquecd df715561d7 Format module inventary to show only changes on events - #523 2017-05-24 18:24:53 +02:00
Arturo Gonzalez 71b809ac25 Fixed wrong ids 2017-05-24 18:01:58 +02:00
Arturo Gonzalez 3155b81eb5 Added correct path to images in login page background 2017-05-24 17:09:44 +02:00
Daniel Maya a8cae99747 Updated id module group 2017-05-24 16:17:43 +02:00
Arturo Gonzalez 8b849efc3c Added changes to group view 2017-05-24 15:39:44 +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