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

259 commits

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 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 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 65049692ea Merge pull request #78 from ZmagoD/zd_SCI_349 
updating thumbnail
 2016-08-23 16:22:07 +02:00
Mojca Lorber ac68db97b9 fixes tile size in edit canvas 2016-08-23 13:33:10 +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 03a3759cf5 fixes project overview style and add no description link [fixes SCI-360] 2016-08-23 08:52:53 +02:00
Jure Grabnar 667b7671a6 Add connections for moved workflows 2016-08-22 17:26:21 +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 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
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
Jure Grabnar 80498260e5 Add backend for moving task from canvas 2016-08-19 13:53:43 +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
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
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
Matej Zrimšek e4a6a3944e Added deleting of files on S3 server when editing/removing a file. Some refactoring. 2016-08-17 18:13:35 +02:00
Matej Zrimšek ccdccc5cf1 Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring. 2016-08-17 18:11:13 +02:00
Matej Zrimšek c87ba5b45c Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page. 2016-08-17 18:10:32 +02:00
Matej Zrimšek 951cf67b3d A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring. 2016-08-17 18:08:21 +02:00
Matej Zrimšek b70f49f4e0 Some additional refinements. 2016-08-17 18:00:04 +02:00
Matej Zrimšek 86880f0299 Additional changes, refactoring and improvements. 2016-08-17 17:57:54 +02:00
Matej Zrimšek 01aad1764c Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring. 2016-08-17 17:54:45 +02:00
Matej Zrimšek e2f94caa96 Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done. 2016-08-17 17:54:06 +02:00
Jure Grabnar 77f75fdeb6 Delete module from canvas when moving 2016-08-17 15:46:30 +02:00
Jure Grabnar 0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +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 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 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
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
zmagod 852fe499fb clean up linked protocol 2016-08-12 16:31:40 +02:00
Mojca Lorber e6f205368b fixes tutorial bug of inappropriate window 2016-08-12 11:33:27 +02:00
Jure Grabnar 555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
zmagod 701c26a2dd fixed canvas edit and samples tutorial [fixes: SCI-271] 2016-08-11 16:21:55 +02:00
zmagod a128815122 fixed tutorial tasks on canvas 2016-08-11 16:06:51 +02:00
zmagod 2e1d81a985 fixed project archive in tutorial 2016-08-11 12:40:16 +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
scibb 696075bf0f smaller grid steps set. In addition enddpoint bug was fixed 
SCI 170, SCI 292'
 2016-08-08 15:18:38 +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
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
Jure Grabnar da2a06c999 Fix global sort to work with experiments 2016-08-03 14:59:53 +02:00
Jure Grabnar acc41dae40 Add experiment content report dialog 
Adding still has to be implemented
 2016-08-03 12:52:51 +02:00
zmagod caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
zmagod e95f518964 refactor canvas_controller, experiments_controller 2016-07-28 16:01:53 +02:00
zmagod 352944fc33 added new/edit experiment modals 2016-07-28 14:44:44 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn 055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00