scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-14 00:54:32 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
..
assets Merge branch 'master' into rails-5.1 2017-08-07 08:45:53 +02:00
controllers Merge branch 'master' into rails-5.1 2017-08-07 08:45:53 +02:00
datatables Merge branch 'master' into rails-5.1 2017-08-07 08:45:53 +02:00
helpers Fix permissions for editing and deleting custom repository custom columns. [SCI-1524] 2017-07-28 12:01:11 +02:00
javascript/packs adds Redux and changes to index.jsx page 2017-07-28 10:52:25 +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-08-07 08:45:53 +02:00
services Merge branch 'master' into rails-5.1 2017-08-07 08:45:53 +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-08-07 08:45:53 +02:00