scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-04 06:36:27 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
..
assets Merge branch 'master' into ux-release-1 2018-04-26 11:38:54 +02:00
controllers Merge branch 'master' into ux-release-1 2018-04-26 11:38:54 +02:00
datatables Merge branch 'master' into ux-release-1 2018-04-26 11:38:54 +02:00
helpers Merge branch 'master' into ux-release-1 2018-04-26 11:38:54 +02:00
javascript Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
mailers
middlewares fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284] 2018-04-10 13:19:53 +02:00
models Merge branch 'master' into ux-release-1 2018-04-26 11:38:54 +02:00
permissions Merge branch 'master' into ux-release-1 2018-04-26 11:38:54 +02:00
serializers
services Merge branch 'master' into ux-release-1 2018-04-26 11:38:54 +02:00
utilities Change default repository state to Ruby representation 2018-04-20 12:31:22 +02:00
views Merge branch 'master' into ux-release-1 2018-04-26 11:38:54 +02:00