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 |
|
Luka Murn
|
2304742d87
|
Add tooltips to samples column dropdown
Closes SCI-802.
|
2016-12-27 08:45:23 +01:00 |
|
Luka Murn
|
b931b20f02
|
Fix 2 bugs with comments editing
Closes SCI-820.
|
2016-12-23 20:41:23 +01:00 |
|
Luka Murn
|
fbc2be890c
|
Fix search on hidden columns in samples table
Closes SCI-813.
|
2016-12-23 19:56:54 +01:00 |
|
Luka Murn
|
87d8fece46
|
Fix bug on edit/cancel sample group page
Closes SCI-814.
|
2016-12-23 12:50:49 +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 |
|
Mojca Lorber
|
40e3240a99
|
add content to preview modal
|
2016-12-22 11:43:11 +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 |
|
Oleksii Kriuchykhin
|
00ea3a027c
|
Fix generation of preview url for new steps and results [SCI-694]
|
2016-12-20 16:10:53 +01:00 |
|
Oleksii Kriuchykhin
|
cbef971d85
|
Fix timeouts when fetching images from S3 [SCI-694]
|
2016-12-20 15:36:07 +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 |
|
Oleksii Kriuchykhin
|
d2b76d8385
|
Improved image preview modal [SCI-694]
|
2016-12-19 17:36:18 +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 |
|
Oleksii Kriuchykhin
|
b537feb8a0
|
Added large preview [SCI-694]
|
2016-12-16 17:07:08 +01:00 |
|
Oleksii Kriuchykhin
|
0541253ffa
|
Added modal for images preview [SCI-694]
|
2016-12-16 15:53:16 +01:00 |
|
Zmago Devetak
|
90a115fff3
|
Merge pull request #342 from ZmagoD/zd_SCI_758
Generate png preview images for uploaded TIFF images
|
2016-12-16 15:39:07 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Luka Murn
|
d30a9780f4
|
Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
|
2016-12-12 09:57:37 +01:00 |
|
okriuchykhin
|
420daf3a6a
|
Merge pull request #344 from okriuchykhin/ok_SCI_779
Fix adding new samples columns [SCI-779]
|
2016-12-12 09:29:27 +01:00 |
|
Oleksii Kriuchykhin
|
435a8d20bb
|
Fix columns visability and reordering bug [SCI-779]
|
2016-12-09 17:37:22 +01:00 |
|
Matej Zrimšek
|
54de13de82
|
Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701]
|
2016-12-09 17:22:09 +01:00 |
|
Matej Zrimšek
|
0b12c87b09
|
Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701]
|
2016-12-09 16:44:50 +01:00 |
|
Oleksii Kriuchykhin
|
460ca067a2
|
Fix adding new samples columns [SCI-779]
|
2016-12-09 16:07:41 +01:00 |
|
zmagod
|
e23be6cc0e
|
fixed step description links [fixes SCI-780]
|
2016-12-09 15:26:41 +01:00 |
|
Oleksii Kriuchykhin
|
274fd63a41
|
Initial code commit [SCI-779]
|
2016-12-09 15:21:26 +01:00 |
|
zmagod
|
8b0dab624d
|
clear unneeded css, change processing image [fixes SCI-758]
|
2016-12-09 14:24:20 +01:00 |
|
zmagod
|
de3099e4d1
|
removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository
|
2016-12-09 13:59:49 +01:00 |
|
Luka Murn
|
8a55ef29e4
|
Remove unused code
Closes SCI-711.
|
2016-12-09 13:49:19 +01:00 |
|
Luka Murn
|
1a8b141b95
|
Add delete custom field functionality
|
2016-12-09 13:49:19 +01:00 |
|
Luka Murn
|
7e32c13d27
|
Fix edit & delete functionality so it works with draggable
|
2016-12-09 13:18:59 +01:00 |
|
Luka Murn
|
754c90b612
|
Edit functionality now works
|
2016-12-09 13:18:59 +01:00 |
|
Luka Murn
|
54ebdbb06c
|
Update edit mode JS & CSS
|
2016-12-09 13:18:59 +01:00 |
|
Luka Murn
|
da630ac2cb
|
Make edit, delete buttons clickable & hide them if neccesary
|
2016-12-09 13:18:59 +01:00 |
|
Matej Zrimšek
|
aea679ec11
|
Added links for creating new sample type and group when creating new sample. [fixes SCI-701]
|
2016-12-09 11:39:12 +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 |
|
Mojca Lorber
|
1b2a438ed4
|
remove fixed columns
|
2016-12-08 15:24:54 +01:00 |
|
zmagod
|
40fdfef67f
|
setup delayed_paperclip gem
|
2016-12-08 15:24:14 +01:00 |
|
Mojca Lorber
|
7d88e247fc
|
refactoring
|
2016-12-08 14:41:35 +01:00 |
|
zmagod
|
ac52e643be
|
cleanup direct upload
|
2016-12-08 11:26:13 +01:00 |
|
Mojca Lorber
|
5b5342de6f
|
make first column fixed
|
2016-12-07 15:02:18 +01:00 |
|
zmagod
|
9f1e436623
|
limits max size of all uploaded files at the one time [fixes SCI-740]
|
2016-12-07 09:02:04 +01:00 |
|
okriuchykhin
|
cb2abfa7a9
|
Merge pull request #325 from okriuchykhin/ok_SCI_712
Added form for adding new columns to samples table into dropdown [SCI-712]
|
2016-12-06 15:00:01 +01:00 |
|
Zmago Devetak
|
49f9e64171
|
Merge pull request #333 from ZmagoD/zd_SCI_700
Managing sample groups tab
|
2016-12-06 14:51:09 +01:00 |
|
zmagod
|
8ca7151df4
|
added constant to load_from_file_size_error local
|
2016-12-06 13:52:07 +01:00 |
|
Oleksii Kriuchykhin
|
e02d780e44
|
Added Enter key handling and fixed error reporting [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
da7e86c7c2
|
Fix save/delete buttons after updating datatable and added permissions check [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
f6dd64772a
|
Add columns to samples table without page reload [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
40db8310fd
|
Move code to sample_datatable.js and removed unused modal [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
22dabd2177
|
Added form for adding new columns to samples table into dropdown [SCI-712]
|
2016-12-06 13:17:05 +01:00 |
|
Oleksii Kriuchykhin
|
94866e8994
|
Initial code commit for samples columns dropdown [SCI-712]
|
2016-12-06 13:16:05 +01:00 |
|
Mojca Lorber
|
1bc0ca9e75
|
fix bug with first time load
|
2016-12-06 13:14:29 +01:00 |
|
zmagod
|
787b8b1600
|
fixed new sample type/group form
|
2016-12-06 12:01:02 +01:00 |
|
Mojca Lorber
|
12088ebfd3
|
add visibility functionality after refresh
|
2016-12-06 09:40:28 +01:00 |
|
Mojca Lorber
|
849f78b4df
|
implement reordering of columns in the samples table and change from local to database storage
|
2016-12-05 11:34:36 +01:00 |
|
zmagod
|
ef2471d3f7
|
fixes inport eln error message and spinner [fixes SCI-752]
|
2016-12-05 10:44:58 +01:00 |
|
zmagod
|
7725374c42
|
refactor sample types/groups [fixes SCI-700]
|
2016-12-02 09:58:35 +01:00 |
|
zmagod
|
83aae59eed
|
adds sample groups index page
|
2016-12-02 09:33:09 +01:00 |
|
Zmago Devetak
|
33adb58950
|
Merge pull request #328 from ZmagoD/zd_SCI_699
Managing sample types tab
|
2016-11-30 16:14:13 +01:00 |
|
Oleksii Kriuchykhin
|
f51f33ec25
|
Added sorting functionality to samples colunmns dropdown [SCI-695]
|
2016-11-30 11:42:05 +01:00 |
|
zmagod
|
a2e13441e5
|
removes create_sample_type modal and related js actions
|
2016-11-30 09:02:34 +01:00 |
|
zmagod
|
4e4a48620c
|
adds validation to input fields
|
2016-11-29 18:08:29 +01:00 |
|
zmagod
|
12848f15fa
|
adds sample_type index view with all crud actions
|
2016-11-29 17:15:54 +01:00 |
|
Zmago Devetak
|
1e870a6e7c
|
Merge pull request #320 from ZmagoD/zd_SCI_698
adds new samples columns dropdown [fixes SCI-698]
|
2016-11-28 16:30:16 +01:00 |
|
zmagod
|
72d1dfb15e
|
cleanup sample_datatable.js
|
2016-11-28 16:28:22 +01:00 |
|
zmagod
|
9d91d2ce28
|
adds new samples columns dropdown [fixes SCI-698]
|
2016-11-25 17:29:30 +01:00 |
|
Luka Murn
|
b1b095910c
|
Merge pull request #309 from Ducz0r/lm-remove-unused-files
Brace for impact...
|
2016-11-25 10:00:29 +01:00 |
|
Matej Zrimšek
|
1db926101d
|
Minor refactoring.
|
2016-11-23 10:48:43 +01:00 |
|
Matej Zrimšek
|
6bc2603157
|
Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707]
|
2016-11-23 10:36:09 +01:00 |
|
Zmago Devetak
|
0f3db56a74
|
Merge pull request #311 from ZmagoD/zd_SCI_716
load comments after edit step [fixes SCI-716]
|
2016-11-23 09:14:57 +01:00 |
|
zmagod
|
8d7285ce7c
|
load comments after edit step [fixes SCI-716]
|
2016-11-22 14:39:08 +01:00 |
|
Oleksii Kriuchykhin
|
d7aa155860
|
Disable keyboard navigation in tutorial [SCI-703]
|
2016-11-22 14:14:42 +01:00 |
|
Oleksii Kriuchykhin
|
be59b85d3b
|
Added additional checks for tutorial steps [SCI-703]
|
2016-11-22 13:55:23 +01:00 |
|
Oleksii Kriuchykhin
|
cc86ff268f
|
Reload page after exit from tutorial [SCI-703]
|
2016-11-22 13:49:57 +01:00 |
|
mz3944
|
c5bc3a4dc6
|
Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2
Added additional tutorial step for showing protocol link. Tutorial st…
|
2016-11-21 16:06:45 +01:00 |
|
Oleksii Kriuchykhin
|
d6f5f6b9bf
|
Changes default behaviour for absolute urls in Quill [SCI-684]
|
2016-11-21 14:18:08 +01:00 |
|
Luka Murn
|
f5795f5516
|
Remove unused assets & helpers
|
2016-11-18 11:30:03 +01:00 |
|
Matej Zrimšek
|
f13cc5be0e
|
Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).
|
2016-11-17 18:03:49 +01:00 |
|
Luka Murn
|
26d04b1f3c
|
Merge branch 'rich-text-formatting' into 'master'
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
|
2016-11-17 16:39:33 +01:00 |
|
Luka Murn
|
9d3685f872
|
Merge branch 'gamification' into 'master'
Conflicts:
app/controllers/users/invitations_controller.rb
app/controllers/users/settings_controller.rb
|
2016-11-17 16:30:18 +01:00 |
|
Matej Zrimšek
|
c8eb82cc85
|
Fixed tutorial step numbers and changed getting next page reference on protocols page.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
92d990a715
|
Code for tutorial function steps parameter reformatted. Deleted Git merging line.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
0e97bfc002
|
Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
c64146904a
|
Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
47c1308ba6
|
Refactored and added back button for tutorial for step 18. Tutorial function now also works with one page step.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
00ed91e856
|
Refactored and added back button for tutorial for steps 16-17. Tutorial now exits upon page leave.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
bfe7c19f93
|
Refactored and added back button for tutorial for steps 14-15.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
4ee7baabec
|
Enriched tutorial function description.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
33c96c9eee
|
Refactored and added back button for tutorial for steps 12-13.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
0687153eb8
|
Minor tutorial refactoring.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
f4206ea3d0
|
No warning popup is shown when running tutorial.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
3f8d3d5939
|
Refactored and added back button for tutorial for steps 6-11.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
74e58b044f
|
Tutorial refactored using one method, for steps 1-5.
|
2016-11-17 14:46:04 +01:00 |
|
Matej Zrimšek
|
0d133ff32e
|
Refactoring and added back buttons for tutorial steps 1-5.
|
2016-11-17 14:46:04 +01:00 |
|
Luka Murn
|
d1701bd7ae
|
Merge pull request #276 from Ducz0r/lm-sci-637
Automatically resize textarea elements [SCI-637]
|
2016-11-17 09:58:36 +01:00 |
|
Luka Murn
|
a3bbf94643
|
Add a smart_text_area tag & implement it throughout application
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
|
2016-11-16 17:57:01 +01:00 |
|
Oleksii Kriuchykhin
|
d2e29935cf
|
Improved tutorial styling [SCI-685]
|
2016-11-16 15:44:06 +01:00 |
|
okriuchykhin
|
43b85ac5c2
|
Merge pull request #293 from okriuchykhin/ok_SCI_670
Fix project canvas interactivity in the tutorial [SCI-670]
|
2016-11-16 11:32:13 +01:00 |
|
Luka Murn
|
83160a487b
|
Fix importer so it supports rendering & importing rich text format
Closes SCI-674.
|
2016-11-15 16:57:53 +01:00 |
|
Oleksii Kriuchykhin
|
410837e6cf
|
Fix project canvas interactivity in the tutorial [SCI-670]
|
2016-11-15 16:53:20 +01:00 |
|
Luka Murn
|
263244ad83
|
Reload whole page after user is invited from team invite users modal
Closes SCI-664.
|
2016-11-15 16:21:32 +01:00 |
|
mlorb
|
b0b2484fdf
|
Merge pull request #279 from mlorb/ml_sci_638_vol2
Fix validation problems for rich text fields [SCI-638]
|
2016-11-11 12:37:02 +01:00 |
|
Mojca Lorber
|
4d681bb63c
|
change strip html function
|
2016-11-11 12:34:57 +01:00 |
|
zmagod
|
59f7bdb54e
|
hide flash after 5 sec [fixes SCI-660]
|
2016-11-11 12:30:48 +01:00 |
|
Mojca Lorber
|
3b7af3e66c
|
fix validation logic
|
2016-11-11 11:42:16 +01:00 |
|
Oleksii Kriuchykhin
|
b9f982ead7
|
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
|
2016-11-11 10:07:34 +01:00 |
|
Oleksii Kriuchykhin
|
d2491a18a4
|
Tutorial Save Protocol step added [SCI-571]
|
2016-11-11 10:06:18 +01:00 |
|
Luka Murn
|
b42922d32c
|
Add autosize functionality to all textareas
Closes SCI-637
|
2016-11-11 09:09:41 +01:00 |
|
Luka Murn
|
55f9633d1d
|
Add jQuery.autosize plugin
|
2016-11-11 09:09:41 +01:00 |
|
Luka Murn
|
acd8ce8932
|
Merge pull request #270 from Ducz0r/lm-sci-644
Convert all large text input fields into text areas (10000 characters)
|
2016-11-11 09:07:25 +01:00 |
|
Luka Murn
|
0e065026bd
|
Closes SCI-648
|
2016-11-10 16:18:17 +01:00 |
|
Mojca Lorber
|
ab0879e8d6
|
Integrate library with default settings
|
2016-11-09 13:09:53 +01:00 |
|
Luka Murn
|
b246853117
|
Code styling (use link_to, %w)
|
2016-11-08 16:43:25 +01:00 |
|
Luka Murn
|
55d8fea359
|
Make all comment edit fields textareas
|
2016-11-08 11:29:55 +01:00 |
|
Luka Murn
|
0ab62576a2
|
Add new modal to organization page, remove old modal code
|
2016-11-07 09:43:10 +01:00 |
|
Luka Murn
|
6fe0d6b3df
|
A working invite modal!
|
2016-11-07 09:43:10 +01:00 |
|
Luka Murn
|
ccf8932611
|
Add first version of invite users modal
|
2016-11-07 09:43:09 +01:00 |
|
Luka Murn
|
b4685b0a40
|
Remove console.log()
|
2016-10-25 18:13:29 +02:00 |
|
Luka Murn
|
cd360d7279
|
Fix the save report alert() bug
Closes SCI-616
|
2016-10-25 18:12:29 +02:00 |
|
Zmago Devetak
|
12c77df883
|
Merge pull request #237 from ZmagoD/zd_SCI_593_v2
Styled global team switch and search [fixes SCI-593]
|
2016-10-21 16:28:50 +02:00 |
|
zmagod
|
49d3879642
|
fixes padding on mobile, added separator on team switch dropdown, focus search input
|
2016-10-21 11:46:59 +02:00 |
|
okriuchykhin
|
f876ade05e
|
Merge pull request #236 from okriuchykhin/ok_SCI_557
Fixes issue with new comments and date separator SCI-557
|
2016-10-21 10:29:46 +02:00 |
|
Zmago Devetak
|
f615b3da41
|
Merge pull request #230 from ZmagoD/zd_SCI_586
Adds new team button to team switch dropdown [fixes SCI-586]
|
2016-10-21 08:29:05 +02:00 |
|
Oleksii Kriuchykhin
|
0c1ff06f21
|
Fixes issue with new comments and date separator SCI-557
|
2016-10-20 22:33:15 +02:00 |
|
mlorb
|
fa4f3fb0a0
|
Merge pull request #220 from mlorb/ml_sci_462
fix multiplication of edit comment fields [SCI-462]
|
2016-10-20 15:14:31 +02:00 |
|
Oleksii Kriuchykhin
|
347216183f
|
Fixes different color of buttons in notifications settings [SCI-590]
|
2016-10-20 14:17:07 +02:00 |
|
zmagod
|
f21c9e394f
|
adds new team button to team switch dropdown [fixes SCI-586]
|
2016-10-20 13:47:41 +02:00 |
|
Luka Murn
|
640a575a3a
|
Merge pull request #222 from biosistemika/modular-tasks
Merge global team switch into master
|
2016-10-18 11:39:09 +02:00 |
|
zmagod
|
557957c857
|
fixed issue with mozilla browsers
|
2016-10-17 15:21:19 +02:00 |
|
zmagod
|
d86a4dd311
|
setup global team switch view and controller action
|
2016-10-17 15:10:26 +02:00 |
|
Oleksii Kriuchykhin
|
0ec7c019b3
|
Fix issue with pop-up windows and turbolinks [SCI-463]
|
2016-10-17 14:25:54 +02:00 |
|
Mojca Lorber
|
177c4b5918
|
fix multiplication of edit comment fields
|
2016-10-17 12:59:51 +02:00 |
|
Matej Zrimšek
|
f2cd9890dd
|
Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
a6a2a237aa
|
Removed unneeded ERB tags, which caused error. Minor refactoring.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
ece89da391
|
Removed ruby constants duplicates in JS, because of caching problems.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
05acf5a725
|
Replaced all Ruby constants instances in JS to be called from JS.
|
2016-10-17 11:57:46 +02:00 |
|
Matej Zrimšek
|
0780bd2416
|
Ruby constants are now automatically available in JS. Refactoring was needed.
|
2016-10-17 11:57:37 +02:00 |
|
Matej Zrimšek
|
a3dfb59558
|
Added remaining constants.
|
2016-10-17 11:30:05 +02:00 |
|
Matej Zrimšek
|
21ec05d541
|
Refactored searches (user and globals earch) and used constants.
|
2016-10-17 11:17:59 +02:00 |
|
Oleksii Kriuchykhin
|
c6fb57318f
|
Added use of constants in JS [SCI-530]
|
2016-10-13 13:06:11 +02:00 |
|
Oleksii Kriuchykhin
|
37cff75013
|
Fixes issue with comments options menu [SCI-530]
|
2016-10-13 12:07:41 +02:00 |
|
Mojca Lorber
|
42f6b679f8
|
Adding system notifications email function in settings
|
2016-10-12 11:50:26 +02:00 |
|
Mojca Lorber
|
6bea0a9e1a
|
fixes merge conflicts
|
2016-10-12 10:55:40 +02:00 |
|
Mojca Lorber
|
4f1cbad7da
|
adding update notifications in settings
|
2016-10-12 10:42:07 +02:00 |
|
Zmago Devetak
|
f25767fdc3
|
Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup
Removed introductory popup [fixes SCI-534]
|
2016-10-12 08:13:46 +02:00 |
|
Oleksii Kriuchykhin
|
5399033fce
|
Added user settings for email notifications [SCI-443]
|
2016-10-11 16:43:17 +02:00 |
|
zmagod
|
42a30576e3
|
removed introductory popup [fixes SCI-534]
|
2016-10-11 08:33:50 +02:00 |
|
Jure Grabnar
|
1f67aec258
|
Prevent destroying protocols when file is edited
SCI-552 #close
|
2016-10-06 16:13:42 +02:00 |
|
Luka Murn
|
5c80c8a817
|
Add "no notifications" to dropdown & notifications index page
|
2016-10-05 16:58:21 +02:00 |
|
okriuchykhin
|
50f28fe883
|
Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442
Global notifications screen [SCI-442]
|
2016-10-05 16:01:41 +02:00 |
|
Oleksii Kriuchykhin
|
868ffd03d6
|
JS code improvement [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
8907e54b49
|
Global notifications index page added [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Zmago Devetak
|
f3708bcac0
|
Merge pull request #191 from ZmagoD/zd_SCI_469_ver2
Comments date duplication
|
2016-10-05 15:47:42 +02:00 |
|
zmagod
|
b0f6b1f4d0
|
fixed comments action on project page
|
2016-10-05 15:39:54 +02:00 |
|
Zmago Devetak
|
eea310514a
|
Merge pull request #194 from ZmagoD/zd_SCI_531_533
Notification style fixes
|
2016-10-05 15:27:36 +02:00 |
|
zmagod
|
bca3d19562
|
fixed comment options dropdown position
|
2016-10-05 15:26:11 +02:00 |
|
Zmago Devetak
|
71ad5bf034
|
Merge pull request #190 from ZmagoD/zd_SCI_529
Prepare settings screen for notifications
|
2016-10-05 14:54:47 +02:00 |
|
okriuchykhin
|
bfa7e57bd8
|
Merge pull request #168 from okriuchykhin/ok_SCI-463
Fixes issue with unexpected notification windows [fixes SCI-463]
|
2016-10-05 14:45:23 +02:00 |
|
zmagod
|
f9d956bbca
|
fix notifications number on [fixes SCI-531]
|
2016-10-05 11:50:57 +02:00 |
|
zmagod
|
d90f17d1eb
|
clean comments date duplication [fixes SCI-469]
|
2016-10-05 08:42:32 +02:00 |
|
zmagod
|
a68e7abc57
|
first run notification settings
|
2016-10-04 15:52:48 +02:00 |
|
Luka Murn
|
61cb9651c7
|
Merge pull request #188 from biosistemika/global-notifications
Global notifications
|
2016-10-04 08:30:50 +02:00 |
|
zmagod
|
c9bbab1004
|
added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users
|
2016-10-03 20:31:00 +02:00 |
|
mlorb
|
153b692c0c
|
Merge pull request #181 from mlorb/ml_sci_321
Displaying more information for individual samples in Sample table [SCI-321]
|
2016-10-03 16:37:35 +02:00 |
|
zmagod
|
36fb2713b3
|
start fixing comments dates
|
2016-10-03 16:10:20 +02:00 |
|
Zmago Devetak
|
91c7d8a952
|
Merge pull request #176 from ZmagoD/zd_SCI_474
Unify the comments
|
2016-10-03 15:26:17 +02:00 |
|
Jure Grabnar
|
f727289935
|
Add lock check for editing result
|
2016-10-03 13:43:35 +02:00 |
|
zmagod
|
77df0bc82c
|
cleans more comment link
|
2016-10-03 12:34:16 +02:00 |
|
Mojca Lorber
|
093fbd6b8e
|
fixes hound again
|
2016-10-03 10:40:32 +02:00 |
|
Mojca Lorber
|
2041f2a09d
|
fixes hound
|
2016-10-03 10:15:46 +02:00 |
|
Mojca Lorber
|
053cd8ed84
|
removes handler
|
2016-10-03 10:12:13 +02:00 |
|
zmagod
|
b9bc2f17c8
|
fixing hound
|
2016-10-03 08:27:13 +02:00 |
|
zmagod
|
2ee02ec472
|
mark all seen notifications
|
2016-10-03 08:20:23 +02:00 |
|
Luka Murn
|
c83342d9f0
|
Merge pull request #173 from okriuchykhin/ok_SCI-484
Fix issue with duplicate error messages in experiments modal [SCI-484]
|
2016-09-30 08:24:51 +02:00 |
|
zmagod
|
e1a1b93d44
|
fixed migrations
|
2016-09-29 14:49:58 +02:00 |
|
Mojca Lorber
|
f4345f3aef
|
fixes hound
|
2016-09-28 16:09:39 +02:00 |
|
Mojca Lorber
|
efa7a1d7b5
|
add sample information in pop-up
|
2016-09-28 15:46:41 +02:00 |
|
zmagod
|
2a86aaf7e4
|
changed popout content [fixes SCI-520]
|
2016-09-28 15:12:30 +02:00 |
|
zmagod
|
dad0d3868b
|
fixing hound
|
2016-09-27 17:31:37 +02:00 |
|
zmagod
|
402a77526a
|
cleaned console.log
|
2016-09-27 16:22:09 +02:00 |
|
zmagod
|
2235778110
|
fixed project and task comments + fixed date issue
|
2016-09-27 16:19:31 +02:00 |
|
zmagod
|
0d322eba13
|
fixed hound
|
2016-09-27 11:03:10 +02:00 |
|
zmagod
|
4903cb970c
|
removed comments helper
|
2016-09-27 10:47:18 +02:00 |
|
zmagod
|
1eb9f772f4
|
refactor sciNote comments js and unified all comments behavior [fixes SCI-474]
|
2016-09-27 10:30:48 +02:00 |
|
zmagod
|
1cdfde827f
|
fixes protocol and results comments
|
2016-09-27 09:26:25 +02:00 |
|
zmagod
|
980ff63104
|
fixed task comments
|
2016-09-27 09:18:46 +02:00 |
|
zmagod
|
02bfa1949e
|
fixed project comments
|
2016-09-27 09:00:02 +02:00 |
|
Oleksii Kriuchykhin
|
8a3a9451e9
|
Fix issue with duplicate error messages in experiments modal [SCI-484]
|
2016-09-26 12:58:22 +02:00 |
|
Oleksii Kriuchykhin
|
db1e24202a
|
Minor code cleanup [fixes SCI-463]
|
2016-09-26 09:08:38 +02:00 |
|
Mojca Lorber
|
c2b742374f
|
adding popup sample info
|
2016-09-23 17:45:02 +02:00 |
|
Oleksii Kriuchykhin
|
2c144aa2f3
|
Fix issue with unexpected notification windows appearing after report editor exit [fixes SCI-463]
|
2016-09-23 11:56:13 +02:00 |
|
Zmago Devetak
|
2b678998d3
|
Merge pull request #166 from ZmagoD/zd_SCI_471
fixes load comments [fixes SCI-471]
|
2016-09-23 09:17:27 +02:00 |
|
zmagod
|
4f2df691ba
|
add error validations
|
2016-09-23 08:34:39 +02:00 |
|
zmagod
|
6143b257d0
|
fixes edit modal [fixes SCI-467]
|
2016-09-23 08:32:46 +02:00 |
|
Matej Zrimšek
|
0317872bc0
|
Added check if no comments are present for file result, which caused JS error.
|
2016-09-22 18:12:35 +02:00 |
|
mz3944
|
cde7f3805f
|
Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2
Added missing validation for protocol description.
|
2016-09-22 17:36:18 +02:00 |
|