scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 02:46:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
2377 commits 69 branches 179 tags 165 MiB
Commit graph

1919 commits

Author SHA1 Message Date
Luka Murn 5873eea994 We serve to please the Hound 2017-01-10 10:42:52 +01:00
Oleksii Kriuchykhin 4c9c9037ed Enable image preview after editing protocol and disable preview modal animation [SCI-868] 2017-01-09 17:19:46 +01:00
Mojca Lorber 510731bd4e change color of clickable nameswhen row is selected in datatables 2017-01-09 15:51:21 +01:00
Mojca Lorber a0a7f35d44 adjust columns width in table header after selecting sample type/group 2017-01-09 15:00:07 +01:00
Oleksii Kriuchykhin 773b00933a Improve multiple messages handling in samples [SCI-853] 2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin 0fd7688427 Fix hiding of error messages in the samples datatable [SCI-853] 2017-01-09 13:34:23 +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 54ef2be94b Merge pull request #383 from mz3944/mz-sci-845 
Fixed samples table all rows un/checking. [SCI-845]
 2017-01-09 11:58:44 +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
okriuchykhin 3c47d17019 Merge pull request #386 from okriuchykhin/ok_SCI_815 
Improve error message when importing CSV files with incorrect character encoding [SCI-815]
 2017-01-09 11:54:28 +01:00
zmagod 226d5d8247 added blank string to wopi-lock header param 2017-01-09 11:51:18 +01:00
mlorb 006db01b11 Merge pull request #390 from mlorb/ml_sci_850 
Fix samples info popup error [SCI-850]
 2017-01-09 11:38:50 +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
Luka Murn 0ee5b98977 Refactor code a bit, add dismiss button to header 2017-01-07 09:59:52 +01:00
Matej Zrimšek 72df48500d Fixed samples table all rows un/checking. [SCI-845] 2017-01-06 18:19:20 +01:00
Mojca Lorber 6f7c08fa63 fix samples info popup error 2017-01-06 17:31:17 +01:00
Oleksii Kriuchykhin 89710d8782 Enable image preview for newly uploaded images [SCI-694] 2017-01-06 16:41:24 +01:00
Oleksii Kriuchykhin aa2b573278 Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
mz3944 1b56e9d07c Merge pull request #384 from mz3944/mz-sci-849 
Fixes experiment button not being clicable in project overview page. …
 2017-01-06 14:26:37 +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
Matej Zrimšek 5d104981fd Fixed sample deletion on experiments level. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Luka Murn 7835753d3c Add atwho-users URL to <body> 2017-01-06 12:48:37 +01:00
Luka Murn 3cdd375a2d Merge pull request #388 from biosistemika/hotfix-1.6.1 
Hotfix 1.6.1
 2017-01-06 11:23:16 +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
Oleksii Kriuchykhin cba064dfcc Improve error message whan importing CSV files with incorrect character encoding [SCI-815] 2017-01-05 17:00:21 +01:00
Luka Murn 488613afcc Add index to users' full name attribute 2017-01-05 16:26:49 +01:00
Oleksii Kriuchykhin 9987993ce0 Avoid sanitizing of data attributes [SCI-102] 2017-01-05 16:05:48 +01:00
Oleksii Kriuchykhin 1009347026 Add list of whitelisted attributes [SCI-102] 2017-01-05 15:33:41 +01:00
Luka Murn ef688feb4e Hotfix 1.6.1 
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
 2017-01-05 15:27:18 +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
Luka Murn b614ce714b Restyle atwho dropdown 2017-01-05 14:06:48 +01:00
Oleksii Kriuchykhin 0ecb6904d4 Add user input sanitizing in the models [SCI-102] 2017-01-05 13:31:35 +01:00
Oleksii Kriuchykhin 835e982292 SAnitize AJAX calls in controllers and datatables [SCI-102] 2017-01-05 13:12:22 +01:00
Oleksii Kriuchykhin cd3924afd3 Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
Oleksii Kriuchykhin 9c4191a1e0 Initial code commit [SCI-102] 2017-01-05 13:04:19 +01:00
Luka Murn a78bb79618 Temp commit 2017-01-05 12:07:17 +01:00
Luka Murn eb64162633 Remove Gem dependency, add atwho as regular vendor/js 2017-01-05 12:06:59 +01:00
Luka Murn e12907c9b9 Remove original atwho css, apply our own 2017-01-05 10:52:28 +01:00
Luka Murn 09ef3b3ad5 Merge pull request #378 from Ducz0r/lm-sci-802-fix 
Add tooltips to samples column dropdown [SCI-802]
 2017-01-04 11:30:04 +01:00
Luka Murn 2c5b27ce81 Change "Update" to "Save" 
Closes SCI-802.
 2017-01-04 11:29:34 +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 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
Luka Murn cedc6c5074 Merge pull request #382 from Ducz0r/lm-sci-166-fix 
Re-add tags index controller action to render tags [SCI-166]
 2017-01-04 10:48:09 +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
zmagod 87ffa7f03b fixes X-WOPI-ServerVersion bug 2017-01-04 10:02:08 +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 fe37ac3b6d fix hound 2 2017-01-03 17:46:30 +01:00
Mojca Lorber 0011474ea3 fix hound 2017-01-03 17:43:55 +01:00
Mojca Lorber a0704cd873 remove duplicated includes of css and js 2017-01-03 17:33:01 +01:00
zmagod a434649f42 Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-01-03 16:35:25 +01:00
Mojca Lorber c476faca30 fix hound 2017-01-03 11:04:09 +01:00
Mojca Lorber e555535dfb add edit button to protocol preview modal 2017-01-03 10:04:14 +01:00
Luka Murn af9e272b2a Re-add tags index controller action to render tags 
Closes SCI-166.
 2017-01-03 09:39:41 +01:00
Zmago Devetak 5d0e80a5e1 Merge pull request #369 from ZmagoD/zd_SCI_812 
fixes bug with samples sorting [fixes SCI-812]
 2017-01-03 08:56:59 +01:00
Oleksii Kriuchykhin c77c83752e Remove unused css class link-look [SCI-819] 2016-12-30 15:50:43 +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 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 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
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
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
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 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
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
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
zmagod e554fdf805 code refactor 2016-12-21 16:52:15 +01:00
Luka Murn af6bf2aee1 Fix jQuery selector, make it work for new samples 2016-12-21 16:23:09 +01:00
zmagod 01849a46db removed unneeded lines 2016-12-21 15:40:07 +01:00
zmagod a5a8bbf27a fixed assigned column bug 2016-12-21 15:35:05 +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
zmagod e2723a288c fixes bug with samples sorting [fixes SCI-812] 2016-12-21 14:32:28 +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
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
Oleksii Kriuchykhin b537feb8a0 Added large preview [SCI-694] 2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin 8738b3e09d Added image preview to Results [SCI-694] 2016-12-16 15:55:46 +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 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
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
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 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
Nbernot 1eb3ddee53 Token expiration restored to 1 day. 2016-12-08 11:12:24 +01:00
Mojca Lorber 227fe9c284 change to after_create 2016-12-07 17:43:00 +01:00
Mojca Lorber 87dc76f4e3 change to update samples table state after initialize 2016-12-07 17:25:42 +01:00
Mojca Lorber 114a17ff0f change to create 2016-12-07 16:57:17 +01:00
Mojca Lorber 228990f9da fix samples table state, when adding new custom column 2016-12-07 16:37:16 +01:00
Mojca Lorber 5b5342de6f make first column fixed 2016-12-07 15:02:18 +01:00
Mojca Lorber 195055f9cf change SAMPLES_TABLE_DEFAULT_STATE 2016-12-07 14:51:34 +01:00
Mojca Lorber 39b6fa66fe add SamplesTable for new users 2016-12-07 14:14:32 +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
Luka Murn 62353b6c3b Temporary change token expiration 2016-12-06 16:33:32 +01:00
Zmago Devetak 310b61ec12 Merge pull request #335 from ZmagoD/zd_SCI_752 
fixes inport eln error message and spinner [fixes SCI-752]
 2016-12-06 15:11:34 +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 dd85b128d2 fixed glyphicon-ok position 2016-12-06 14:47:16 +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
Mojca Lorber 01e75fbbcc create samples table model and migration 2016-12-05 11:08:33 +01:00
Zmago Devetak a376118cd8 Merge pull request #334 from ZmagoD/zd_SCI_746 
fixes bug with deleted team name
 2016-12-05 10:47:39 +01:00
Zmago Devetak 91f29745c4 Merge pull request #314 from ZmagoD/zd_SCI_643 
adds autolink
 2016-12-05 10:47:23 +01:00
zmagod ef2471d3f7 fixes inport eln error message and spinner [fixes SCI-752] 2016-12-05 10:44:58 +01:00
zmagod 6274cd413e fixes bug with deleted team name [fixes SCI-746] 2016-12-02 16:07:00 +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
Luka Murn 372b455d7d Merge pull request #332 from Ducz0r/lm-sci-750-751 
Fix inviting users not working
 2016-12-01 15:52:40 +01:00
Luka Murn 6a770f6a7e Fix inviting users not working 
Closes SCI-750, SCI-751.

Probably reopens parts of SCI-746.
 2016-12-01 15:46:37 +01:00
Matej Zrimšek 3bdaa4bcef Some token authentication refactoring and error handilng fixes. [closes SCI-689] 2016-12-01 15:38:56 +01:00
Nejc Bernot ef60982913 Subdomain checks fixed 2016-12-01 14:20:43 +01:00
Nejc Bernot c54bd6df82 Added user ids to wopi tokens 2016-12-01 13:48:11 +01:00
Matej Zrimšek 46465060d0 Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689] 2016-11-30 16:56:56 +01:00
Nejc Bernot cb03ed8384 Users can now have multiple tokens 
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
 2016-11-30 16:48:42 +01:00
