scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
scinote-web/app
History
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
..
assets Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
controllers Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
datatables Fix bug with linked tasks 2016-08-24 17:22:16 +02:00
helpers Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
mailers Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
models Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
utilities Fix activity in first time generator 2016-08-18 08:33:08 +02:00
views Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00