scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
324 commits 70 branches 179 tags 165 MiB
Commit graph

324 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zmago Devetak afaeab492d Merge pull request #87 from ZmagoD/zd_SCI_371 
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
 2016-08-24 11:56:29 +02:00
jbargu 180efac87b Merge pull request #92 from jbargu/jg_exp_overview_navbar_sci_353 
Show whole tree structure for experiment in sidebar
 2016-08-24 11:50:39 +02:00
jbargu 3997ad7114 Merge pull request #91 from jbargu/jg_exp_navigation_sci_352 
Fix experiment navigation (sidebar and secondary navigation)

SCI-352 #close
 2016-08-24 11:50:04 +02:00
Jure Grabnar dff5abf3d9 Fix module moving position not being updated 2016-08-24 11:42:21 +02:00
zmagod 27d77bc73f added new permission for dropdown actions 2016-08-24 10:56:30 +02:00
Jure Grabnar e60533af57 Add whole tree structure for experiment 
SCI-353 #close
 2016-08-24 10:47:30 +02:00
Jure Grabnar a091571d9c Add consistent links for archive for all entities 2016-08-24 09:14:29 +02:00
Jure Grabnar 0cdb18ffcd Update experiment links on sidebar between actions 2016-08-24 09:05:57 +02:00
Jure Grabnar a41d851830 Fix secondary navigation for experiment level (overview) 2016-08-24 08:54:02 +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 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
Mojca Lorber 322be64b5f change experiment path 2016-08-23 14:44:22 +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
Jure Grabnar 67768c8865 Fix Hound errors 2016-08-23 11:08:10 +02:00
Jure Grabnar 0d56cea3e4 Add placeholders for empty experiments 2016-08-23 10:37:48 +02:00
Jure Grabnar 027193f937 Add links for moving module groups 2016-08-23 10:09:25 +02:00
Jure Grabnar 358f2b1c47 Add moving for newly created modules 2016-08-23 10:00:34 +02:00
zmagod f918746946 hide the dropdown if user has no permissions(technician) [fixes SCI-371] 2016-08-23 09:26:52 +02:00
zmagod 66b8a3055d changed experiment create redirection [fixes SCI-365] 2016-08-23 09:03:39 +02:00
Jure Grabnar c0edf51054 Fix bounding box algorithm, can move new modules 2016-08-23 09:00:25 +02:00
zmagod 03a3759cf5 fixes project overview style and add no description link [fixes SCI-360] 2016-08-23 08:52:53 +02:00
Jure Grabnar 8940ba891b Add initial position for moving workflows 2016-08-22 17:52:55 +02:00
Jure Grabnar 667b7671a6 Add connections for moved workflows 2016-08-22 17:26:21 +02:00
zmagod 9a05935067 fixed search result link for experiment [fixes SCI-347] 2016-08-22 15:35:47 +02:00
Mojca Lorber 75c52d20e5 fixes hound 2016-08-22 15:30:27 +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
Mojca Lorber 131d0d269a fixes edit experiment 2016-08-22 15:18:02 +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
Jure Grabnar 5bb99adb25 Add frontend logic for moving workflows from canvas 2016-08-19 17:11:17 +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
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
Mojca Lorber 51e0d53b12 remove code duplication 2016-08-19 13:08:35 +02:00