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
302 commits 70 branches 179 tags 165 MiB
Commit graph

84 commits

Author SHA1 Message Date
zmagod f515366d91 fixes workflowing after updating description, fixes canvas bug 2016-08-25 09:11:42 +02:00
mlorb 5c8d669cac Merge pull request #81 from mlorb/ml_sci_364 
fixes edit experiment [SCI-364]
 2016-08-23 16:49:20 +02:00
Zmago Devetak 396325bd67 Merge pull request #86 from ZmagoD/zd_SCI_365 
changed experiment create redirection [fixes SCI-365]
 2016-08-23 16:30:48 +02:00
Zmago Devetak 65049692ea Merge pull request #78 from ZmagoD/zd_SCI_349 
updating thumbnail
 2016-08-23 16:22:07 +02:00
Mojca Lorber 322be64b5f change experiment path 2016-08-23 14:44:22 +02:00
zmagod 66b8a3055d changed experiment create redirection [fixes SCI-365] 2016-08-23 09:03:39 +02:00
Mojca Lorber 75c52d20e5 fixes hound 2016-08-22 15:30:27 +02:00
Mojca Lorber 131d0d269a fixes edit experiment 2016-08-22 15:18:02 +02:00
zmagod d38f29d207 set ajax loading of experiments images [fixes SCI-349] 2016-08-22 11:29:19 +02:00
mlorb 0832466d20 Merge pull request #76 from mlorb/ml_sci_286 
fixes notifications when creating new sample type or group [SCI-286]
 2016-08-22 08:54:28 +02:00
Mojca Lorber 1c220aba7b delete comment 2016-08-22 08:50:48 +02:00
zmagod cac5033eba set ajax for workflow img 2016-08-19 15:36:12 +02:00
Zmago Devetak 99aa66cd84 Merge pull request #74 from ZmagoD/zd_SCI_346 
check search input string [fixes SCI-346]
 2016-08-19 14:01:56 +02:00
Mojca Lorber 799cac1238 fixes hound 2016-08-19 13:55:34 +02:00
Mojca Lorber 5695842fe3 fixes notifications when creating sample types and groups 2016-08-18 16:05:15 +02:00
zmagod d62500cb56 check search input string [fixes SCI-346] 2016-08-18 13:14:31 +02:00
zmagod fa08b861d0 fixed experiments archive bug 2016-08-18 10:55:29 +02:00
zmagod 6c5cc8aac9 fixes notification [fixes SCI-337] 2016-08-17 13:17:40 +02:00
Zmago Devetak da735a51f4 Merge pull request #62 from ZmagoD/zd_SCI_318 
Zd sci 318
 2016-08-17 10:01:10 +02:00
zmagod 850f5d8dad fixing hound alerts 2016-08-17 09:44:23 +02:00
zmagod 7abc8f3a90 Merge branch 'master' into experiment-level 2016-08-17 09:28:35 +02:00
Jure Grabnar a29b56b0bd Even more candy for our dog 2016-08-16 09:15:29 +02:00
Jure Grabnar 042a33f2c7 Add activity for moving 2016-08-16 08:49:24 +02:00
zmagod 852fe499fb clean up linked protocol 2016-08-12 16:31:40 +02:00
Jure Grabnar c387439fb2 Fix projects query for experiments 
Remove unneeded word in view
 2016-08-12 11:36:52 +02:00
Jure Grabnar d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
Jure Grabnar 9173c83502 Select current project in clone modal 2016-08-11 17:20:06 +02:00
Jure Grabnar 3c36293770 Add activity for cloning experiment 2016-08-11 17:00:33 +02:00
Jure Grabnar 3b259d34b0 Basic cloning of experiment works 
Still missing:
- cloning of assets
- cloning of experiment image
 2016-08-11 15:13:36 +02:00
Jure Grabnar 7f21ae138a Set clone actions/routes/view 
DRY code for showing AJAX on project#show page
 2016-08-11 09:46:15 +02:00
Jure Grabnar 1ca34a7986 Fix result texts/tables 2016-08-10 15:44:33 +02:00
Jure Grabnar 52e6d7d300 Fix step comments 2016-08-10 15:44:33 +02:00
Jure Grabnar 3e72f29bfd Fix uploading of step assets 2016-08-10 15:44:33 +02:00
Jure Grabnar d69195a4f6 Fix uploading of result assets 2016-08-10 15:44:33 +02:00
zmagod c866e90b33 Merge branch 'zd_add_image_to_project_preview' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_add_image_to_project_preview 2016-08-10 11:33:37 +02:00
zmagod 5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +02:00
Jure Grabnar 0ca5725f9b Archive/restore of experiments now work 2016-08-08 16:35:45 +02:00
zmagod 1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +02:00
Jure Grabnar 2bd74866e0 Fix my_modules archive page 2016-08-08 15:04:02 +02:00
Jure Grabnar deecbf082c Remove badly merged code 2016-08-08 13:06:20 +02:00
jbargu 3f91e7a476 Merge pull request #47 from biosistemika/jg_explvl_reports 
Update reports with experiment level

[Fixes SCI-35].
 2016-08-08 08:51:23 +02:00
zmagod 04d171997e Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41 2016-08-05 15:56:21 +02:00
zmagod 9c5c4f0a3a Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44 2016-08-05 15:23:01 +02:00
Jure Grabnar d9702b6964 Remove unneeded new element 2016-08-05 08:36:06 +02:00
Jure Grabnar 2f0dc57ea6 Fix Hounds warning 2016-08-05 08:29:49 +02:00
Jure Grabnar cafec6a1b4 Fix controls on experiment contents 
Also fix bug with adjencent elements not updating controls.

Fixes SCI-35.
 2016-08-04 16:05:03 +02:00
zmagod a4ec558596 start to implement project overview page 2016-08-04 12:57:33 +02:00
zmagod 57ac34e9f4 add samples to experiment page [fixes SCI-43] 2016-08-03 12:57:51 +02:00
Jure Grabnar aedaf2f30a Adding of experiment content now works in reports 2016-08-03 12:52:52 +02:00
Jure Grabnar 5854e72878 Add experiments_contents action 2016-08-03 12:52:52 +02:00