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
347 commits 43 branches 185 tags 169 MiB
Commit graph

62 commits

Author SHA1 Message Date
Zmago Devetak
0de7ea31ea Merge pull request #90 from ZmagoD/zd_SCI_376 
fixes cloned experiment protocol [fixes SCI-376]
 2016-08-24 14:12:19 +02:00
Jure Grabnar
00da7efb44 Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 
Conflicts:
	app/models/experiment.rb

SCI-328 #close
 2016-08-24 13:11:10 +02:00
Jure Grabnar
dff5abf3d9 Fix module moving position not being updated 2016-08-24 11:42:21 +02:00
zmagod
2bbb439745 fixes cloned experiment protocol [fixes SCI-376] 2016-08-23 16:15:45 +02:00
Jure Grabnar
67768c8865 Fix Hound errors 2016-08-23 11:08:10 +02:00
Jure Grabnar
358f2b1c47 Add moving for newly created modules 2016-08-23 10:00:34 +02:00
Jure Grabnar
c0edf51054 Fix bounding box algorithm, can move new modules 2016-08-23 09:00:25 +02:00
Jure Grabnar
8940ba891b Add initial position for moving workflows 2016-08-22 17:52:55 +02:00
zmagod
cac5033eba set ajax for workflow img 2016-08-19 15:36:12 +02:00
Jure Grabnar
80498260e5 Add backend for moving task from canvas 2016-08-19 13:53:43 +02:00
Jure Grabnar
f575303d11 Update get_new_position for new canvas size 
SCI-358 #close
 2016-08-19 13:42:28 +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
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
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
Zmago Devetak
f2e08db106 Merge pull request #67 from ZmagoD/zd_SCI_337 
Zd sci 337
 2016-08-18 08:06:38 +02:00
zmagod
c27c6c19e5 cleans experiment form report if moved [fixes SCI-335] 2016-08-17 15:21:53 +02:00
zmagod
6c5cc8aac9 fixes notification [fixes SCI-337] 2016-08-17 13:17:40 +02:00
zmagod
d557f3249f Adds single tasks to the experiment img [fixes SCI-329] 2016-08-17 11:13:49 +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
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
Jure Grabnar
555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +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
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
zmagod
060da59bbb fixes migration error 2016-08-11 09:19:12 +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
Jure Grabnar
b2855d69f6 Fix hound warning 2016-08-10 09:24:06 +02:00
Jure Grabnar
15d66c7884 Change validation for experiment workimg 2016-08-10 08:58:29 +02:00
Jure Grabnar
7b0f323576 Add expiring URL to experiment img 2016-08-09 16:37:44 +02:00
zmagod
f77e0d4a6e changed workflow image name 2016-08-09 16:27:28 +02:00
zmagod
5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +02:00
Jure Grabnar
e995165876 Double quotes -> single quotes (#hound) 2016-08-09 13:19:32 +02:00
zmagod
176aad4c6d fixes multiple graphs rendering 2016-08-09 11:19:07 +02:00
Jure Grabnar
208e85e7e0 Remove archived experiments from reports 2016-08-09 11:17:25 +02:00
zmagod
1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +02:00
Jure Grabnar
5a023483d7 Prepare views for experiment archive 2016-08-08 14:19:35 +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
57ac34e9f4 add samples to experiment page [fixes SCI-43] 2016-08-03 12:57:51 +02:00
Jure Grabnar
964b51f84a Add experiment reports element 2016-08-03 12:52:52 +02:00
Luka Murn
ecf5b5a2c1 Feed the Hound 2016-07-29 16:46:25 +02:00
Luka Murn
34af50a9d0 Fix breadcrumbs & sidebar so it works 2016-07-29 15:47:41 +02:00
zmagod
d16c0fe706 fixed edit canvas 2016-07-28 10:09:05 +02:00
Jure Grabnar
1a1c4bb68a Remove needless join from MyModuleGroup 2016-07-27 10:18:57 +02:00