Nejc Bernot 495c648f41 Added subdomain based routing constraints 
Non-wopi routes will only work with the subdomain set by the env variable USER_SUBDOMAIN (if it is set). Likewise, wopi routes will only work with the WOPI_SUBDOMAIN if it is set, but they also require the WOPI_ENABLED to be true.
 2016-11-30 16:43:33 +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 2a27c8e6b3 Fix hound warning [SCI-695] 2016-11-30 11:52:07 +01:00
Oleksii Kriuchykhin f51f33ec25 Added sorting functionality to samples colunmns dropdown [SCI-695] 2016-11-30 11:42:05 +01:00
Luka Murn 680f443e31 Merge pull request #323 from Ducz0r/lm-sci-733-fix 
Fix task comments not properly showing in reports
 2016-11-30 09:51:59 +01:00
Luka Murn c0a03d9f2d Merge pull request #322 from Ducz0r/lm-add-show-version-var 
Add an environmental variable to toggle version display in navbar
 2016-11-30 09:49:40 +01:00
Luka Murn 84d0cf4620 Use rails helpers as per @ZmagoD's request 2016-11-30 09:48:57 +01:00
Luka Murn 76ec77fce4 Merge pull request #329 from biosistemika/simplify-signup 
Merge simplify-signup into master
 2016-11-30 09:41:20 +01:00
Luka Murn d685ac939b Merge pull request #326 from Ducz0r/lm-sci-746-fix 
Fix some recaptcha form submit errors for signup pages
 2016-11-30 09:35:16 +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
Luka Murn 6491cf1806 Refactor & fix sign up constraints 2016-11-29 16:53:40 +01:00
Luka Murn e099a279b1 Remove link to "Resend confirmation instructions" if not neccesary 
Closes SCI-747.
 2016-11-29 16:12:35 +01:00
Luka Murn b5d0a39827 Fix some recaptcha form submit errors for signup pages 
Closes SCI-746.
 2016-11-29 15:53:58 +01:00
zmagod 5c0b2d7b24 init sample_types page 2016-11-29 08:57:12 +01:00
Luka Murn 90816ae1fa Just pleasing the Hound 2016-11-28 17:16:39 +01:00
Luka Murn 073f30dcc5 Fix task comments not properly showing in reports 
Closes SCI-733.
 2016-11-28 17:14:27 +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
okriuchykhin f9c8223fe5 Merge pull request #321 from okriuchykhin/ok_SCI_736 
Improve regexp for image whitelisting [SCI-736]
 2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin d8f8e01a46 Code cleanup, added new image types to whitelist [SCI-736] 2016-11-28 11:13:20 +01:00
Luka Murn 9f998d6fed Add an environmental variable to toggle version display in navbar 
The variable is called NAVBAR_SHOW_VERSION. If not specified,
it defaults to the current behavior (version is hidden on
production, but visible on development & test environments).
 2016-11-28 10:52:17 +01:00
Luka Murn d142fa96d9 Merge pull request #317 from Ducz0r/lm-sci-735-fix 
Add Deface hooks to sign up & confirm invitation forms
 2016-11-28 10:22:46 +01:00
Oleksii Kriuchykhin cc0aab2e59 Improve regexp for image whitelisting [SCI-736] 2016-11-28 10:08:54 +01:00
okriuchykhin 31f6379866 Merge pull request #318 from okriuchykhin/ok_SCI_736 
Add whitelisting of supported image types [SCI-736]
 2016-11-28 09:32:49 +01:00
zmagod 9d91d2ce28 adds new samples columns dropdown [fixes SCI-698] 2016-11-25 17:29:30 +01:00
okriuchykhin 5981d1a48e Merge pull request #316 from okriuchykhin/ok_SCI_738 
Add full name field to accept invitation form [SCI-738]
 2016-11-25 16:15:23 +01:00
Luka Murn 7658ae264a Add uniqueness to sample_type & sample_group name 
Closes SCI-720.
 2016-11-25 16:15:05 +01:00
Oleksii Kriuchykhin 74f6455a8f Add whitelisting of supported image types [SCI-736] 2016-11-25 16:12:43 +01:00
Luka Murn a16bbe8fd2 Typo fix 2016-11-25 11:52:33 +01:00
Luka Murn cb16ab3c75 Add Deface hooks to signup & confirm invitation forms 2016-11-25 11:50:20 +01:00
Oleksii Kriuchykhin 3fdb20b92c Add full name field to accept invitation form [SCI-738] 2016-11-25 11:15:10 +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
Luka Murn 87d3280847 Refactor registrations_controller code slightly 2016-11-25 09:56:07 +01:00
Oleksii Kriuchykhin 592ed802b2 Switched to use of recaptcha_input_tag helper method [SCI-706] 2016-11-24 14:19:44 +01:00
Oleksii Kriuchykhin 698e07a3b5 Enable reCaptcha and auto log in on confirm invitation form [SCI-706] 2016-11-24 14:11:02 +01:00
Mojca Lorber beae54e278 remove already_authenticated alert flash 2016-11-23 14:55:41 +01:00
zmagod 32eea3dbdd adds autolink to result comments 2016-11-23 14:24:51 +01:00
zmagod fafecce264 adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643] 2016-11-23 14:18:50 +01:00
Luka Murn 198febfd94 Fix user projects not working 2016-11-23 13:19:10 +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
Mojca Lorber 51abd8907c add switch to toggle email confirmations 2016-11-23 09:49:52 +01:00
Zmago Devetak 341fb13a26 Merge pull request #310 from ZmagoD/zd_add_email_login_constraints 
adds rake task that creates a sign up email domain constraint
 2016-11-23 09:16:24 +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 d75d58b159 moved email constraint to database_helper 2016-11-23 09:13:09 +01:00
Mojca Lorber 48ac289b6e put recaptcha in helper method 2016-11-22 17:57:42 +01:00
Luka Murn fba646bfba Fix Hound errors 2016-11-22 15:19:12 +01:00
Luka Murn 7cbe44d1f2 Refactor user projects & user my modules code 2016-11-22 15:16:26 +01:00
Luka Murn 201b1a48d5 Refactor user my modules code 2016-11-22 15:07:18 +01:00
Luka Murn e0607f7891 Refactor step comments code 2016-11-22 15:01:48 +01:00
Luka Murn 0c96036de8 Refactor some sample types code 2016-11-22 14:59:57 +01:00
Mojca Lorber 60f23b109b integrate reCaptcha into sciNote 2016-11-22 14:57:41 +01:00
Luka Murn 8ff5285179 Refactor some sample groups code 2016-11-22 14:57:01 +01:00
Luka Murn f5e286b1f6 Remove unused code for some more comments 2016-11-22 14:52:43 +01:00
zmagod 8d7285ce7c load comments after edit step [fixes SCI-716] 2016-11-22 14:39:08 +01:00
Luka Murn 1f7a8712fb Update task comments & task tags controllers & localized Strings 
(Remove a lot of unused code)
 2016-11-22 14:26:35 +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
mlorb f4aa75b4d2 Merge pull request #305 from mlorb/ml_sci_692 
Fix empty space and blockquote padding - rich text editing [SCI-692]
 2016-11-21 14:38:33 +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 1dff6c527e Merge pull request #302 from Ducz0r/lm-sci-691-fix 
Correctly import protocols with rich text [SCI-691]
 2016-11-21 14:04:22 +01:00
Luka Murn 59eb1c1d18 Remove unused new, edit user_projects views 2016-11-19 17:01:10 +01:00
Luka Murn 911b7ba72f Remove unused new user_my_module view 2016-11-19 16:59:24 +01:00
Luka Murn 6999105e51 Remove tags 2016-11-19 16:57:08 +01:00
Luka Murn 008b31df0c Finish removing new comment forms 2016-11-19 16:54:55 +01:00
Luka Murn 595b213b1a Changes up to samples in views folder 2016-11-19 16:51:40 +01:00
Mojca Lorber 91b0f4907c fix hound 2016-11-18 12:54:32 +01:00
Mojca Lorber 086f937fbb fix empty space and blockquote padding - rich text editing 2016-11-18 12:43:57 +01:00
Luka Murn f5795f5516 Remove unused assets & helpers 2016-11-18 11:30:03 +01:00
Luka Murn 3be30c0e7a Re-introduce fix for SCI-650 that was lost during merge 
Closes SCI-650.
 2016-11-18 10:57: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 08c6210f7c Also employ "no format" Nokogiri strategy when sanitizing 
Closes SCI-691.
 2016-11-17 16:43:14 +01:00
Luka Murn fc32aa8606 Add custom scrubber for QuillJs 2016-11-17 16:43:14 +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
zmagod da54d779ec Merge branch 'rich-text-formatting' of https://github.com/biosistemika/scinote-web into zd_SCI_687 2016-11-17 08:48:40 +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
Luka Murn aadcdde417 Merge pull request #294 from Ducz0r/lm-sci-674-fix 
Import protocol steps' rich text styling when importing protocols [SCI-674]
 2016-11-16 16:59:18 +01:00
Oleksii Kriuchykhin d2e29935cf Improved tutorial styling [SCI-685] 2016-11-16 15:44:06 +01:00
zmagod b781db9667 fixed bullets 2016-11-16 15:30:14 +01:00
zmagod e5ba134e83 fixes search 2016-11-16 14:50:06 +01:00
Zmago Devetak d3234bc52f Merge pull request #284 from biosistemika/zd_SCI_662 
fixes description label [fixes SCI-662]
 2016-11-16 14:16:57 +01:00
