scinote-web/app
Mojca Lorber 0e3526c9ad Merge branch 'mlorb-ml-sci-696' into improved-sample-table
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
2016-12-08 15:44:50 +01:00
..
assets Merge branch 'mlorb-ml-sci-696' into improved-sample-table 2016-12-08 15:44:50 +01:00
controllers Merge branch 'mlorb-ml-sci-696' into improved-sample-table 2016-12-08 15:44:50 +01:00
datatables refactoring 2016-12-08 14:41:35 +01:00
helpers adds sample groups index page 2016-12-02 09:33:09 +01:00
mailers Bugfix for notification emails 2016-10-13 12:12:28 +02:00
models Merge branch 'mlorb-ml-sci-696' into improved-sample-table 2016-12-08 15:44:50 +01:00
utilities Also employ "no format" Nokogiri strategy when sanitizing 2016-11-17 16:43:14 +01:00
views Merge branch 'mlorb-ml-sci-696' into improved-sample-table 2016-12-08 15:44:50 +01:00