Commit graph

1716 commits

Author SHA1 Message Date
okriuchykhin
15f19b73fb Merge pull request #610 from okriuchykhin/ok_SCI_1253
Add notifications counter badge to project card [SCI-1253]
2017-05-11 11:11:09 +02:00
okriuchykhin
000ca26452 Merge pull request #607 from okriuchykhin/ok_SCI_1243
Add specific classes to task card for analytics [SCI-1243]
2017-05-11 11:10:05 +02:00
osboxes.org
8c83b3a196 Added updated_at values and unnecessary migration rollback [fixes SCI-1145] 2017-05-11 11:08:36 +02:00
Oleksii Kriuchykhin
229693ec61 Fix root_url method unavailable in application_helper [SCI-1252] 2017-05-10 18:15:08 +02:00
Oleksii Kriuchykhin
a5926726ce Add notifications counter badge to project card [SCI-1253] 2017-05-10 17:28:37 +02:00
Zmago Devetak
cb79a405c3 Merge pull request #609 from ZmagoD/zd_SCI_1248_v2
fixes input sanitize method [fixes SCI-1248]
2017-05-10 15:36:57 +02:00
zmagod
511f39e093 add constants 2017-05-10 15:33:33 +02:00
zmagod
2081e0a94b Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1 2017-05-10 15:14:17 +02:00
zmagod
10db322307 fixes input sanitize method [fixes SCI-1248] 2017-05-10 14:57:11 +02:00
zmagod
a4032f5cc6 first run 2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin
08e7f09d07 Add specific classes to task card for analytics [SCI-1243] 2017-05-10 10:33:34 +02:00
okriuchykhin
f46c0dfaef Merge pull request #603 from okriuchykhin/ok_SCI_152_v2
Improve view of badges on experiment canvas [SCI-152]
2017-05-10 09:46:02 +02:00
Zmago Devetak
ff0f85fce8 Merge pull request #592 from ZmagoD/zd_SCI_160
removes TempFile after 7 days [fixes SCI-160]
2017-05-10 09:32:18 +02:00
Zmago Devetak
13570ba5cb Merge pull request #602 from ZmagoD/zd_SCI_1247
fixes pdf export and image size [fixes SCI-1247]
2017-05-10 09:31:55 +02:00
Oleksii Kriuchykhin
52ad5ecdc2 Fix error messages display during file upload in steps and results [SCI-1235] 2017-05-09 17:13:47 +02:00
Zmago Devetak
cd503580b2 Merge pull request #599 from ZmagoD/zd_SCI_1241
fix samples bug [SCI-1241]
2017-05-09 15:55:43 +02:00
mlorb
078eb7789f Merge pull request #605 from mlorb/ml_sci_fix_bug_with_avatar_in_system_log
Fix bug with avatar in system log
2017-05-09 14:57:07 +02:00
Mojca Lorber
7ca62a16bb fix hound 2017-05-09 14:55:23 +02:00
Mojca Lorber
e1475fbfef fix bug with avatar in system log 2017-05-09 14:40:02 +02:00
Oleksii Kriuchykhin
620a989a2f Improve view of badges on experiment canvas [SCI-152] 2017-05-09 14:07:23 +02:00
zmagod
04ee24d553 refactor 2017-05-09 14:05:21 +02:00
zmagod
2d69896897 fixes pdf export and image size [fixes SCI-1247] 2017-05-09 13:59:59 +02:00
zmagod
df13478186 fix samples bug [SCI-1241] 2017-05-09 11:25:00 +02:00
okriuchykhin
ccc640f2bc Merge pull request #593 from okriuchykhin/ok_SCI_1158
Add advanced search options [SCI-1158]
2017-05-09 10:23:34 +02:00
okriuchykhin
bd0b930382 Merge pull request #598 from okriuchykhin/ok_SCI_152
Add counters for users and comments on canvas [SCI-152]
2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin
7a61f5813c Add comments to the code [SCI-152] 2017-05-09 10:22:01 +02:00
Oleksii Kriuchykhin
bd5a48b9c8 Improve code style [SCI-1158] 2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin
344b9c290a Add counters for users and comments on canvas [SCI-152] 2017-05-08 17:32:55 +02:00
okriuchykhin
f292dab3b5 Merge pull request #594 from okriuchykhin/ok_SCI_1029_v2
Change color of loading animation in reports [SCI-1029]
2017-05-08 13:35:00 +02:00
Zmago Devetak
4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119
Add images to fields with rich text formatting
2017-05-08 13:06:58 +02:00
zmagod
d6f303581f refactor 2017-05-08 12:56:33 +02:00
Oleksii Kriuchykhin
3f60439948 Change color of loading animation in reports [SCI-1029] 2017-05-08 11:02:51 +02:00
ajugo
2973ead765 Missing files, comments, checklist in steps [fixes SCI-1224] (#591)
* Missing files, comments, checklist in steps [fixes SCI-1224]

* Code fixes
2017-05-08 10:44:15 +02:00
Zmago Devetak
e47bf8f013 Merge pull request #582 from ZmagoD/zd_SCI_1051
fix reports pdf for user annotation [SCI-1051]
2017-05-08 10:24:40 +02:00
Oleksii Kriuchykhin
a3f847a232 Fix hound [SCI-1158] 2017-05-08 10:22:54 +02:00
Oleksii Kriuchykhin
0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
mlorb
4c85ac7bf5 Merge pull request #588 from mlorb/ml_sci_191
Add information how many samples are selected [SCI-191]
2017-05-05 15:24:16 +02:00
Zmago Devetak
de3d1172c1 Merge pull request #584 from ZmagoD/zd_SCI_1200
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-05 14:57:27 +02:00
Zmago Devetak
28042d11e1 Merge pull request #589 from ZmagoD/zd_SCI_488
adds label to step in report [fixes SCI-488]
2017-05-05 14:56:01 +02:00
zmagod
f079a097c5 removes TempFile after 7 days [fixes SCI-160] 2017-05-05 14:54:22 +02:00
Zmago Devetak
f3415abe3e Merge pull request #587 from ZmagoD/zd_SCI_1233
fixes bug with empty checklist item [fixes SCI-1233]
2017-05-05 10:11:52 +02:00
zmagod
b22350136f adds label to step in report [fixes SCI-488] 2017-05-05 09:45:18 +02:00
Mojca Lorber
45baba1803 fix zmago the hound 2017-05-04 16:46:52 +02:00
Mojca Lorber
ad9497a638 add information how many samples are selected 2017-05-04 16:30:29 +02:00
zmagod
f784844472 fixes bug with empty checklist item [fixes SCI-1233] 2017-05-04 16:15:00 +02:00
zmagod
8d0c22327b adds asc order to checklists [fixes SCI-1228] 2017-05-04 15:17:34 +02:00
zmagod
acc5594f1b add popup for approval to complete the Task [fixes SCI-1200] 2017-05-04 12:41:22 +02:00
Mojca Lorber
f8f6a5f63a fix bug edit canvas not working and fix positioning of cloned task/workflow 2017-05-04 10:54:50 +02:00
zmagod
289a148332 refactor 2017-05-03 15:33:23 +02:00
zmagod
5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
ajugo
41df727e57 Merge pull request #569 from rekonder/aj-SCI-1130
Fix error with close on reports
2017-05-03 12:27:42 +02:00
ajugo
081aa4aea7 Merge pull request #570 from rekonder/aj-SCI-1088
My profile - avatar size fix [SCI-1088]
2017-05-03 12:27:05 +02:00
Zmago Devetak
cc6c2942c2 Merge pull request #574 from ZmagoD/zd_SCI_1194_v2
prevent to get nil as a param in checklist_item_annotation method [fi…
2017-05-03 10:56:21 +02:00
zmagod
d5abb52909 refactor 2017-05-03 10:55:11 +02:00
zmagod
1b618e88e5 fix reports pdf for user annotation [SCI-1051] 2017-05-03 10:50:43 +02:00
mz3944
ca72133e2b Merge pull request #579 from gazvoda/lg-SCI-1214
Tab Teams is highlighted when in Audit trails [fixes SCI-1214]
2017-04-28 12:08:32 +02:00
osboxes.org
21a39fc704 Code indentation corrected [fixes SCI-1214] 2017-04-28 10:31:14 +01:00
osboxes.org
f72802f9f2 Tab Teams is highlighted when in Audit trails [fixes SCI-1214] 2017-04-26 16:31:44 +01:00
okriuchykhin
dbd9da916b Merge pull request #577 from okriuchykhin/ok_SCI_1029
Change color of turbolinks progress bar [SCI-1029]
2017-04-26 15:05:44 +02:00
Oleksii Kriuchykhin
d3fb688fce Change color of turbolinks progress bar [SCI-1029] 2017-04-26 15:04:29 +02:00
okriuchykhin
3735bbb0f8 Merge pull request #578 from okriuchykhin/ok_SCI_1128
Fix dowload of export zip files from local storage [SCI-1128]
2017-04-26 13:44:30 +02:00
okriuchykhin
5ec41c0d0a Merge pull request #576 from okriuchykhin/ok_SCI_763
Add additional sanitization to search parameters in datatables [SCI-763]
2017-04-26 13:44:15 +02:00
Zmago Devetak
9704b3ffd4 Merge pull request #572 from ZmagoD/zd_SCI_1192_ver2
make search for users case insensitive [fixes SCI-1192]
2017-04-26 13:34:16 +02:00
zmagod
0e383109a1 refactor query 2017-04-26 13:32:03 +02:00
Oleksii Kriuchykhin
cf7d0ea248 Fix dowloand of export zip files from local storage [SCI-1128] 2017-04-26 13:23:30 +02:00
Oleksii Kriuchykhin
9055894d07 Add additional sanitization to search parameters in datatables [SCI-763] 2017-04-25 17:37:42 +02:00
zmagod
0456393317 prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194] 2017-04-25 16:22:10 +02:00
Matej Zrimšek
8ad52354eb Used locales instead of hardcoded values for intro.js tutorial popup. 2017-04-25 16:03:50 +02:00
Matej Zrimšek
e8bc9542cc Removed some unneeded intro.js tutorial code. 2017-04-25 16:03:50 +02:00
Matej Zrimšek
a6573bd508 Next button is now always focused when navigating through tutorial steps. [fixes SCI-719] 2017-04-25 16:03:50 +02:00
Matej Zrimšek
a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +02:00
zmagod
615bbb9967 make search for users case insensitive [fixes SCI-1192] 2017-04-25 15:33:51 +02:00
mlorb
b930af0033 Merge pull request #571 from mlorb/ml_sci_316
Remove behavior of not allowing the empty tables in steps [SCI-316]
2017-04-25 15:30:30 +02:00
Luka Murn
92159b734f Merge pull request #559 from Ducz0r/lm-sci-1175-fix
Fix encoding when cloning tables [SCI-1175]
2017-04-25 14:38:34 +02:00
zmagod
ed24448817 adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203] 2017-04-25 14:24:05 +02:00
zmagod
1fefeee3d1 adds team space related methods 2017-04-25 13:44:31 +02:00
Mojca Lorber
49574e7a06 remove behavior of not allowing the empty tables in steps 2017-04-25 10:21:16 +02:00
rekonder
b93edac3b9 My profile - avatar size fixes [SCI-1088] 2017-04-25 10:02:00 +02:00
zmagod
86c6ae3b03 display tinyMCE images in reports 2017-04-25 09:53:35 +02:00
zmagod
66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
rekonder
dc46a7b650 Fix error with close on reports 2017-04-24 16:02:30 +02:00
zmagod
55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
mlorb
54f1c7b3e8 Merge pull request #566 from mlorb/ml_sci_365
New experiment redirection [SCI-365]
2017-04-24 08:55:55 +02:00
zmagod
550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Mojca Lorber
3aa1225e16 fix hound 2017-04-20 18:14:12 +02:00
Mojca Lorber
cf00ecd62e new experiment redirection 2017-04-20 17:55:28 +02:00
Mojca Lorber
0bae4657f6 add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
Mojca Lorber
b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
Mojca Lorber
c13b8ab270 styling 2017-04-20 13:16:11 +02:00
Mojca Lorber
1606e2163c add experiment level to notifications 2017-04-20 13:16:11 +02:00
Matej Zrimšek
314e8fcbd2 Added :inverse_of reference for all specific comment models. [fixes SCI-1207] 2017-04-19 23:38:23 +02:00
zmagod
0757563d02 adds step tiny_mce asset relation 2017-04-19 17:22:57 +02:00
mz3944
a0b5a94d67 Merge pull request #564 from mz3944/mz-SCI-856
Case insensitive email invitation
2017-04-19 09:36:46 +02:00
zmagod
37be04c09c add tiny_mce controller 2017-04-19 09:13:16 +02:00
zmagod
c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
Luka Murn
9479b65140 Hopefully fixes the encoding issues with audit trails
Closes SCI-1175.
2017-04-19 08:35:04 +02:00
Matej Zrimšek
bafdbf4082 Email is now case insensitive when inviting users by it. [fixes SCI-856] 2017-04-18 18:01:29 +02:00
Matej Zrimšek
57b6b9402d Experiment description is inside of box for every supported browser. [fixes SCI-860] 2017-04-18 16:44:01 +02:00
Luka Murn
6a7e383316 Please the Hound 2017-04-18 15:38:11 +02:00
mz3944
0ebf294844 Merge pull request #562 from mz3944/mz-SCI-1187
Added general locale for cases when a name is optional and is not spe…
2017-04-18 15:26:35 +02:00
Matej Zrimšek
a889174938 Name of result tables should be nil, as it can't be specified. [fixes SCI-1187] 2017-04-18 15:08:13 +02:00
okriuchykhin
3d805d529d Merge pull request #554 from okriuchykhin/ok_SCI_877
Add image preview to protocol repository [SCI-877]
2017-04-18 08:58:39 +02:00
Oleksii Kriuchykhin
4fac6484b5 Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877] 2017-04-14 16:05:35 +02:00
Zmago Devetak
e1a30cc17c Merge pull request #558 from ZmagoD/zd_SCI_1192
fixes broken users search method for smart annotation [fixes SCI-1192]
2017-04-14 15:38:33 +02:00
zmagod
8af3858209 fix hound 2017-04-14 11:13:58 +02:00
Luka Murn
9c28608fbf Fix encoding when cloning tables
Closes SCI-1175.
2017-04-13 17:00:27 +02:00
zmagod
9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Zmago Devetak
cb1ad9e0be Merge pull request #555 from ZmagoD/zd_SCI_1103
adds additional explanations [fixes SCI-1103]
2017-04-13 15:15:08 +02:00
zmagod
0987cf8abc fixes hound alerts 2017-04-13 14:55:18 +02:00
Zmago Devetak
40af0df882 Merge pull request #551 from ZmagoD/zd_SCI_1189
fixes the user_name field in csv export [fixes SCI-1189]
2017-04-13 14:36:44 +02:00
zmagod
a6183af63d fix method_missing again 2017-04-13 14:34:58 +02:00
mlorb
ddc0e86c92 Merge pull request #556 from mlorb/ml_sci_1174
Fix bug with changing user own role from admin to normal user [SCI-1174]
2017-04-13 14:33:58 +02:00
Zmago Devetak
ec60044949 Merge pull request #548 from ZmagoD/zd_SCI_1129_v2
Disables annimateSpiner in result assets actions
2017-04-13 14:06:50 +02:00
zmagod
0534bce1ed adds super in method_missing 2017-04-13 14:03:56 +02:00
zmagod
241af0620a fixes hound alerts 2017-04-13 13:27:43 +02:00
zmagod
b6daf2648b refactor zip_export 2017-04-13 13:01:05 +02:00
zmagod
f104444a0c adds additional explanations [fixes SCI-1103] 2017-04-12 16:56:47 +02:00
Mojca Lorber
27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
Oleksii Kriuchykhin
181d981a51 Add image preview to protocol repository [SCI-877] 2017-04-12 16:05:38 +02:00
mlorb
2932052628 Merge pull request #549 from mlorb/ml_sci_1172
Fix overlapping text in audit trail table [SCI-1172, SCI-1181]
2017-04-12 15:10:48 +02:00
okriuchykhin
0fe84c4e24 Merge pull request #550 from okriuchykhin/ok_SCI_1157
Improve speed of search [SCI-1157]
2017-04-12 13:11:26 +02:00
Zmago Devetak
9c31239318 Merge pull request #552 from biosistemika/release-1.9.0
Release 1.9.1
2017-04-12 13:08:37 +02:00
zmagod
f4fdb840d8 fixes the user_name field in csv export [fixes SCI-1189] 2017-04-12 09:05:54 +02:00
Oleksii Kriuchykhin
07d658ab82 Improve speed of search [SCI-1157] 2017-04-11 14:55:44 +02:00
Mojca Lorber
b09c18a9bc fix overlaping text in audit trail table 2017-04-11 14:29:31 +02:00
zmagod
929d8aab5e disables annimateSpiner in result assets actions 2017-04-10 15:40:36 +02:00
Zmago Devetak
91793c295a Merge pull request #542 from ZmagoD/zd_SCI_825
Smart annotations and Notifications
2017-04-10 15:10:17 +02:00
zmagod
90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
Zmago Devetak
ccb6cd0c8c Merge pull request #546 from ZmagoD/zd_SCI_1185
adds input_sanitizer helper in app mailer [fixes SCI-1185]
2017-04-10 09:12:03 +02:00
Luka Murn
cd4664e4d0 Merge pull request #544 from Ducz0r/lm-sci-794-fix
Only require jquery-ui-sortable on samples page [SCI-794]
2017-04-10 07:44:57 +02:00
mz3944
2c78d10768 Merge pull request #532 from biosistemika/mz-SCI-1150
Fixed so that file deletion callbacks are triggered
2017-04-07 15:18:43 +02:00
zmagod
122e638b7e adds input_sanitizer helper in app mailer [fixes SCI-1185] 2017-04-07 15:01:26 +02:00
Luka Murn
becdd687a6 Only require jquery-ui-sortable on samples page
(hopefully) closes SCI-794.
2017-04-07 13:05:22 +02:00
zmagod
9610c5f5a0 fix info dropdown links [fixes SCI-1141] 2017-04-07 11:31:09 +02:00
Matej Zrimšek
1447a34dc7 Files didn't get deleted in previous commit. [fixes SCI-1150] 2017-04-06 16:59:34 +02:00
okriuchykhin
aa776aaa71 Merge pull request #541 from okriuchykhin/ok_SCI_615
Fix moving of the steps after adding a new one [SCI-615]
2017-04-06 15:50:01 +02:00
zmagod
e77df92017 fix samples_controller 2017-04-06 15:26:24 +02:00
zmagod
9bb1bb3f9b refactor [fixes SCI-825] 2017-04-06 15:08:03 +02:00
zmagod
439cd0cd89 add notification to experiments 2017-04-06 14:55:18 +02:00
zmagod
046b608018 add notification for my_module/project comments 2017-04-06 14:07:22 +02:00
zmagod
b398bb7516 add step annotations methods in steps_action concerns 2017-04-06 13:06:20 +02:00
zmagod
f16607579f refactor steps annotation 2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin
5c0197220d Fix moving of the steps after adding a new one [SCI-615] 2017-04-06 12:53:21 +02:00
Matej Zrimšek
e72184d10d Fixed so that file deletion callbacks are triggered (and hence audit trails for this is generated). [fixes SCI-1150] 2017-04-06 11:34:03 +02:00
mlorb
4855111dcb Merge pull request #540 from mlorb/ml_sci_1089_v2
Remove ERROR from message [SCI-1089]
2017-04-06 10:44:20 +02:00
zmagod
bb437bd8c5 adds notification to results annotation 2017-04-06 09:33:49 +02:00
zmagod
d331911ffe completed step annotations 2017-04-06 08:42:16 +02:00
mlorb
e9441559d3 Merge pull request #538 from mlorb/ml_sci_1044_vol3
Change helper method for user info popover
2017-04-05 17:04:30 +02:00
Mojca Lorber
5e62046627 remove ERROR from message 2017-04-05 14:40:55 +02:00
mlorb
7730493ef4 Merge pull request #535 from biosistemika/ml_sci_1044_vol2
Fix bug with constants
2017-04-04 15:46:50 +02:00