zmagod 7953372d83 add description label 2016-11-16 13:59:35 +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 4b8824ca16 Merge pull request #291 from Ducz0r/lm-sci-676-fix 
Allow inviting of unconfirmed user onto multiple teams [SCI-676]
 2016-11-16 11:32:01 +01:00
Luka Murn e4b3d397a0 Merge pull request #288 from Ducz0r/lm-sci-675-fix 
Fix a bug where user could be assigned to same project twice [SCI-675]
 2016-11-16 10:34:37 +01:00
Luka Murn 29f0557d3c Prevent CORS when importing protocols 2016-11-15 17:06:39 +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
Luka Murn d425a7ad05 Merge pull request #283 from Ducz0r/lm-sci-650-fix 
Update invited user form so it works if user inputs empty team name [SCI-650]
 2016-11-15 15:59:52 +01:00
Luka Murn eb4d031b79 Fix destroying of users in relation to notifications 2016-11-15 15:56:32 +01:00
Luka Murn 04749c3b2c Allow inviting of existing, unconfirmed users 
Closes SCI-676.
 2016-11-15 15:04:31 +01:00
Mojca Lorber c089832909 add validation for result text field 2016-11-15 12:55:32 +01:00
okriuchykhin 01b01939f3 Merge pull request #277 from okriuchykhin/ok_SCI_571 
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
 2016-11-15 12:05:20 +01:00
Luka Murn 7c03037643 Merge pull request #286 from Ducz0r/lm-sci-655-fix 
Save first time tutorial Activity-s without callbacks [SCI-655]
 2016-11-15 12:00:35 +01:00
mlorb c996df7476 Merge pull request #287 from mlorb/ml_sci_665 
Fix position of buttons in text result [SCI-665]
 2016-11-15 11:27:04 +01:00
Mojca Lorber 607f1381d0 fix mobile view 2016-11-15 10:58:15 +01:00
Luka Murn e733da728c Fix a bug where user could be assigned to same project twice 
Closes SCI-675.
 2016-11-15 10:44:32 +01:00
Zmago Devetak fddd7f662b Merge pull request #281 from ZmagoD/zd_SCI_660 
hide flash after 5 sec [fixes SCI-660]
 2016-11-15 10:33:45 +01:00
Zmago Devetak 914bd42448 Merge pull request #278 from ZmagoD/zd_search_bug_with_rich_text_editor 
strips the html tags from fearch query
 2016-11-15 10:30:29 +01:00
Mojca Lorber 6afc5c5a4b fix position of buttons in text result 2016-11-14 16:31:48 +01:00
Luka Murn fa6d8d3020 Save first time tutorial Activity-s without callbacks 
This PR adds a new, pretty useful little gem called sneaky-save.
Closes SCI-655
 2016-11-14 15:55:44 +01:00
Mojca Lorber 7002fc3f2f fix hound 2016-11-14 15:10:37 +01:00
Mojca Lorber 615cd3c278 profile changes for gamification 2016-11-14 15:04:18 +01:00
zmagod 67c508a891 fixes description label [fixes SCI-662] 2016-11-14 13:47:20 +01:00
zmagod 3728a6cef9 fixed sql regex 2016-11-14 12:32:41 +01:00
okriuchykhin 091cb0005e Merge pull request #280 from okriuchykhin/ok_SCI_658 
Show only protocols from Protocol Management in users statistics [SCI-658]
 2016-11-14 09:40:12 +01:00
Luka Murn 861e7cf72d Update invited user form so it works if user inputs empty team name 
Closes SCI-650
 2016-11-11 17:27:32 +01:00
Oleksii Kriuchykhin 2fb3041784 Fixes edit avatar link area [SCI-649] 2016-11-11 13:17:44 +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
Oleksii Kriuchykhin ab895ae864 Show only protocols from Protocol Management in users statistics [SCI-658] 2016-11-11 12:14:57 +01:00
mlorb 1ca452db7b Merge pull request #273 from mlorb/ml_sci_640 
Add rich text formatting on results and remove markdown [SCI-640]
 2016-11-11 12:06:13 +01:00
mlorb d42adff77e Merge pull request #275 from mlorb/ml_sci_642 
Add formatted text in reports [SCI-642]
 2016-11-11 12:04:19 +01:00
Mojca Lorber 4b7fa440f6 fix hound 2016-11-11 12:03:01 +01:00
Mojca Lorber 3b7af3e66c fix validation logic 2016-11-11 11:42:16 +01:00
zmagod 630724df2b strips the html tags from fearch query 2016-11-11 11:41:23 +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 5727158495 Hotfix to nicely render comments form on Firefox as well 2016-11-11 09:47:37 +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
Mojca Lorber 1facd2cefe fix validation problems 2016-11-10 17:20:17 +01:00
Luka Murn 0e065026bd Closes SCI-648 2016-11-10 16:18:17 +01:00
Mojca Lorber fbaffbcaab add formatted text in reports 2016-11-10 15:20:40 +01:00
Luka Murn 564274a588 Set invited_by field to invited users 2016-11-10 14:45:24 +01:00
Mojca Lorber d2ae11f1af fix hound 2016-11-10 14:16:54 +01:00
Mojca Lorber 3e162b3a93 remove redcarpet gem - markdown 2016-11-10 14:11:32 +01:00
Mojca Lorber 456c6d1ad6 Copy rich text functionality to text results 2016-11-10 12:19:59 +01:00
Mojca Lorber ab0879e8d6 Integrate library with default settings 2016-11-09 13:09:53 +01:00
Luka Murn c88f834ba9 Merge pull request #269 from Ducz0r/lm-sci-569 
Add a refactored invite users modal that can be reused throughout application
 2016-11-08 16:57:05 +01:00
Luka Murn b246853117 Code styling (use link_to, %w) 2016-11-08 16:43:25 +01:00
Zmago Devetak 82a12f0fce Merge pull request #262 from ZmagoD/zd_add_notification_types_to_constants 
Enables notifications to be extended
 2016-11-08 13:08:15 +01:00
Luka Murn d44a757b25 Add textareas to checklist name & items 
Closes SCI-644
 2016-11-08 11:50:29 +01:00
zmagod 330afe80dc fixes notification model 2016-11-08 11:46:09 +01:00
mlorb 0793fb9f11 Merge pull request #260 from mlorb/ml_sci_614 
Add notification for removing user from team and removing user from project [SCI-614]
 2016-11-08 11:30:49 +01:00
Luka Murn 55d8fea359 Make all comment edit fields textareas 2016-11-08 11:29:55 +01:00
Mojca Lorber 6f1c9ffb81 refactoring 2016-11-08 11:20:14 +01:00
Luka Murn 9438ba7e10 Fix a bug 2016-11-08 09:00:00 +01:00
Luka Murn 9260ed31f3 Add Deface hooks to main navbar 2016-11-07 16:57:18 +01:00
Mojca Lorber 63eb4eeaf8 fix hound 2016-11-07 15:33:21 +01:00
Mojca Lorber 27c83992b4 refactoring notification method 2016-11-07 15:31:06 +01:00
okriuchykhin fd805f4072 Merge pull request #259 from okriuchykhin/ok_SCI_605 
Added additional activities [SCI-605]
 2016-11-07 10:01:16 +01:00
Luka Murn ce7733e9e9 Also add notification when UserOrganization is created 2016-11-07 09:47:30 +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 a188984ede Allow strings of modal to be replaced 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
Oleksii Kriuchykhin fe6724431e Futher improvement of samples assign/unassign logging [SCI-605] 2016-11-07 09:29:56 +01:00
Oleksii Kriuchykhin a1bfacef86 Improved samples assign/unassign logging [SCI-605] 2016-11-03 17:59:32 +01:00
Matej Zrimšek 0fe5822825 Added profile statistics data hook. 2016-11-03 17:50:32 +01:00
Mojca Lorber a234c4c9d9 fix merge conflict problem with avatar on profile page 2016-11-03 15:23:09 +01:00
zmagod 1d6b93829c added hooks in notifications preview 2016-11-03 14:48:01 +01:00
Oleksii Kriuchykhin 3d25da5db7 Fixed bug with protocol loading from file [SCI-605] 2016-11-03 14:15:22 +01:00
zmagod 3c9bd6f511 enables notification to be extended 2016-11-02 14:44:16 +01:00
Mojca Lorber 44b51d087a merging 2016-11-02 14:06:20 +01:00
Mojca Lorber 749b108928 fix hound 2016-11-02 13:32:15 +01:00
Mojca Lorber a2213e23b3 add notification for removing user from team and removing user from project 2016-11-02 11:52:41 +01:00
Oleksii Kriuchykhin e8d20dfc01 Added additional activities [SCI-605] 2016-11-02 10:43:36 +01:00
Zmago Devetak 6e022699eb Merge pull request #256 from ZmagoD/add_getting_started_flash_hook 
Added getting started hoot to layout/application.html
 2016-10-28 16:19:20 +02:00
zmagod 01b27e9e6d added getting started hoot to layout/application.html 2016-10-28 10:36:15 +02:00
Mojca Lorber 91ec201fd0 make image clickable 2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
Mojca Lorber 888aa31aed fix hound 2016-10-27 11:18:11 +02:00
Mojca Lorber 5719d4c61f show edit avatar on mouse hover, add background and center image 2016-10-27 11:09:30 +02:00
Mojca Lorber 8309df0aaf fix hound 2016-10-26 13:51:05 +02:00
Mojca Lorber 878952f072 change edit avatar in profile 2016-10-26 13:41:17 +02: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
Luka Murn eec6b1403d Merge pull request #247 from Ducz0r/lm-hotfix-blank-current-org 
Add check in application controller to always set current org if nil
 2016-10-25 11:53:05 +02:00
