scinote-web/app
okriuchykhin 35b8638598 Merge pull request #446 from okriuchykhin/ok_SCI_902_v2
Add sanitization of group/type to sample edit [SCI-902]
2017-01-25 12:05:30 +01:00
..
assets Fixes merge conflicts with smart-annotations branch 2017-01-24 15:20:50 +01:00
controllers Add sanitization of group/type to sample edit [SCI-902] 2017-01-24 16:58:03 +01:00
datatables Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
helpers Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
mailers
models Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
utilities Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
views fix table titles 2017-01-25 11:01:35 +01:00