Zmago Devetak
|
a151bbdd7d
|
Merge pull request #623 from ZmagoD/zd_SCI_974
adds persistence to experiments order in project overview [fixes SCI-…
|
2017-05-15 15:28:18 +02:00 |
|
zmagod
|
01972ab6a7
|
changes load protocol label [fixes SCI-1240]
|
2017-05-15 15:22:43 +02:00 |
|
zmagod
|
9bec7dd96e
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248
|
2017-05-15 14:49:37 +02:00 |
|
okriuchykhin
|
16325db1c6
|
Merge pull request #621 from okriuchykhin/ok_SCI_1263
Fix sorting in reports [SCI-1263]
|
2017-05-15 09:57:35 +02:00 |
|
zmagod
|
c35e2a4860
|
adds persistence to experiments order in project overview [fixes SCI-974]
|
2017-05-15 09:54:37 +02:00 |
|
okriuchykhin
|
9f9691de59
|
Merge pull request #620 from okriuchykhin/ok_SCI_452
Disable turbolinks on search links to fix JS errors [SCI-452]
|
2017-05-12 17:02:29 +02:00 |
|
okriuchykhin
|
8e523782d9
|
Merge pull request #619 from okriuchykhin/ok_SCI_617
Fixes error when cloning experiments with long names [SCI-617]
|
2017-05-12 16:53:38 +02:00 |
|
okriuchykhin
|
a8bbc3c3ba
|
Merge pull request #615 from okriuchykhin/ok_SCI_1008
Fix task and step ordering in reports [SCI-1008]
|
2017-05-12 16:44:57 +02:00 |
|
zmagod
|
b6367981c7
|
fixes remove user action on project [fixes SCI-1261]
|
2017-05-12 16:18:53 +02:00 |
|
Oleksii Kriuchykhin
|
5a2d618b1d
|
Fix sorting in reports [SCI-1263]
|
2017-05-12 16:04:19 +02:00 |
|
zmagod
|
d34b2520b5
|
refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]
|
2017-05-12 15:59:58 +02:00 |
|
Oleksii Kriuchykhin
|
ad39d09a53
|
Disable turbolinks on search links to fix JS errors [SCI-452]
|
2017-05-12 13:23:29 +02:00 |
|
Oleksii Kriuchykhin
|
79efb34191
|
Fixes error when clonning experiments with long names [SCI-617]
|
2017-05-12 11:07:11 +02:00 |
|
okriuchykhin
|
213425b493
|
Merge pull request #617 from okriuchykhin/ok_SCI_960
Add additional info to samples info modal [SCI-960]
|
2017-05-12 10:14:55 +02:00 |
|
Zmago Devetak
|
0dc4addd6c
|
fix typo
|
2017-05-12 10:10:50 +02:00 |
|
zmagod
|
070a829c49
|
change new results hendlers
|
2017-05-12 10:02:33 +02:00 |
|
Oleksii Kriuchykhin
|
bb8c7c342c
|
Add additional info to samples info modal [SCI-960]
|
2017-05-11 22:20:06 +02:00 |
|
zmagod
|
81a3cb0a41
|
adds results js code in modules
|
2017-05-11 16:54:28 +02:00 |
|
Oleksii Kriuchykhin
|
5d55720aad
|
Fix steps ordering in reports [SCI-1008]
|
2017-05-11 15:56:33 +02:00 |
|
Oleksii Kriuchykhin
|
0ef9c7eff6
|
Fix task ordering in reports [SCI-1008]
|
2017-05-11 15:30:19 +02:00 |
|
okriuchykhin
|
ab0d882be1
|
Merge pull request #614 from okriuchykhin/ok_SCI_1254
Fix step actions in reports [SCI-1254]
|
2017-05-11 14:44:36 +02:00 |
|
Zmago Devetak
|
9911c0d148
|
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
replace all ActionController::Base.helpers.sanitize calls with custom…
|
2017-05-11 14:30:26 +02:00 |
|
Oleksii Kriuchykhin
|
fe134419a3
|
Fix step actions in reports [SCI-1254]
|
2017-05-11 13:51:43 +02:00 |
|
mlorb
|
219921ee33
|
Merge pull request #612 from mlorb/ml_sci_1250
Fix sample page bugs when editing column name [SCI-1250]
|
2017-05-11 13:48:20 +02:00 |
|
okriuchykhin
|
328c9292b1
|
Merge pull request #606 from okriuchykhin/ok_SCI_1235
Fix error messages display during file upload in steps and results [SCI-1235]
|
2017-05-11 13:00:36 +02:00 |
|
zmagod
|
80a0af8c9f
|
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
|
2017-05-11 11:36:47 +02:00 |
|
Mojca Lorber
|
86bc6adc2a
|
fix lost column updated name at sample page and bug with another user not able to view column dropdown
|
2017-05-11 11:16:12 +02:00 |
|
okriuchykhin
|
f239238064
|
Merge pull request #611 from okriuchykhin/ok_SCI_1252
Fix root_url method unavailable in application_helper [SCI-1252]
|
2017-05-11 11:15:00 +02:00 |
|
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 |
|
Zmago Devetak
|
fecb367b96
|
Merge pull request #608 from biosistemika/release-1.10.1
Merge release 1.10.1 into master
|
2017-05-10 15:15:22 +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 |
|
ajugo
|
e7c970f287
|
Wording in activity for completion of checklist item [SCI-274] (#601)
|
2017-05-10 10:13:59 +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 |
|
osboxes.org
|
cd6bae6e35
|
Added migration to remove updated_at from Activity [fixes SCI-1145]
|
2017-05-09 14:14:01 +02:00 |
|