459 commits

Author	SHA1	Message	Date
Luka Murn	1acf258c70	Fix minor Zmagohound comment	2017-01-14 10:00:52 +01:00
Luka Murn	bc03a26d4b	Also fix this new year issue on comments display	2017-01-12 15:06:12 +01:00
Luka Murn	8b01f912a0	Fix new year problems with activities ... Closes SCI-876.	2017-01-12 14:47:15 +01:00
Matej Zrimšek	30a9c283fb	Added back bullets to images in protocol preview in protocol repository.	2017-01-11 14:15:07 +01:00
Matej Zrimšek	852dc2eb7e	Added file downloading to protocol preview in protocol repository. [SCI-878]	2017-01-11 14:14:12 +01:00
okriuchykhin	3f930ccfce	Merge pull request #392 from okriuchykhin/ok_SCI_858 ... Fixes wrong samples info modals being shown in samples datatable [SCI-858]	2017-01-09 12:49:38 +01:00
mz3944	ef431da2db	Merge pull request #389 from mz3944/mz-sci-848 ... Unable to delete samples [SCI-848]	2017-01-09 11:57:48 +01:00
mlorb	f14ad0f762	Merge pull request #387 from mlorb/ml_sci_732 ... Add protocol preview to search results [SCI-732]	2017-01-09 11:28:04 +01:00
Oleksii Kriuchykhin	bc8db28746	Fixes wrong samples info modals being shown in samples datatable [SCI-858]	2017-01-09 09:38:42 +01:00
Matej Zrimšek	ec7a1cb4c0	Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848]	2017-01-06 14:23:20 +01:00
Mojca Lorber	aad2eadeae	syntax fix	2017-01-06 10:46:36 +01:00
Mojca Lorber	4e7e261225	fix protocol preview	2017-01-06 10:10:33 +01:00
Mojca Lorber	356edba1b3	add protocol preview to search results	2017-01-05 18:08:59 +01:00
Matej Zrimšek	4b0f47675a	Fixes experiment button not being clicable in project overview page. [SCI-849]	2017-01-05 14:42:52 +01:00
mlorb	59751ec41e	Merge pull request #373 from mlorb/ml_sci_709 ... Add Protocol Preview to Protocol repository [SCI-709]	2017-01-04 11:28:55 +01:00
Luka Murn	6402acc102	Merge pull request #377 from Ducz0r/lm-sci-820-fix ... Fix 2 bugs with comments editing [SCI-820]	2017-01-04 10:47:29 +01:00
Luka Murn	37cd6417c8	Merge pull request #374 from Ducz0r/lm-sci-808-814-fix ... Fix some bugs on sample groups & types page [SCI-808, SCI-814]	2017-01-04 09:50:26 +01:00
Mojca Lorber	a0704cd873	remove duplicated includes of css and js	2017-01-03 17:33:01 +01:00
Mojca Lorber	e555535dfb	add edit button to protocol preview modal	2017-01-03 10:04:14 +01:00
okriuchykhin	68ac3486c7	Merge pull request #381 from okriuchykhin/ok_SCI_275 ... Add task name to project activity [SCI-275]	2016-12-30 15:32:08 +01:00
okriuchykhin	cce57d066c	Merge pull request #370 from okriuchykhin/ok_SCI_817 ... Fix issue with long samples column names in import modal [SCI-817]	2016-12-30 15:29:32 +01:00
okriuchykhin	e8955b0304	Merge pull request #375 from okriuchykhin/ok_SCI_361 ... Add sorting to Project's experiments overview [SCI-361]	2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin	f076226b3f	Add task name to project activity [SCI-275]	2016-12-29 16:31:48 +01:00
Oleksii Kriuchykhin	d798f1b120	Fix XSS vulnerability in protocol keywords [SCI-632]	2016-12-29 15:15:29 +01:00
Luka Murn	b931b20f02	Fix 2 bugs with comments editing ... Closes SCI-820.	2016-12-23 20:41:23 +01:00
Oleksii Kriuchykhin	4d3e002c81	Add sorting to Project's experiments overview [SCI-361]	2016-12-23 15:40:01 +01:00
Luka Murn	4b50c73474	Merge pull request #363 from Ducz0r/lm-sci-546-fix ... Restyle step table display in reports [SCI-546]	2016-12-23 12:57:54 +01:00
Luka Murn	3922be2b17	Change String in sample types & groups ... Closes SCI-808.	2016-12-23 11:48:57 +01:00
Mojca Lorber	40e3240a99	add content to preview modal	2016-12-22 11:43:11 +01:00
Oleksii Kriuchykhin	53ea09c3de	Fix issue with long samples column names in import modal [SCI-817]	2016-12-21 14:34:53 +01:00
Luka Murn	a48eaf662e	Restyle step table display in reports so ... Closes SCI-546.	2016-12-19 15:09:49 +01:00
zmagod	efe41817f2	removes sample group/type link in new sample form [fixes SCI-809]	2016-12-19 10:49:21 +01:00
Zmago Devetak	c8631077df	Merge pull request #361 from biosistemika/improved-sample-table ... Improved sample table	2016-12-16 15:37:54 +01:00
zmagod	ba58ac2a77	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796	2016-12-15 09:26:12 +01:00
zmagod	4d6a85ed7c	fixed sample groups colorpicker [fixes SCI-781]	2016-12-15 09:23:38 +01:00
zmagod	b07f9fae59	fixes new sample group/type link in sample row [fixes SCI-796]	2016-12-15 09:23:38 +01:00
zmagod	6d2fb3b02c	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790	2016-12-14 17:05:00 +01:00
okriuchykhin	c4ff12be51	Merge pull request #349 from okriuchykhin/ok_SCI_783 ... Fix columns ordering when deleting custom fields [SCI-783]	2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin	fa1cf1f04d	Better handling of columns deleting with fixing columns ordering [SCI-783]	2016-12-14 15:23:00 +01:00
zmagod	1ff98bb6df	adds tooltip to samples dropdown and column names	2016-12-14 13:36:10 +01:00
zmagod	9037ab3f48	fixed navigation link	2016-12-14 10:35:48 +01:00
Mojca Lorber	2cfcba0ceb	add protocol preview modal	2016-12-13 10:39:18 +01:00
zmagod	4b0e2baa3f	fixes breadcrumbs in secondary nav	2016-12-12 16:03:14 +01:00
zmagod	8dd8a7e7cd	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777	2016-12-12 15:52:25 +01:00
zmagod	5176f8b459	clean unneeded code [fixes SCI-778] refactor js	2016-12-12 15:40:13 +01:00
zmagod	d9025a9601	changes create/edit mode buttons [fixes SCI-777]	2016-12-12 14:42:06 +01:00
zmagod	8bb452e4f7	trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]	2016-12-12 10:30:03 +01:00
Luka Murn	1a8b141b95	Add delete custom field functionality	2016-12-09 13:49:19 +01:00
Luka Murn	da630ac2cb	Make edit, delete buttons clickable & hide them if neccesary	2016-12-09 13:18:59 +01:00
Mojca Lorber	0e3526c9ad	Merge branch 'mlorb-ml-sci-696' into improved-sample-table ... Conflicts: app/assets/javascripts/samples/sample_datatable.js	2016-12-08 15:44:50 +01:00