scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
2110 commits 69 branches 179 tags 165 MiB
Commit graph

2110 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luka Murn bed486e747 Merge pull request #636 from biosistemika/release-1.11.0 
Release 1.11.0
 2017-05-18 14:22:03 +02:00
Oleksii Kriuchykhin e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
Luka Murn 4c5d7267ac Version bump to 1.11.0 2017-05-18 13:48:02 +02:00
ajugo 1abaefce4f At importing large sample file, error flash message appears [fixes SCI-903] (#625) 
* At importing large sample file, error flash message appears [fixes SCI-903]

* Changing double quotes to single

* Adding animatedSpinner
 2017-05-18 09:19:44 +02:00
Matej Zrimšek 20265ddd69 Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487] 2017-05-17 18:18:57 +02:00
okriuchykhin 31e41fd8ae Merge pull request #635 from okriuchykhin/ok_SCI_1288 
Fix error handling in result_assets [SCI-1288]
 2017-05-17 15:17:42 +02:00
Oleksii Kriuchykhin bbf6d38c50 Fix error handling in result_assets [SCI-1288] 2017-05-17 15:14:35 +02:00
Matej Zrimšek f78c80b148 Added possibility to add uncompleted steps to report. [closes SCI-414] 2017-05-17 13:25:21 +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
okriuchykhin 7ec53d493b Merge pull request #632 from okriuchykhin/ok_SCI_1284 
Fix bug in counting search results for assets [SCI-1284]
 2017-05-17 09:54:09 +02:00
Oleksii Kriuchykhin f28df506f9 Fix bug in counting search results for assets [SCI-1284] 2017-05-17 09:08:40 +02:00
zmagod b8b47542a6 fix label [fixes SCI-1240] 2017-05-16 16:08:29 +02:00
Zmago Devetak 7c2ca854ab Merge pull request #628 from ZmagoD/zd_SCI_1285 
fix search label [fixes SCI-1285]
 2017-05-16 16:02:36 +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
zmagod e0397f8a54 fix search label [fixes SCI-1285] 2017-05-16 14:58:39 +02:00
zmagod b21923cf98 prevent to duplicate new step [fixes SCI-1280] 2017-05-16 11:52:07 +02:00
gazvoda f6bd39ec70 Merge pull request #604 from gazvoda/lg-SCI-1145 
Added migration to remove updated_at from Activity [fixes SCI-1145]
 2017-05-16 08:49:10 +01:00
Matej Zrimšek 2c6f888cbc Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487] 2017-05-15 18:56:41 +02:00
Matej Zrimšek 79ec3b5e4c Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek 901558c733 Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek dbb79ebab1 Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Matej Zrimšek b97cb91840 Refactoring of modal for adding content to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Matej Zrimšek 27cfd55ea5 Simplified popup modal for adding contents to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Zmago Devetak 18e11fde59 Merge pull request #616 from ZmagoD/zd_SCI_1248 
Prevent double input fields (results)
 2017-05-15 16:27:03 +02:00
Zmago Devetak 5e5ee26c5e Merge pull request #624 from ZmagoD/zd_SCI_1240 
changes load protocol label [fixes SCI-1240]
 2017-05-15 16:26:41 +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
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