Zmago Devetak 266d1415d0 Merge pull request #246 from ZmagoD/zd_SCI_599 
fixes error when removing user from team [SCI-599]
 2016-10-25 11:52:44 +02:00
Luka Murn 7885fd0f39 Add check in application controller to always set current org if nil 2016-10-25 11:39:57 +02:00
zmagod 6a328969f0 reset current_user if the user leaves the team [fixes SCI-599] 2016-10-25 09:53:02 +02:00
zmagod 24b81c96f6 sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608] 2016-10-24 21:20:41 +02:00
zmagod e02132578a first run 2016-10-24 20:07:20 +02:00
Luka Murn b13fd22408 Add back the release notes URL to navbar 
Closes SCI-604
 2016-10-24 16:59:32 +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 9a4603dd7d removed unneeded css 2016-10-21 16:27:53 +02:00
Luka Murn 388e092bbf Merge pull request #238 from Ducz0r/lm-sci-596-fix 
SCI-596 fix
 2016-10-21 11:59:01 +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
Zmago Devetak 4f5b7ad8ad Merge pull request #228 from ZmagoD/zd_SCI_585 
Removes archived projects from index page [fixes SCI-585]
 2016-10-21 11:33:01 +02:00
Luka Murn 7b825a217f Closes SCI-596 2016-10-21 11:08:47 +02:00
Zmago Devetak af0e9b99b6 Merge pull request #233 from ZmagoD/zd_SCI_591 
Move tooltip to the right [fixes SCI-591]
 2016-10-21 10:38:25 +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
Oleksii Kriuchykhin 5be7904f5a Fix hound warnings [SCI-557] 2016-10-21 09:37:24 +02:00
zmagod c642e208dd styled global team switch and search [fixes SCI-593] 2016-10-21 09:33:18 +02:00
zmagod db806f3c10 hide private projects 2016-10-21 09:06:19 +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
Zmago Devetak 094e989af5 Merge pull request #227 from ZmagoD/zd_SCI_587 
Removes org selector form project archive [fixes SCI-587]
 2016-10-20 16:32:46 +02:00
zmagod 9214adc591 fixed team name position 2016-10-20 15:35:09 +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
zmagod f9fb4d8bd6 move tooltip to the right [fixes SCI-591] 2016-10-20 14:34:45 +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
zmagod 4c086a6fc1 removes archived projects from index page [fixes SCI-585] 2016-10-20 13:13:44 +02:00
zmagod 8aaf58f75f removes org selector form project archive [fixes SCI-587] 2016-10-20 12:50:55 +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 76f6e30078 fixes word-wrap on mozilla 2016-10-17 15:36:33 +02:00
zmagod 557957c857 fixed issue with mozilla browsers 2016-10-17 15:21:19 +02:00
zmagod 54a3237994 displays org name on the project index page if no project 2016-10-17 15:21:19 +02:00
zmagod 8a6899aeea restyled team switch dropdown 2016-10-17 15:21:19 +02:00
zmagod a116feac9c fixed typos and added truncation to org name 2016-10-17 15:21:19 +02:00
zmagod 1614cbc2b2 fixes repeat tutorial button and localization typos 2016-10-17 15:16:22 +02:00
zmagod 931cba2666 fixes hound [fixes SCI-512] 2016-10-17 15:10:26 +02:00
zmagod e85ed788f2 fixed user_generator 2016-10-17 15:10:26 +02:00
zmagod fa36488397 fixed new project form 2016-10-17 15:10:26 +02:00
zmagod 8f24d0d80c fixed new user registration 2016-10-17 15:10:26 +02:00
zmagod 8cd86a50bb styled dropdown 2016-10-17 15:10:26 +02:00
zmagod 3117a464f0 fixed controllers 2016-10-17 15:10:26 +02:00
zmagod bb9c03df24 fixes controllers 2016-10-17 15:10:26 +02:00
zmagod d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
zmagod efe031d766 setup current_organization in all controllers 2016-10-17 15:10:26 +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 a31753ea39 Added additional color constants. Fix Ruby color constants RGB format so no errors occur for external Gems. 2016-10-17 11:57:47 +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 5966911b92 Fixed Hound alerts. 2016-10-17 11:57:46 +02:00
Matej Zrimšek 778ed8814b Removed some unneeded code. 2016-10-17 11:57:46 +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
Luka Murn 845d487fa1 Merge pull request #218 from Ducz0r/lm-mail-previews 
Add notification mailer preview
 2016-10-13 14:58:04 +02:00
Oleksii Kriuchykhin c6fb57318f Added use of constants in JS [SCI-530] 2016-10-13 13:06:11 +02:00
Luka Murn 02d3e03f75 Bugfix for notification emails 
The URLs in notification emails didn't get server URL prepended,
so users could not click on them.
 2016-10-13 12:12:28 +02:00
Oleksii Kriuchykhin 37cff75013 Fixes issue with comments options menu [SCI-530] 2016-10-13 12:07:41 +02:00
mlorb cbc14d9d50 Merge pull request #211 from mlorb/ml_sci_491 
change 80s glow [SCI-491]
 2016-10-13 10:13:14 +02:00
Mojca Lorber c51aedb178 change thickness of shadow 2016-10-13 10:11:32 +02:00
Luka Murn bdaeb4db13 Add notification mailer preview 2016-10-13 08:56:04 +02:00
mlorb 78f7879c04 Merge pull request #216 from mlorb/ml_sci_555 
Adding update notifications in settings [SCI-555]
 2016-10-13 08:53:55 +02:00
Mojca Lorber 8f783f87f7 fixes hound 2016-10-12 15:32:40 +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
Luka Murn cccabcdd7b Remove invitation_to_organization email 
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
 2016-10-12 10:54:36 +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
Zmago Devetak b225dc1e29 Merge pull request #210 from ZmagoD/zd_SCI_548_protocol_steps_not_visible 
Fixes protocol steps [fixes SCI-548]
 2016-10-12 08:13:28 +02:00
