scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-10 17:39:38 +08:00
Code Issues Projects Releases Packages Wiki Activity
257 commits 40 branches 184 tags 168 MiB
Commit graph

257 commits

This branch
This branch
All branches
Author SHA1 Message Date
zmagod
d62500cb56 check search input string [fixes SCI-346] 2016-08-18 13:14:31 +02:00
Jure Grabnar
6879521a75 Add missing .experiment to can_unlink_protocol 2016-08-18 10:48:44 +02:00
Zmago Devetak
b6ccecf478 Merge pull request #69 from ZmagoD/zd_SCI_335 
cleans experiment form report if moved [fixes SCI-335]
 2016-08-18 08:37:09 +02:00
Jure Grabnar
c3074e91de Fix activity in first time generator 2016-08-18 08:33:08 +02:00
mlorb
36d24523b4 Merge pull request #61 from biosistemika/ml_sci_291 
fixes dissapearance of sample type/group when editing samlpe or adding new sample [SCI-291]
 2016-08-18 08:25:31 +02:00
Zmago Devetak
4897e2da0c Merge pull request #68 from ZmagoD/zd_SCI_330 
Zd sci 330
 2016-08-18 08:10:20 +02:00
Zmago Devetak
f2e08db106 Merge pull request #67 from ZmagoD/zd_SCI_337 
Zd sci 337
 2016-08-18 08:06:38 +02:00
Zmago Devetak
d17af4e898 Merge pull request #66 from ZmagoD/zd_SCI_331 
adds active class to experiment name in sidebar [fixes SCI-331]
 2016-08-18 08:06:03 +02:00
Zmago Devetak
052279a459 Merge pull request #65 from ZmagoD/zd_SCI_329 
Adds single tasks to the experiment img [fixes SCI-329]
 2016-08-18 08:04:56 +02:00
zmagod
c27c6c19e5 cleans experiment form report if moved [fixes SCI-335] 2016-08-17 15:21:53 +02:00
zmagod
9fd68c7bd5 fixes 'new experiment' button bug on smaller screens 2016-08-17 14:27:59 +02:00
zmagod
ca0ba1403d set flask icon to experiment [fixes SCI-330] 2016-08-17 14:17:29 +02:00
zmagod
cc2ed32ccb fixes canvas bug when no actions are available for the viewer 2016-08-17 13:29:22 +02:00
zmagod
6c5cc8aac9 fixes notification [fixes SCI-337] 2016-08-17 13:17:40 +02:00
zmagod
8d69ca0b88 adds active class to experiment name in sidebar [fixes SCI-331] 2016-08-17 11:21:48 +02:00
zmagod
d557f3249f Adds single tasks to the experiment img [fixes SCI-329] 2016-08-17 11:13:49 +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
Zmago Devetak
13697e8688 Merge pull request #58 from ZmagoD/zd_SCI_74 
Filter search query for special chars [fixes SCI_74]
 2016-08-17 10:00:47 +02:00
zmagod
63fc8e504b Merge branch 'ZmagoD-zd_SCI_271' 2016-08-17 09:59:05 +02:00
zmagod
4293f9c267 Merge branch 'zd_SCI_271' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_271 2016-08-17 09:58:29 +02:00
zmagod
c9d439f652 Merge branch 'experiment-level' 2016-08-17 09:45:37 +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
zmagod
76dd4bc90a fixed protocol status bar [fixes SCI-318] 2016-08-16 10:47:23 +02:00
Zmago Devetak
762b805651 Merge pull request #55 from ZmagoD/zd_papperclip_migration_bug 
fixes migration error
 2016-08-16 10:44:53 +02:00
Zmago Devetak
9b97dad03d Merge pull request #54 from ZmagoD/zd_SCI_39 
fixes loading samples error in blank project
 2016-08-16 10:44:35 +02:00
jbargu
20a8fd551f Merge pull request #60 from jbargu/jg_clone_move_experiment 
Clone/move experiment functionality

[fixes SCI-308]
 2016-08-16 10:24:52 +02:00
Jure Grabnar
275106c27c Add check for empty projects on move experiments 2016-08-16 10:20:36 +02:00
Mojca Lorber
7dc0c3672a fixes dissapearance of sample type/group when adding/editing new sample 2016-08-16 10:17:29 +02:00
Jure Grabnar
c16eed5e63 Add missing dropdown_actions.js 2016-08-16 09:48:19 +02:00
zmagod
5e647f62d5 changed import label [fixes SCI-317] 2016-08-16 09:34:04 +02:00
Jure Grabnar
a29b56b0bd Even more candy for our dog 2016-08-16 09:15:29 +02:00
Jure Grabnar
b25a7758db Give a candy to our special dog 2016-08-16 09:10:45 +02:00
Jure Grabnar
042a33f2c7 Add activity for moving 2016-08-16 08:49:24 +02:00
Jure Grabnar
e55c66b3d0 Add query for moveable projects 2016-08-16 08:47:04 +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
zmagod
c9ff249067 fixed hound alert 2016-08-12 11:11:52 +02:00
zmagod
6c7cfb4467 filter search query for special chars [fixes SCI_74] 2016-08-12 11:08:51 +02:00
Jure Grabnar
555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
mlorb
6b17385f3a Merge pull request #56 from biosistemika/ml_sci_302 
fixes problem with split table when generating pdf report [SCI-302]
 2016-08-12 08:55:10 +02:00
mlorb
f3163ea7ce visual corrections 2016-08-12 08:54:14 +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
5c40d04eb2 Add missing clone modal 2016-08-11 16:59:56 +02:00
Jure Grabnar
2f6ccac3bc Add unique experiment name and copy image when cloning 2016-08-11 16:58:31 +02:00
Jure Grabnar
6e8e9ecf21 Fix activities and the dreaded no project for modules error 2016-08-11 16:57:29 +02:00
zmagod
d1f6a0f58d fixed hound 2016-08-11 16:24:44 +02:00
zmagod
701c26a2dd fixed canvas edit and samples tutorial [fixes: SCI-271] 2016-08-11 16:21:55 +02:00