scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
2036 commits 70 branches 179 tags 165 MiB
Commit graph

2036 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mlorb 2b624e9a92 Merge pull request #639 from mlorb/ml_sci_1266_v2 
Add global repositories screen - tab control [SCI-1266]
 2017-05-25 11:08:20 +02:00
Mojca Lorber c3051421b2 change truncate function 2017-05-25 11:01:24 +02:00
Mojca Lorber 8540f88b7e small fix - renaming of ids and hrefs 2017-05-25 10:06:48 +02:00
mlorb 58ac457d38 fix merge bug 2017-05-23 11:32:02 +02:00
mlorb 872f712be8 Merge branch 'custom-repositories' into ml_sci_1266_v2 2017-05-23 11:05:25 +02:00
okriuchykhin 670494be80 Merge pull request #637 from okriuchykhin/ok_SCI_1273 
Add repositories dropdown to task navigation [SCI-1273]
 2017-05-23 08:56:20 +02:00
Oleksii Kriuchykhin b223646f07 Small improvements [SCI-1273] 2017-05-23 08:53:53 +02:00
Mojca Lorber a716a0b1db change breadcrumbs on protocol managements page 2017-05-22 17:58:42 +02:00
Mojca Lorber 9ae615264d add global repositories screen - tab control 2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
okriuchykhin 76eccafaed Merge pull request #631 from okriuchykhin/ok_SCI_1267 
Add migrations and models for custom repositories [SCI-1267]
 2017-05-17 10:44:29 +02:00
Oleksii Kriuchykhin 85e81e9ea2 Improve repository models and migration [SCI-1267] 2017-05-17 10:04:07 +02:00
Oleksii Kriuchykhin 0dc0c7d096 Add validation of text_value length [SCI-1267] 2017-05-16 15:57:21 +02:00
Oleksii Kriuchykhin 72a651c7de Add migrations and models for custom repositories [SCI-1267] 2017-05-16 15:27:36 +02:00
Zmago Devetak 39203a16f4 Merge pull request #622 from ZmagoD/zd_SCI_1261 
fixes remove user action on project [fixes SCI-1261]
 2017-05-15 15:28:39 +02:00
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
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
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
Oleksii Kriuchykhin bb8c7c342c Add additional info to samples info modal [SCI-960] 2017-05-11 22:20:06 +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
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
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