scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
294 commits 43 branches 185 tags 169 MiB
Commit graph

294 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zmago Devetak
9dc7708b73 Merge pull request #85 from ZmagoD/zd_SCI_360 
fixes project overview style and add no description link [fixes SCI-360]
 2016-08-23 16:24:22 +02:00
Zmago Devetak
d67997fa8b Merge pull request #83 from ZmagoD/zd_SCI_347 
Fixes search result link for experiment [fixes SCI-347]
 2016-08-23 16:23:41 +02:00
Zmago Devetak
aa650bbc65 Merge pull request #82 from ZmagoD/zd_SCI_359 
Add plus button at the bottom of project overview page [fixes SCI-359]
 2016-08-23 16:23:20 +02:00
Zmago Devetak
7e2db66f42 Merge pull request #79 from ZmagoD/zd_SCI_345 
Adds font-awesome to pdf [fixes SCI-345]
 2016-08-23 16:22:30 +02:00
Zmago Devetak
65049692ea Merge pull request #78 from ZmagoD/zd_SCI_349 
updating thumbnail
 2016-08-23 16:22:07 +02:00
zmagod
0429816154 deleted commented code 2016-08-23 16:21:11 +02:00
Luka Murn
ea5c065aa9 Merge pull request #89 from Ducz0r/lm-add-hound-config 
Add Hound & Rubocop config files
 2016-08-23 14:11:15 +02:00
Luka Murn
d3a3febaf8 Add Hound & Rubocop config files 2016-08-23 14:02:15 +02:00
zmagod
03a3759cf5 fixes project overview style and add no description link [fixes SCI-360] 2016-08-23 08:52:53 +02:00
zmagod
9a05935067 fixed search result link for experiment [fixes SCI-347] 2016-08-22 15:35:47 +02:00
zmagod
8c592753e4 fixes hound 2016-08-22 15:27:11 +02:00
zmagod
bb11999566 adds plus button at the bottom of project overview page [fixes SCI-359] 2016-08-22 15:22:05 +02:00
zmagod
eab05eb9db adds font-awesome to pdf [fixes SCI-345] 2016-08-22 14:40:09 +02:00
zmagod
d38f29d207 set ajax loading of experiments images [fixes SCI-349] 2016-08-22 11:29:19 +02:00
mlorb
ed1cd193ac Merge pull request #77 from mlorb/ml_sci_357 
fixes warning messages when loading a new protocol that is linked with repository [SCI-357]
 2016-08-22 08:56:36 +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
b86e67a0d6 refactor initProjectExperiment 2016-08-19 16:38:34 +02:00
Mojca Lorber
fb081be682 fixes warning messages when loading a new protocol that is linked with repository 2016-08-19 16:03:10 +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
51e0d53b12 remove code duplication 2016-08-19 13:08:35 +02:00
Mojca Lorber
571f5b60f3 fixes notifications appearance and disappearance and content adjustment 2016-08-19 10:48:43 +02:00
Mojca Lorber
5c77167388 update buttons 2016-08-18 16:47:16 +02:00
Mojca Lorber
5695842fe3 fixes notifications when creating sample types and groups 2016-08-18 16:05:15 +02:00
Zmago Devetak
58930f3456 Merge pull request #73 from ZmagoD/zd_SCI_344 
fixes user duplication [fixes SCI-344]
 2016-08-18 13:28:59 +02:00
zmagod
2216a86db5 hound again 2016-08-18 13:27:46 +02:00
zmagod
d3f61bdd18 fixes hound alert 2016-08-18 13:24:44 +02:00
Zmago Devetak
a680b09cc9 Merge pull request #72 from ZmagoD/zd_fix_exl_archive 
fixed experiments archive bug
 2016-08-18 13:16:51 +02:00
Zmago Devetak
fe626a8cb3 Merge pull request #71 from ZmagoD/zd_SCI_294 
Zd sci 294
 2016-08-18 13:16:38 +02:00
zmagod
d62500cb56 check search input string [fixes SCI-346] 2016-08-18 13:14:31 +02:00
zmagod
4b5be7530c fixed task archive 2016-08-18 11:53:57 +02:00
zmagod
da2b9ccf82 fixes user duplication [fixes SCI-344] 2016-08-18 11:26:52 +02:00
zmagod
fa08b861d0 fixed experiments archive bug 2016-08-18 10:55:29 +02:00
Jure Grabnar
6879521a75 Add missing .experiment to can_unlink_protocol 2016-08-18 10:48:44 +02:00
zmagod
6bb8d075e0 truncate asset name in task step and result [fixes SCI-294] 2016-08-18 09:22:12 +02:00
zmagod
072f816286 refactor restore_after_tutorial function 2016-08-18 08:55:40 +02:00
zmagod
f2ee5d73a0 fixed project tutorial bug 2016-08-18 08:53:34 +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