411 commits

Author	SHA1	Message	Date
Luka Murn	3bee9d2e12	Save an (yet unworking) version of user smart annotations ... Used so other devs can start working on smart annotations.	2017-01-04 10:54:02 +01:00
Luka Murn	23e60e0d01	Add Gems for smart annotations (atwho)	2017-01-04 10:51:55 +01:00
Oleksii Kriuchykhin	0d01a4b2bd	Remove unneeded function from utils.js [SCI-819]	2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin	4065be9e4e	Fix marking of selected option [SCI-819]	2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin	e22ff6f8bb	Fix an issue with sample editing and type/group dropdowns [SCI-819]	2016-12-30 15:50:43 +01:00
okriuchykhin	2474eac37d	Merge pull request #367 from okriuchykhin/ok_SCI_818 ... Fix sample info popup [SCI-818]	2016-12-30 15:43:28 +01:00
okriuchykhin	e826791429	Merge pull request #365 from okriuchykhin/ok_SCI_807 ... Fix buttons disappear when deleting columns in samples [SCI-807]	2016-12-30 15:43:13 +01:00
okriuchykhin	73478d7b5e	Merge pull request #372 from okriuchykhin/ok_SCI_816 ... Fix flash message display in samples table [SCI-816]	2016-12-30 15:30:14 +01:00
Oleksii Kriuchykhin	e156dbc987	Implement flash message hiding through module pattern [SCI-816]	2016-12-28 14:52:03 +01:00
mlorb	876ce37a96	Merge pull request #366 from mlorb/ml-sci-284 ... Samples - freeze header row and edit button... [SCI-284]	2016-12-23 12:29:41 +01:00
Luka Murn	5beaa26224	Update utils.js ... Closes SCI-811.	2016-12-22 10:03:00 +01:00
Oleksii Kriuchykhin	ee5e0ad455	Fix flash message display in samples table [SCI-816]	2016-12-21 17:26:33 +01:00
Luka Murn	af6bf2aee1	Fix jQuery selector, make it work for new samples	2016-12-21 16:23:09 +01:00
Luka Murn	e52277bdad	Fix sample types & groups when editing sample in samples table ... Closes SCI-811.	2016-12-21 13:15:55 +01:00
Oleksii Kriuchykhin	034976a709	Fix sample info popup [SCI-818]	2016-12-20 17:21:17 +01:00
Mojca Lorber	ba0214d1ff	staying on same page after saving a sample; fix button disappearance when adding new column	2016-12-20 15:19:31 +01:00
Mojca Lorber	165ec6144c	adjust columns width in table header when editing or adding new sample; and fix horizontal scrolling	2016-12-20 13:41:19 +01:00
Oleksii Kriuchykhin	42f71f4da8	Fix buttons disappear when deleting columns in samples datatable [SCI-807]	2016-12-20 09:49:21 +01:00
Mojca Lorber	d1e2354f4e	add scrolling functionality and remove bug with adding new column	2016-12-19 16:59:09 +01:00
zmagod	6f7f6a8b7f	removes dropdown sorting [fixes SCI-811]	2016-12-19 16:41:14 +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
Zmago Devetak	c9d38a5454	Merge pull request #359 from ZmagoD/zd_SCI_804 ... disables sorting and columns dropdown when editing or adding new samp…	2016-12-16 12:56:11 +01:00
Zmago Devetak	601594fdb9	Merge pull request #355 from ZmagoD/zd_fix_mozilla_compatibility_issue ... fixes compatibility issue on mozilla firefox	2016-12-16 11:57:18 +01:00
Zmago Devetak	b35744d18e	Merge pull request #360 from ZmagoD/zd_update_gemfile ... updated gemfile	2016-12-16 11:53:05 +01:00
zmagod	897e34a23b	reinitialize highlight.js after ajax call	2016-12-16 11:44:42 +01:00
Zmago Devetak	ad9b25ba44	Merge pull request #356 from ZmagoD/zd_SCI_803 ... fixes bug with long column names in edit mode [fixes SCI-803]	2016-12-16 11:02:42 +01:00
Zmago Devetak	3d500800cd	Merge pull request #358 from ZmagoD/zd_SCI_805_801 ... removes error message from new type/group form [fixes SCI-805]	2016-12-16 10:54:23 +01:00
zmagod	25671c744a	disables sorting and columns dropdown when editing or adding new sampe [fixes SCI-804]	2016-12-16 09:50:45 +01:00
zmagod	fffa0d91da	removes error message from new type/group form [fixes SCI-805]	2016-12-15 16:17:34 +01:00
zmagod	7c88f3e0aa	fixed empty name error	2016-12-15 15:50:07 +01:00
zmagod	6755ebcbf8	fixes bug with long column names in edit mode [fixes SCI-803]	2016-12-15 15:26:51 +01:00
Zmago Devetak	daee14bed5	Merge pull request #343 from ZmagoD/zd_SCI_780 ... fixed step description links [fixes SCI-780]	2016-12-15 13:12:25 +01:00
zmagod	dc6e9dcbd8	fixes compatibility issue on mozilla firefox	2016-12-15 11:57:17 +01:00
Mojca Lorber	69d164da68	add new column on first position	2016-12-15 11:20:40 +01:00
zmagod	9083f84396	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_789	2016-12-15 11:03:19 +01:00
zmagod	3e31f114d4	app/assets/javascripts/samples/sample_datatable.js	2016-12-15 10:51:17 +01:00
zmagod	b164886270	fixed error mesage scroll	2016-12-15 10:44:23 +01:00
zmagod	b003d192c3	fixed edit mode	2016-12-15 09:54:38 +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	54fee339f8	cleanup unneeded code	2016-12-15 09:23:38 +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
zmagod	dfd472d37d	fixed column name after edit	2016-12-14 16:47:39 +01:00
zmagod	a9f8239516	fixed edit action	2016-12-14 16:37:44 +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	50c9dd3f59	fixed typo	2016-12-14 14:40:56 +01:00
okriuchykhin	2fd7536039	Merge pull request #352 from okriuchykhin/ok_SCI_793 ... Hide dropdown when user interacts with samples table [SCI-793]	2016-12-14 14:19:38 +01:00