Oleksii Kriuchykhin 4c6a60c249 Added html_safe to notification email template 2016-10-11 16:46:20 +02:00
Oleksii Kriuchykhin 90c853743c Additional fixes to email markup and logic [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin 3f219e1bfe Hound code style fixes [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin 5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin 8dc956010c Initial code commit [SCI-443] 2016-10-11 16:43:17 +02:00
Mojca Lorber b1b23b8f41 fixes hound 2016-10-11 10:39:00 +02:00
Mojca Lorber 63ec63047d change 80s glow 2016-10-11 10:33:26 +02:00
Zmago Devetak 692b31325b Merge pull request #206 from ZmagoD/zd_SCI_561 
Fixed assinement icon [fixes SCI-561]
 2016-10-11 09:32:47 +02:00
zmagod ea305b356a fixes protocol steps [fixes SCI-548] 2016-10-11 09:10:12 +02:00
zmagod 42a30576e3 removed introductory popup [fixes SCI-534] 2016-10-11 08:33:50 +02:00
Luka Murn 448daab7c8 Merge pull request #207 from biosistemika/add-deface-hotfix 
Merge hotfix 1.3.1 into master
 2016-10-07 18:26:13 +02:00
zmagod fe7b367eae fixed hound 2016-10-07 15:25:53 +02:00
zmagod 130db6a2c3 fixed assignment icon [fixes SCI-561] 2016-10-07 12:27:44 +02:00
zmagod 32f03ec94c Add Deface hooks 2016-10-06 16:47:36 +02:00
Jure Grabnar 1f67aec258 Prevent destroying protocols when file is edited 
SCI-552 #close
 2016-10-06 16:13:42 +02:00
Jure Grabnar b52e596209 Update protocol timestamp on put_file 
SCI-551 #close
 2016-10-06 14:37:42 +02:00
zmagod 0bdf77562d add word-wrap to notrification index page [fixes SCI-556] 2016-10-06 13:49:24 +02:00
zmagod de00a19dd9 fixes styling in settings preferences [SCI-553] 2016-10-06 13:22:44 +02:00
zmagod 5b3889c172 notification index images [fixes SCI-554] 2016-10-06 12:09:01 +02:00
Luka Murn 5c80c8a817 Add "no notifications" to dropdown & notifications index page 2016-10-05 16:58:21 +02:00
Luka Murn 877574e853 Add link to settings from both notification lists 2016-10-05 16:26:26 +02:00
Luka Murn 56d2240de5 Optimize data query in user_notification.rb 2016-10-05 16:21:13 +02:00
Oleksii Kriuchykhin 083a09c2f7 Add link to notifications index page 2016-10-05 16:13:05 +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 4e2ad1d5e6 Fix the issues after code review [SCI-442] 2016-10-05 15:54:31 +02:00
Oleksii Kriuchykhin c783e9a03d Code fix after rebase with latest master [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin d2b48e94bd CSS color fix [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin 868ffd03d6 JS code improvement [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin 246dae4f46 Code style improvements according to hound [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
Oleksii Kriuchykhin 8b5b0723d1 Initial code commit 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
Zmago Devetak c547d8a07a Merge pull request #195 from ZmagoD/zd_SCI_532 
add word wrapping to notifications dropdown [fixes SCI-532]
 2016-10-05 14:54:10 +02:00
zmagod dfcbebbf4f cleaned up bootstrap extension 2016-10-05 14:49:23 +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 9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
zmagod cba4318185 add word wrapping to notifications dropdown [fixes SCI-532] 2016-10-05 13:22:33 +02:00
zmagod 5bf278298b fixed navbar on sceens smaller than 1000px 2016-10-05 12:22:27 +02:00
zmagod f9d956bbca fix notifications number on [fixes SCI-531] 2016-10-05 11:50:57 +02:00
zmagod c4f28c3649 made notification images bigger [fixes SCI-533] 2016-10-05 10:16:51 +02:00
zmagod 848beb5d4b minor fix 2016-10-05 09:46:18 +02:00
zmagod d7a4f85ba1 added links to notification project name and task 2016-10-05 09:40:44 +02:00
zmagod d90f17d1eb clean comments date duplication [fixes SCI-469] 2016-10-05 08:42:32 +02:00
Jure Grabnar 62356c36a1 Add file extension to global search 2016-10-04 19:04:08 +02:00
Jure Grabnar 85d2370d28 Change some values to string in CheckFileInfo 2016-10-04 18:19:36 +02:00
Jure Grabnar 3e74c96085 Add wd* params to iframe action url 2016-10-04 18:00:08 +02:00
zmagod 6229e6a3a1 styled notification settings button [fixes SCI-529] 2016-10-04 16:12:56 +02:00
zmagod a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Jure Grabnar 0c7cd52dba Add WOPI icons/buttons to files 2016-10-04 12:34:43 +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
Jure Grabnar 72c5824e67 Remove navbar for viewing WOPI files 2016-10-03 20:02:13 +02:00
Jure Grabnar ec82f64df2 Add WOPI breadcrumbs 2016-10-03 19:45:39 +02:00
Jure Grabnar 1949b1fe88 Add CloseUrl to WOPI 2016-10-03 18:25:01 +02:00
mlorb 00b0f6ab07 Merge pull request #184 from mlorb/ml_sci_472 
Protocol steps/results - change title for comment section, remove info tab [SCI-472]
 2016-10-03 17:20:45 +02:00
Jure Grabnar 03567d6208 Prevent archive of locked result asset 2016-10-03 17:07:57 +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
Mojca Lorber 3b0185a45b change title of modal 2016-10-03 16:33:58 +02:00
zmagod 0d23f05698 Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440 2016-10-03 16:14:22 +02:00
zmagod 36fb2713b3 start fixing comments dates 2016-10-03 16:10:20 +02:00
Zmago Devetak 84313a28a0 Merge pull request #186 from ZmagoD/zd_SCI_441_vol2 
code notifications in toolbar
 2016-10-03 16:09:04 +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
Oleksii Kriuchykhin a39c948c5f System notifications code rework 2016-10-03 15:21:26 +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
zmagod 947096862d fixed hound 2016-10-03 11:40:59 +02:00
zmagod ea17182372 generate notifications [fixes SCI-440] 2016-10-03 11:37:29 +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
Mojca Lorber 5b32be2137 adding subtitle in modal 2016-10-03 09:28:58 +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
Jure Grabnar 1e14955ade Prevent deleting asset on step update 2016-10-01 18:47:05 +02:00
Jure Grabnar d9fa882d6a Add check for locked files on step delete 2016-10-01 14:51:55 +02:00
Jure Grabnar 5c9e995e56 Don't delete asset on locked 2016-10-01 13:23:04 +02:00
Jure Grabnar a2d6d9a29a Add WOPI controlls to result 2016-10-01 11:23:32 +02:00
Jure Grabnar a6ebff06a7 Add error message to wopi discovery 
Fix ambigious open call
 2016-09-30 10:39:14 +02:00
Oleksii Kriuchykhin f5cc2fe225 Code style fixes 2016-09-30 09:34:58 +02:00
Luka Murn f70829d1a9 Merge pull request #179 from okriuchykhin/ok_SCI-380 
Fixes ordering of checklist items in search results [SCI-380]
 2016-09-30 08:28:07 +02:00
Luka Murn 49c5474219 Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2 
Fixed wrong CSS formatting and added release notes link to help link.
 2016-09-30 08:27:57 +02:00
Luka Murn e32e0a232c Merge pull request #177 from okriuchykhin/ok_SCI-480 
Fixes issue with scrollbar on sidebar [SCI-480]
 2016-09-30 08:25:54 +02:00
Luka Murn 12c9f9a42f Merge pull request #175 from okriuchykhin/ok_SCI-423 
Fix issue with spinner in avatar upload [SCI-423]
 2016-09-30 08:25:15 +02:00
Luka Murn 380d0740f8 Merge pull request #174 from okriuchykhin/ok_SCI-477 
Fix issue with words break in task description and comments [SCI-477]
 2016-09-30 08:25:04 +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
Luka Murn b1d25cb18f Merge pull request #172 from ZmagoD/zd_SCI_465 
Generate new experiment img after task restored [fixes SCI-465]
 2016-09-30 08:24:31 +02:00
Oleksii Kriuchykhin 036bda3afa Initial code for system notifications [SCI-444] 2016-09-29 16:51:27 +02:00
Mojca Lorber 35477b1005 Remove Info tab and change comment title on results view 2016-09-29 16:43:19 +02:00
Jure Grabnar ff47f29dc2 Add wopi file activity 
SCI-393 #close
 2016-09-29 16:16:42 +02:00
zmagod 60a503f115 added assignment image 2016-09-29 16:05:43 +02:00
zmagod e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Mojca Lorber c9fbf845f1 Remove Info tab and change comment title 2016-09-29 14:37:29 +02:00
Matej Zrimšek a6324d61c5 Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab. 2016-09-29 14:27:26 +02:00
Mojca Lorber 5d905f0094 refactoring 2016-09-29 14:18:04 +02:00
Luka Murn f1b74f1906 Fix image names in introductory popup 
This will make sure browsers don't display old, cached images to clients.
 2016-09-29 13:44:38 +02:00
Jure Grabnar ed8df3cc62 Add favicon url to iframe 2016-09-29 12:19:29 +02:00
Jure Grabnar 3bc683be8f Fix access_token_ttl calculation 2016-09-29 10:57:08 +02:00
Jure Grabnar bc22697ebe Take/release space in putfile 2016-09-28 18:02:47 +02:00
Jure Grabnar 5e5f4c5ed4 Add text extraction on unlock 2016-09-28 17:36:53 +02:00
Jure Grabnar 02ddd64aaa Set last_modified_by on put_file 2016-09-28 17:00:19 +02:00
Mojca Lorber f4345f3aef fixes hound 2016-09-28 16:09:39 +02:00
zmagod cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +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 485497334d generated notification related migrations and model tests 2016-09-28 14:18:52 +02:00
Jure Grabnar e96e8486ea Add check file permissions to assets controller 
SCI-502 #close
 2016-09-28 09:33:44 +02:00
Jure Grabnar 25c9ec67b3 Check permissions in wopi_controller 2016-09-28 09:33:44 +02:00
Jure Grabnar 5aea0fbb19 Refactor the rest of WOPI logic from Nejc 2016-09-28 09:33:44 +02:00
Jure Grabnar c1ae4360a3 Refactor WopiController 2016-09-28 09:33:44 +02:00
Jure Grabnar 0c9292e4fc Catch GET_SHARE_URL post file action 2016-09-28 09:33:44 +02:00
Jure Grabnar 3600fbfe64 Fix UnlockUnlockedFile action 
The time was nigh!
 2016-09-28 09:33:44 +02:00
Jure Grabnar 674326e761 Add timestamp WOPI checking 
Change status error code to 500.
 2016-09-28 09:33:44 +02:00
Jure Grabnar b51f2a3027 Add basic WOPI proof checking 
Still missing validation of timestamp.
Remove web_console gem for testing.
Add relevant tests from manual for WOPI proof.
 2016-09-28 09:33:44 +02:00
Jure Grabnar 0e9756ad94 Fix bad step view rebase 2016-09-28 09:33:44 +02:00
Nejc Bernot 1b260785ec First working version of office integration 
Only works on scinote-preview
 2016-09-28 09:33:44 +02:00
Nejc Bernot b2b1d5a8f5 Initial commit of WOPI integration 2016-09-28 09:33:44 +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
Oleksii Kriuchykhin 366a49f3a1 Fixes ordering of checklist items in search results [SCI-380] 2016-09-27 13:00:51 +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
Oleksii Kriuchykhin f9e5d204bb Fixes issue with scrollbar on sidebar [SCI-480] 2016-09-27 10:43:07 +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
Oleksii Kriuchykhin 792f949a61 Fix issue with spinner in avatar upload [SCI-423] 2016-09-27 09:12:31 +02:00
zmagod 02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
Oleksii Kriuchykhin 908ee05a23 Fix issue with words break in task description and comments [SCI-477] 2016-09-26 16:03:22 +02:00
Oleksii Kriuchykhin 8a3a9451e9 Fix issue with duplicate error messages in experiments modal [SCI-484] 2016-09-26 12:58:22 +02:00
zmagod 30a8f52216 generate new experiment img after task restored [fixes SCI-465] 2016-09-26 09:48:49 +02:00
Mojca Lorber cc5cdf2577 Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321 2016-09-26 09:39:05 +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
mz3944 1c1a7c231e Merge pull request #169 from mz3944/mz_help_button_SCI_13 
Added help dropdown. [SCI-13]
 2016-09-23 13:04:38 +02:00
okriuchykhin 4f0fb7074b Merge pull request #167 from okriuchykhin/ok_SCI-470 
Fix issue with long tags in dropdown list [fixes SCI-470]
 2016-09-23 13:00:06 +02:00
Matej Zrimšek fc86b7b1fd Added help dropdown. [SCI-13] 2016-09-23 12:52:38 +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
Oleksii Kriuchykhin e8ac754829 Fix issue with long tags in dropdown list [fixes SCI-470] 2016-09-23 11:05:17 +02:00
okriuchykhin a7f3f793c8 Merge pull request #161 from okriuchykhin/ok_SCI-380 
Fixes issue with reordering of checklist items [fixes SCI-380]
 2016-09-23 10:37:56 +02:00
okriuchykhin 5896cdc4bc Merge pull request #158 from okriuchykhin/ok_SCI_314 
Fixes issue with import of empty protocol [fixes SCI-314]
 2016-09-23 10:37:35 +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
Matej Zrimšek 13e886f7a9 Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408] 2016-09-22 17:35:23 +02:00
okriuchykhin 087ee08976 Merge pull request #164 from okriuchykhin/ok_SCI-400 
Fixes issue with new experiment modal and with move of experiments [fixes SCI-400]
 2016-09-22 17:01:58 +02:00
Oleksii Kriuchykhin 841e495234 Fix brace position [fixes SCI-380] 2016-09-22 16:48:15 +02:00
okriuchykhin b5c861583d Merge pull request #157 from okriuchykhin/ok_SCI_430 
Fixes issue with unneeded sort icon [fixes SCI-430]
 2016-09-22 16:39:26 +02:00
Oleksii Kriuchykhin 28ab599373 Change double quotes to single [fixes SCI-314] 2016-09-22 16:36:37 +02:00
okriuchykhin 729cbef27b Merge pull request #156 from okriuchykhin/ok_SCI-459 
Fixes issue with too many " | " signs in error message [fixes SCI-459]
 2016-09-22 16:12:17 +02:00
okriuchykhin 37eedf17a0 Merge pull request #155 from okriuchykhin/ok_SCI-451 
Fixes issue with zoom buttons on canvas [fixes SCI-451]
 2016-09-22 16:11:45 +02:00
Matej Zrimšek 09405c667e Added missing validation for protocol description. [SCI-408] 2016-09-22 15:52:12 +02:00
Oleksii Kriuchykhin 0dd1196ae5 Fixes issue with move of experiments between projects [fixes SCI-400] 2016-09-22 15:10:15 +02:00
zmagod 303cb4308a fixes load comments [fixes SCI-471] 2016-09-22 13:46:27 +02:00
Oleksii Kriuchykhin b334b037f8 Fixes issue with old data in modal fields [fixes SCI-400] 2016-09-22 10:54:03 +02:00
Matej Zrimšek c614843044 Minor refactoring with hound alert fixes. 2016-09-21 19:48:18 +02:00
Matej Zrimšek 234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
Matej Zrimšek c6a23aab98 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +02:00
Zmago Devetak 5fedcb4be2 Merge pull request #160 from ZmagoD/zd_SCI_464 
Fixes restore experiment error [fixes SCI-464]
 2016-09-21 19:24:33 +02:00
zmagod 06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436 2016-09-21 19:20:55 +02:00
zmagod 8a8bf10f08 clean up flash label 2016-09-21 19:09:57 +02:00
Oleksii Kriuchykhin 011bb2d910 Fixes issue with reordering of checklist items [fixes SCI-380] 2016-09-21 14:06:47 +02:00
zmagod bf8e2a208f fixes restore experiment error [fixes SCI-464] 2016-09-21 08:34:32 +02:00
zmagod 2bfe8f0636 fixing hound 2016-09-21 08:16:23 +02:00
zmagod 9f56df02d2 removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
zmagod 42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod da86208441 styled step comments 2016-09-20 14:13:40 +02:00
Oleksii Kriuchykhin 9b7360eebf Fixes issue with import of empty protocol [fixes SCI-314] 2016-09-20 13:41:29 +02:00
zmagod 0ca65aeca5 fixed step comment sorting 2016-09-20 13:31:50 +02:00
Oleksii Kriuchykhin 411ee4ee77 Fixes issue with unneeded sort icon [fixes SCI-430] 2016-09-20 11:30:11 +02:00
zmagod cd64e035c0 set form validations 2016-09-20 09:50:03 +02:00
zmagod f48553e807 fixed ajax call 2016-09-19 16:12:07 +02:00
Oleksii Kriuchykhin 3f0a2c7dfc Fixes issue with too many " | " signs in error message [fixes SCI-459] 2016-09-19 13:53:24 +02:00
Oleksii Kriuchykhin a3b00d0ff8 Fixes issue with zoom buttons on canvas [fixes SCI-451] 2016-09-16 16:27:54 +02:00
Matej Zrimšek ffe6799313 Fixed hound alerts. 2016-09-16 15:57:54 +02:00
Matej Zrimšek dd6e8a3a9a Added step name word wrapping (needs to be improved). 2016-09-16 15:57:54 +02:00
Matej Zrimšek 20ca37f185 Readded client-side result's comment validation. 2016-09-16 15:57:54 +02:00
Matej Zrimšek c2f0106993 Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
zmagod 938aa32190 js tweaks 2016-09-16 15:22:24 +02:00
zmagod 635f6b92d6 fixed comments display 2016-09-16 11:55:10 +02:00
Zmago Devetak 431227c0a4 Merge pull request #147 from maslick/resultCommentsError1000Chars 
Fixed: Comments in results have no error message if the text exceeds 1000 characters
 2016-09-16 09:38:38 +02:00
zmagod b9b466cd8e Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas 2016-09-16 09:28:19 +02:00
mz3944 556238f39f Merge pull request #150 from mz3944/mz_local_file_upload_fix 
URL presigning is now used only when using S3 file uploading (caused …
 2016-09-16 09:17:23 +02:00
zmagod e90f0bd3d5 refactor step view 2016-09-16 09:04:21 +02:00
Zmago Devetak 01656c1018 Merge pull request #153 from ZmagoD/zd_SCI_448 
Wrong name of experiment and task - gets undefined as prefix
 2016-09-15 15:00:34 +02:00
mlorb 587369e7a6 Merge pull request #152 from mlorb/ml_sci_428 
fixes responsiveness on mobile phone for sample view [SCI-428]
 2016-09-15 12:11:48 +02:00
Zmago Devetak 7c4a62d138 Merge pull request #139 from ZmagoD/zd_SCI_410 
fixed moved experiment thumbnail [fixes SCI-410]
 2016-09-15 11:58:48 +02:00
zmagod 779b713148 refactor code 2016-09-15 11:55:02 +02:00
zmagod 0a2ab57e28 styled new comments layout 2016-09-15 11:45:51 +02:00
zmagod d146970f6b add generate workflow image method for moved modules 2016-09-15 09:32:29 +02:00
zmagod e3ae22763e removed comments tab in protocol step 2016-09-15 08:46:14 +02:00
mlorb 098e17c0d8 Merge pull request #149 from mlorb/ml_sci_420 
fixes links and missing experiment level in search results [SCI-420]
 2016-09-14 15:42:16 +02:00
Zmago Devetak d0a180a1e8 Merge pull request #148 from ZmagoD/zd_SCI_342 
fixes sidebar expanded elements when adding new experiments
 2016-09-14 13:48:34 +02:00
Mojca Lorber 65415415b6 fixes hound again again 2016-09-14 11:37:17 +02:00
Mojca Lorber 386cedda71 fixes hound again 2016-09-14 11:34:24 +02:00
Mojca Lorber aba5305cd6 fixes hound 2016-09-14 11:24:19 +02:00
zmagod c4fabdb67a clean unneeded Observer configurations 2016-09-14 11:16:42 +02:00
zmagod e1d871dcdb clear undefind from experiment name and refactor sidebar in reports [fixes SCI-448] 2016-09-14 11:11:35 +02:00
Mojca Lorber a9029e0928 fixes responsiveness on mobile phone for sample view 2016-09-14 11:08:40 +02:00
mz3944 ea898ed3ce Merge pull request #145 from mz3944/mz_checklists_items_move_and_step/result_comment_fix 
Fixed step's checklist items editing (items not multiplying and new i…
 2016-09-13 19:05:10 +02:00
Matej Zrimšek 76ff34a8a9 URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring. 2016-09-13 18:56:47 +02:00
Mojca Lorber 36378d03e2 fixes links and missing experiment level in search results 2016-09-13 17:13:58 +02:00
zmagod d5c5c55bf2 refactor 2016-09-13 16:32:33 +02:00
Zmago Devetak b26bf7b183 Merge pull request #136 from ZmagoD/zd_SCI_370 
Enabled to delete results in task archive [fixes SCI-370]
 2016-09-13 15:22:08 +02:00
zmagod 29a2904513 fixed moving action of workflows and tasks 2016-09-13 14:51:53 +02:00
zmagod 7c363d5ade fixed security issue 2016-09-13 13:57:31 +02:00
Zmago Devetak 319893bf81 Merge pull request #143 from ZmagoD/zd_SCI_372 
Set move and clone permissions
 2016-09-13 13:37:23 +02:00
zmagod 3d5a42cc27 refactor results controller 2016-09-13 13:26:04 +02:00
zmagod 222ddf7438 fixed houd error 2016-09-13 13:26:04 +02:00
zmagod 691ae94d2c enabled to delete results in task archive [fixes SCI-370] 2016-09-13 13:26:04 +02:00
zmagod 65383f1824 fixes sidebar expanded elements when adding new experiments [fixes SCI-342] 2016-09-13 13:09:57 +02:00
Pavel Maslov 15ea8fc0dc Bug fixed: comments in results have no error message if the text exceeds 1000 characters. 2016-09-13 12:01:56 +02:00
Zmago Devetak d37c7b853b Merge pull request #140 from ZmagoD/zd_SCI_341 
adds label to current project in clone experiment modal [fixes SCI-341]
 2016-09-13 11:59:01 +02:00
Zmago Devetak f86c6b954e Merge pull request #141 from ZmagoD/zd_SCI_340 
styled dottel line in sidebar [fixes SCI-340]
 2016-09-13 11:58:26 +02:00
Jure Grabnar 6519e8dbb1 Add e-notation preprocessing to formulas 
SCI-350 #close
 2016-09-13 09:46:22 +02:00
Jure Grabnar fa3515d2eb Add formulas to reports 2016-09-13 09:46:21 +02:00
Jure Grabnar 3b364be70b Add formulas to steps tables 2016-09-13 09:44:17 +02:00
Jure Grabnar 5c88bdeeae Add formulas for readonly results tables 2016-09-13 09:44:17 +02:00
Jure Grabnar e096f936f9 Add formulas to results 2016-09-13 09:44:17 +02:00
Matej Zrimšek af8ab3e081 Fixed step's checklist items editing (items not multiplying and new item insertion always at bottom) [fixes SCI-427]. Improved step/result comment GUI [SCI-446]. 2016-09-12 16:55:46 +02:00
zmagod 1b31f8827d set experiment description to 255 2016-09-08 14:35:52 +02:00
Zmago Devetak 1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
mlorb f4029a04fd Merge pull request #142 from mlorb/ml_sci_415 
fixes navbar size when resizing window [SCI-415]
 2016-09-08 12:46:36 +02:00
Matej Zrimšek 6eca3661bf Some JS error refactoring and accordingly updated error rendering when experiment description is too long. 2016-09-08 12:43:31 +02:00
Mojca Lorber 0435011fee fixes hound 2016-09-08 12:43:30 +02:00
Mojca Lorber 302a777615 fixes button collision 2016-09-08 12:37:06 +02:00
zmagod faed0500c7 set move and clone permissions to also validate the user on the organizational level [fixes SCI-372] 2016-09-08 09:23:29 +02:00
Mojca Lorber 4c66ca6f80 fixes navbar size when resizing window 2016-09-08 09:17:58 +02:00
Matej Zrimšek 40355dcc97 If file is recognized as office file, it's allowed to be any office file type. 2016-09-07 14:04:11 +02:00
Luka Murn 0c1759c15a Merge pull request #135 from Ducz0r/lm-sci-397 
Resize archived experiment panels
 2016-09-07 11:14:53 +02:00
mz3944 d3a3dd4428 Merge pull request #138 from mz3944/mz_result_edit_and_name_length_check_fix 
Fixed result file deletion and result name updating [fixes SCI-409]. …
 2016-09-07 11:07:23 +02:00
mz3944 5f446ab1f0 Merge pull request #134 from mz3944/mz_delete_step_file_fix 
Fixes files deletion when rails worker is running [fixes SCI-411] and…
 2016-09-07 11:00:50 +02:00
zmagod d92597ac30 styled dottel line in sidebar [fixes SCI-340] 2016-09-07 09:01:40 +02:00
zmagod d482dff2e6 adds label to current project in clone experiment modal [fixes SCI-341] 2016-09-07 08:26:36 +02:00
zmagod 487d3e18f4 fixed moved experiment thumbnail [fixes SCI-410] 2016-09-07 07:55:45 +02:00
Matej Zrimšek b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +02:00
zmagod daa144ce7c added missing bracket 2016-09-06 11:57:03 +02:00
zmagod 856d226946 fixed move experiment form error duplication 2016-09-06 11:48:56 +02:00
zmagod a5a24c7610 clear unused variable 2016-09-06 11:46:28 +02:00
zmagod b672d85405 fixed error message duplication 2016-09-06 11:46:28 +02:00
zmagod b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod 9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
zmagod de6c03a73b setup experiment modal input validation 2016-09-06 11:44:03 +02:00
Zmago Devetak 9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
zmagod c526cab498 removed commented code 2016-09-06 11:38:02 +02:00
mlorb f0e28b90a0 Merge pull request #133 from mlorb/ml_sci_415 
minimize buttons on mobile phone [SCI-415]
 2016-09-06 11:26:32 +02:00
Luka Murn bda5120548 Resize archived experiment panels 
Closes SCI-397.
 2016-09-06 10:55:05 +02:00
Matej Zrimšek 9fb30c7661 Fixes files deletion when rails worker is running [fixes SCI-411] and fixes picture's style files deletion. 2016-09-06 10:40:01 +02:00
Mojca Lorber 47983812e7 minimize buttons on mobile phone 2016-09-06 10:10:49 +02:00
Zmago Devetak 1a19753df9 Merge pull request #128 from ZmagoD/zd_SCI_105 
Trim long words in reports [fixes SCI-105]
 2016-09-06 10:10:06 +02:00
zmagod a7b6135b2f cleared console.log 2016-09-06 10:08:32 +02:00
Luka Murn 81883911c4 Merge pull request #132 from Ducz0r/lm-sci-228 
Updates to invite users to team modal window
 2016-09-05 15:53:15 +02:00
mlorb aea288371f Merge pull request #129 from mlorb/ml_sci_310 
adds tasks, experiment and project category in protocol search results [SCI-310]
 2016-09-05 15:31:35 +02:00
Luka Murn 1d8600b39f Fix bug when inviting existing users onto teams 
Closes SCI-228
 2016-09-05 14:52:56 +02:00
mz3944 50e0c26e89 Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399 
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
 2016-09-05 11:49:04 +02:00
Mojca Lorber 6a802e9fa7 fixes redirection to project page for all categories in search results 2016-09-05 11:40:49 +02:00
Mojca Lorber 740392c687 optimization 2016-09-05 10:58:37 +02:00
zmagod 667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
Zmago Devetak fb6bc31bec Merge pull request #127 from ZmagoD/zd_SCI_247_again 
Table from step stays in report, although it is deleted from step.
 2016-09-02 15:59:17 +02:00
Zmago Devetak ea26a532e4 Merge pull request #126 from ZmagoD/zd_SCI_332 
By default all experiments should be collapsed
 2016-09-02 15:58:03 +02:00
Mojca Lorber 6763d8e7a1 fixes hound again 2016-09-02 11:56:32 +02:00
Mojca Lorber 4bce00ac61 fixes hound 2016-09-02 11:54:20 +02:00
Mojca Lorber 83034f705d adds tasks, experiment and project category in protocol search results 2016-09-02 11:45:54 +02:00
zmagod 28fa00c30c trim long words in reports [fixes SCI-105] 2016-09-01 15:45:39 +02:00
zmagod 4afaa50ce0 fixed multiple tables check 2016-09-01 13:49:12 +02:00
zmagod 111cb81d08 clear tables from report [fixes SCI-247] again 2016-09-01 13:38:09 +02:00
Luka Murn 61f4fbd1d4 Remove warning info when removing pending user from organization 2016-09-01 13:23:53 +02:00
zmagod ac7ac95da8 [fixes SCI-332] 2016-09-01 10:38:20 +02:00
Matej Zrimšek 4fdf478426 Minor refactoring. 2016-08-31 17:57:06 +02:00
Matej Zrimšek 828eebeb16 Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399] 2016-08-31 17:21:17 +02:00
zmagod 55ba2de41f fixes object duplication 2016-08-31 16:34:08 +02:00
zmagod fabfa83171 introdutory popup cookie 2016-08-31 15:18:21 +02:00
zmagod e8f971829a added project to session storage 2016-08-31 15:13:17 +02:00
Luka Murn 5cb79f6282 Fix the default parameters in JS 
This was causing major issues in IE.
 2016-08-31 14:04:45 +02:00
zmagod eb394ce209 fixes searching tables bug [fixes SCI-402] 2016-08-31 11:01:10 +02:00
zmagod b05c3df4d3 adds toggle id only to elements with modules 2016-08-31 10:25:40 +02:00
zmagod eb39eedfdf [fixes SCI-398] again 2016-08-31 08:46:51 +02:00
zmagod 21f84bacb6 set sidebar collapsed elements 2016-08-31 08:24:59 +02:00
jbargu 2cd5d85d68 Merge pull request #120 from jbargu/jg_SCI_328_move_experiment_reconnect 
When moving a task, it should connect the source and destination
 2016-08-30 18:01:38 +02:00
mlorb 905acfd43d Merge pull request #109 from mlorb/ml_sci_286 
fixes notification when adding new sample [SCI-286]
 2016-08-30 17:54:45 +02:00
Mojca Lorber dd8e5d5e12 fixes hound 2016-08-30 17:12:26 +02:00
Mojca Lorber 1b1e6daa21 fixes notification disappearance and error notifications 2016-08-30 16:55:59 +02:00
Jure Grabnar 9a82e7d72b Connect tasks on moving 
SCI-328 #close
 2016-08-30 15:57:27 +02:00
mlorb 8fc29248b3 Merge pull request #119 from mlorb/ml_sci_396 
fixes missing experiment name in side bar [SCI-396]
 2016-08-30 15:05:04 +02:00
Zmago Devetak 11b314fa20 Merge pull request #107 from ZmagoD/zd_bug_fix 
fixes new task button after tutorial ends
 2016-08-30 15:04:11 +02:00
Zmago Devetak 375a72db18 Merge pull request #114 from ZmagoD/zd_SCI_294_vol2 
fixes reports file name [fixes SCI-294]
 2016-08-30 14:59:07 +02:00
Zmago Devetak 5b4eb07960 Merge pull request #118 from ZmagoD/zd_SCI_398 
fixes workflow img bug [fixes SCI-398]
 2016-08-30 14:55:33 +02:00
Mojca Lorber 52f228725a fixes hound 2016-08-30 14:04:47 +02:00
Mojca Lorber aeda6f77d2 fixes missing experiment name in side bar 2016-08-30 13:51:16 +02:00
zmagod a947354fb5 fixes update times [fixes SCI-398] 2016-08-30 13:23:48 +02:00
Luka Murn c6e575bd2a Merge pull request #115 from Ducz0r/lm-deleting-comments-fix 
Fix for deleting comments
 2016-08-30 13:15:35 +02:00
Luka Murn 2b382fee0f Merge pull request #113 from Ducz0r/lm-add-first-time-activities 
Fix first time data generator & fake data generator
 2016-08-30 13:07:52 +02:00
Luka Murn 0e0228cb8c Codestyle fixes 2016-08-30 13:06:49 +02:00
zmagod 95ab35e3d6 cleanup update timestamp 2016-08-30 12:58:52 +02:00
Mojca Lorber 43c3a0bb81 fixes merge again 2016-08-30 12:54:08 +02:00
Mojca Lorber 81f9e59dcd fixes merge 2016-08-30 12:14:15 +02:00
Mojca Lorber e8d187b5f6 Merge branch 'ml_sci_395' 
Conflicts:
	app/views/canvas/edit/modal/_move_module.html.erb
	app/views/canvas/edit/modal/_move_module_group.html.erb
 2016-08-30 11:41:25 +02:00
Luka Murn 77ec5bcff9 Reposition comment dropdowns horizontally if needed 
Closes SCI-258
 2016-08-30 11:39:50 +02:00
zmagod f356acb882 fixes reports file name [fixes SCI-294] 2016-08-30 11:36:39 +02:00
Zmago Devetak 6878adda46 Merge pull request #112 from ZmagoD/zd_SCI_338_vol2 
Tutorial
 2016-08-30 11:07:51 +02:00
Luka Murn 4ee4c6caba Remove JS validator from step comments 2016-08-30 11:06:30 +02:00
jbargu fa357dd54f Merge pull request #110 from jbargu/jg_SCI_328_move_task_no_experiment 
Remove move on empty experiments
 2016-08-30 11:06:16 +02:00
zmagod 4b6567e488 fixed workflowimg link 2016-08-30 11:03:33 +02:00
zmagod 6f1c4df942 fixed new task button in canvas 2016-08-30 10:48:28 +02:00
Zmago Devetak e96429409e Merge pull request #108 from ZmagoD/zd_SCI_247_vol2 
Fixes step destroing bug and fixes reports [fixes SCI-247]
 2016-08-30 09:57:56 +02:00
zmagod 57c1707e81 fixes secondary navigation [fixes SCI-338] 2016-08-30 09:53:56 +02:00
Luka Murn c86d21d689 Fix bug in organization.rb 
Bug was related to introduction of experiment level.
 2016-08-30 09:46:54 +02:00
Mojca Lorber a35bf7182f fixes troubles 2016-08-30 09:43:39 +02:00
Mojca Lorber 596d403d5f change position of buttons 2016-08-30 09:16:53 +02:00
zmagod d33bb50519 disabled secondary navigation in samples tutorial 2016-08-30 08:57:05 +02:00
zmagod 5518d1cd1e fixed 16 step of tutorial 2016-08-30 08:52:44 +02:00
Jure Grabnar 0c184dcdcf Remove Move button on empty experiments 
SCI-328 #close.
 2016-08-30 08:26:59 +02:00
Luka Murn 30e8e33774 Add comment activities to first time data generator 2016-08-30 08:19:35 +02:00
Mojca Lorber b07f1af90f fixes hound again again 2016-08-29 17:08:00 +02:00
Mojca Lorber 7f8bb9be53 fixes hound again 2016-08-29 13:59:51 +02:00
Mojca Lorber 60b0d69a72 fixes hound 2016-08-29 13:56:05 +02:00
Mojca Lorber 53cdbc2638 fixes notification when adding new sample 2016-08-29 13:45:54 +02:00
zmagod 17aacc8ff5 fixes step destroing bug and fixes reports [fixes SCI-247] 2016-08-29 12:04:46 +02:00
zmagod 5af9d10c6a fixes new task button after tutorial ends 2016-08-29 11:46:45 +02:00
zmagod 2ac20d1af1 adds new image + new panel title [fixes SCI-336] 2016-08-29 09:28:29 +02:00
Luka Murn a0311970f8 Add missing commits for showing image and not able to preview 2016-08-26 16:49:32 +02:00
zmagod d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
 2016-08-26 11:13:40 +02:00
Zmago Devetak 0cfc758f43 Merge pull request #102 from ZmagoD/zd_SCI_336 
implement first time popup logic
 2016-08-26 09:19:36 +02:00
zmagod b0bd92e3f4 fixed edit action 2016-08-26 09:17:55 +02:00
zmagod 2031c42920 fixed confirmation text 2016-08-26 09:13:45 +02:00
Matej Zrimšek 782d384e26 Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
Matej Zrimšek 04d9163ff6 Paperclip file spoofing corrected/modified. 2016-08-25 18:57:06 +02:00
zmagod 99976722a8 uncomment js file 2016-08-25 18:49:49 +02:00
zmagod 1738ca66d2 one-time introductory popup [fixes SCI-336] 2016-08-25 18:44:21 +02:00
Luka Murn 8018cff02e Merge pull request #103 from Ducz0r/bb_edit_delete_comments 
Edit&delete comments
 2016-08-25 17:18:48 +02:00
mlorb b1218cb3d6 Merge pull request #59 from biosistemika/ml_sci_244 
fixes tutorial bug of inappropriate window [SCI-244]
 2016-08-25 17:16:45 +02:00
Luka Murn b533b0aca6 Fix another minor bug 2016-08-25 17:15:53 +02:00
Luka Murn 7cd94e8b0d Fix a minor bug on canvas 2016-08-25 17:09:55 +02:00
Luka Murn 9cd99fc532 Display "no comments" if you delete the last comment 2016-08-25 17:01:30 +02:00
Zmago Devetak 1b21e55fea Merge pull request #100 from ZmagoD/zd_SCI_381 
Adds experiment and team to tag search resuls [fixes SCI-381]
 2016-08-25 15:43:50 +02:00
zmagod 7a47ff6bc5 fixed new task error 2016-08-25 15:30:32 +02:00
zmagod 8ff645fb89 disabled experiment dropdown actions 2016-08-25 15:16:51 +02:00
Zmago Devetak b090fd8d5b Merge pull request #95 from ZmagoD/zd_SCI_374 
adds edit workflow link if no workflow [fixes SCI-374]
 2016-08-25 14:07:33 +02:00
Luka Murn a480c8d403 Styling fixes 2016-08-25 13:59:50 +02:00
Luka Murn 6d86a02d7c Add individual permission checks in dropdowns 
Closes SCI-258.
 2016-08-25 13:51:50 +02:00
Luka Murn 8592c13ed4 Remove now obsolote controller actions 2016-08-25 13:51:31 +02:00
Luka Murn b0d7b9dc75 Generate activities when editing/deleting comments 2016-08-25 13:51:31 +02:00
Luka Murn 24dd25d9f5 Add edit/delete result comment functionality 
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
 2016-08-25 13:51:31 +02:00
Luka Murn bac0455435 Add edit&delete functionality to step comments 
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
 2016-08-25 13:51:31 +02:00
Luka Murn 512efd3812 Fix 2 lines that were too long 2016-08-25 13:51:31 +02:00
Luka Murn c92d016f65 Add edit&delete module/task comments functionality 
This required a minor fix of comments.js.
 2016-08-25 13:51:31 +02:00
Luka Murn f0d9cb96fa Add edit project comments functionality 2016-08-25 13:51:30 +02:00
Luka Murn 15c0baeee8 Add delete project comment functionality 
This commit also removes the old code from @bberic.
 2016-08-25 13:51:30 +02:00
Luka Murn 9e3bb8edb7 Add dependant: :destroy to comments 2016-08-25 13:51:30 +02:00
Luka Murn 8a73a3ab5c Update permission_helper.rb and routes.rb 2016-08-25 13:51:30 +02:00
Luka Murn 319bcc7850 Add permissions for comments to permission_helper.rb 2016-08-25 13:51:30 +02:00
Luka Murn 5569a1e6d2 Revert 2 files that contained no changes 2016-08-25 13:51:30 +02:00
scibb a76d82d188 delete and edit comments for projects, protocols, results, and workflow elements 2016-08-25 13:51:30 +02:00
zmagod 5fabe06b8d implement first time popup logic 2016-08-25 11:44:49 +02:00
Mojca Lorber 4a5d720724 change position of overview and samples 2016-08-25 11:19:53 +02:00
zmagod 1120ef1407 adds experiment and team to tag search resuls [fixes SCI-381] 2016-08-25 10:40:03 +02:00
mlorb c38a4e2614 Merge pull request #94 from mlorb/ml_sci_375 
add move experiment instructions [SCI-375]
 2016-08-25 09:45:16 +02:00
Luka Murn c082bceafc Merge pull request #98 from Ducz0r/lm-sci-385 
Fix bug with linked tasks
 2016-08-25 09:29:50 +02:00
zmagod f515366d91 fixes workflowing after updating description, fixes canvas bug 2016-08-25 09:11:42 +02:00
mlorb 0a066f436f Merge pull request #96 from mlorb/ml_sci_369 
buttons update on experiment overview [SCI-369]
 2016-08-25 08:54:16 +02:00
zmagod 92bb3dda99 hide last next button 2016-08-25 08:46:11 +02:00
zmagod dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Luka Murn 3dddffaa34 Fix bug with linked tasks 
This bug was a legacy of experiment level introduction.
Closes SCI-385, SCI-366.
 2016-08-24 17:22:16 +02:00
mlorb 2d90ad1a65 Merge pull request #88 from mlorb/ml_sci_362 
fixes tile size in edit canvas [SCI-362]
 2016-08-24 17:07:11 +02:00