Commit graph

68 commits

Author SHA1 Message Date
Mojca Lorber 0e14420193 fix bugs with importing samples 2017-09-06 14:41:14 +02:00
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
Oleksii Kriuchykhin efd03db6db Further samples import improvement [SCI-101] 2017-07-25 10:56:07 +02:00
Oleksii Kriuchykhin 67b0c78593 Improve samples import speed [SCI-101] 2017-07-24 17:33:13 +02:00
Oleksii Kriuchykhin 6c33b46f6a Improve import of repository records plus tsv file import fixes [SCI-1487] 2017-07-20 11:44:10 +02:00
zmagod 525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
zmagod 819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
Oleksii Kriuchykhin e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
Zmago Devetak 4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119
Add images to fields with rich text formatting
2017-05-08 13:06:58 +02:00
zmagod 0e383109a1 refactor query 2017-04-26 13:32:03 +02:00
zmagod 615bbb9967 make search for users case insensitive [fixes SCI-1192] 2017-04-25 15:33:51 +02:00
zmagod ed24448817 adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203] 2017-04-25 14:24:05 +02:00
zmagod 55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod 9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Oleksii Kriuchykhin 42ccefe2ce Remove logs table and old unused logging code [SCI-1127] 2017-03-30 11:47:57 +02:00
zmagod be5faad97c fixes hound 2017-01-31 13:33:55 +01:00
zmagod f04a2f663a renamed organizations in config/ 2017-01-25 12:30:11 +01:00
zmagod a193850ae6 rename models where org/organization 2017-01-24 16:34:21 +01:00
Renamed from app/models/organization.rb (Browse further)