Commit graph

8179 commits

Author SHA1 Message Date
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
gazvoda
596b296c84 Merge pull request #597 from gazvoda/lg-SCI-1104
Added additional explanation text [fixes SCI-1104]
2017-05-09 08:41:52 +01: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
gazvoda
e98d6a4da6 Merge pull request #596 from gazvoda/lg-SCI-723
Added team icon on the first step of tutorial after the Team icon tex…
2017-05-08 14:57:56 +01:00
osboxes.org
c43eacdb98 Added additional explanation text [fixes SCI-1104] 2017-05-08 15:35:53 +02:00
gazvoda
e462482566 Merge pull request #595 from gazvoda/lg-SCI-1239
Corrected number of expiration days in message [fixes SCI-1239]
2017-05-08 13:52:23 +01:00
osboxes.org
ea0934a8cb Added team icon on the first step of tutorial after the Team icon text [solves SCI-723] 2017-05-08 14:43:35 +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
osboxes.org
ddbd568166 Corrected number of expiration days in message [fixes SCI-1239] 2017-05-08 13:08:53 +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
e5e0a9f7f3 fix typo 2017-05-08 13:03:35 +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
okriuchykhin
05d2d4380e Merge pull request #590 from okriuchykhin/ok_SCI_1229
Fix importing users from file [SCI-1229]
2017-05-05 15:10:53 +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
Oleksii Kriuchykhin
9f2db6c314 Fix importing users from file [SCI-1229] 2017-05-05 10:16:11 +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
Zmago Devetak
6bee4cc05a Merge pull request #586 from ZmagoD/zd_SCI_1228
adds asc order to checklists [fixes SCI-1228]
2017-05-05 10:11:24 +02:00
mlorb
1cedad0d7e Merge pull request #583 from mlorb/ml_sci_373
Fix bug with edit canvas and fix positioning of cloned task/workflow [SCI-373]
2017-05-05 09:48:56 +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
98e0793a51 Merge pull request #581 from mz3944/linter_updates
Updated rubocop and scss-lint gems.
2017-04-28 14:08:05 +02:00
Matej Zrimšek
79b0d9c120 Updated rubocop and scss-lint gems. 2017-04-28 14:05:00 +02:00
mz3944
9c083b537f Merge pull request #580 from gazvoda/rubocop_update
Updated cop names with the latest version linter-rubocop (2.1.1)
2017-04-28 12:39:11 +02:00