scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-11 09:26:37 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1 
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
..
assets Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
controllers Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
datatables Fix datatables [SCI-1409] 2017-07-03 15:33:50 +02:00
helpers fixes smart annotations bug in reports [fixes SCI-1328] 2017-06-27 11:26:32 +02:00
mailers adds input_sanitizer helper in app mailer [fixes SCI-1185] 2017-04-07 15:01:26 +02:00
models Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
services/import_repository fix hound 2017-06-21 15:01:55 +02:00
utilities Added updated_at values and unnecessary migration rollback [fixes SCI-1145] 2017-05-11 11:08:36 +02:00
views Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00