scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-20 08:01:47 +08:00
Code Issues Projects Releases Packages Wiki Activity
15749 commits 31 branches 181 tags 166 MiB
Commit graph

15749 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
zmagod
b87246c8c2 cleanup spinner after edit step 2016-12-16 11:10:03 +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
Zmago Devetak
a723af2c54 Merge pull request #357 from ZmagoD/zd_SCI_789_v2 
fixed empty name error
 2016-12-16 10:53:48 +01:00
zmagod
62e4d32221 updated gemfile 2016-12-16 10:45:14 +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
mlorb
7e5d748fc1 Merge pull request #354 from mlorb/ml-sci-786 
Add new column on first position in sample tables [SCI-786]
 2016-12-15 13:14:56 +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
Zmago Devetak
9b0d0b23dc Merge pull request #351 from ZmagoD/zd_SCI_789 
adds error message in samples table dropdown [fixes SCI-789]
 2016-12-15 11:05:00 +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
Zmago Devetak
0d6f85e8bd Merge pull request #353 from ZmagoD/zd_SCI_781_796 
fixes sample group/type and sample gorups colorpicker
 2016-12-15 09:27:23 +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
Zmago Devetak
9e2cdeccbf Merge pull request #347 from ZmagoD/zd_SCI_790 
fixes few bugs in sample table SCI-787, 790, 784
 2016-12-14 17:06:33 +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
de8eed0a19 Fix hound warning [SCI-783] 2016-12-14 15:27:24 +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
okriuchykhin
6381166eb1 Merge pull request #346 from okriuchykhin/ok_SCI_788 
Preserve scroll position in the samples columns dropdown when reordering [SCI-788]
 2016-12-14 14:19:15 +01:00
Zmago Devetak
ef4ae1abcb Merge pull request #348 from ZmagoD/zd_SCI_785 
fixes samples table dropdown edit mode [fixes SCI-785]
 2016-12-14 13:37:09 +01:00
zmagod
1ff98bb6df adds tooltip to samples dropdown and column names 2016-12-14 13:36:10 +01:00
Zmago Devetak
0c6a77c242 Merge pull request #345 from ZmagoD/zd_improved_samples_table_SCI_774_775_778_777 
Improved samples table sample type/group page
 2016-12-14 11:40:25 +01:00
zmagod
9037ab3f48 fixed navigation link 2016-12-14 10:35:48 +01:00
Oleksii Kriuchykhin
9f439cf183 Hide dropdown when user interacts with samples table [SCI-793] 2016-12-13 17:25:01 +01:00
zmagod
d9971b4502 adds error message in samples table dropdown [fixes SCI-789] 2016-12-13 17:08:19 +01:00
Oleksii Kriuchykhin
e414af2fc3 Fix columns ordering when deleting custom fields [SCI-783] 2016-12-13 16:21:17 +01:00
zmagod
fa19bf1de7 fixes samples table dropdown edit mode [fixes SCI-785] 2016-12-13 15:43:31 +01:00
zmagod
2426539715 fixes long names in columns dropdown [fixes SCI-784] 2016-12-13 14:54:37 +01:00
zmagod
c960230bf0 fixes dropdown height bug [fixes SCI-787] 2016-12-13 11:35:50 +01:00
Oleksii Kriuchykhin
de12fac767 Preserve scroll position in the samples coluns dropdown when reordering [SCI_788] 2016-12-13 11:25:35 +01:00
zmagod
3c1a275510 fixes invited user samples table [fixes SCI-790] 2016-12-13 10:56:13 +01:00
Mojca Lorber
2cfcba0ceb add protocol preview modal 2016-12-13 10:39:18 +01:00
Zmago Devetak
d54007f69c Merge pull request #337 from ZmagoD/zd_SCI_740 
limits max size of all uploaded files at the one time
 2016-12-13 09:04:14 +01:00
zmagod
b56913cc87 refactor 2016-12-12 16:21:38 +01:00