Commit graph

3611 commits

Author SHA1 Message Date
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 4ad384df5a Fixed hound alerts. 2016-08-17 21:02:05 +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
zmagod ca0ba1403d set flask icon to experiment [fixes SCI-330] 2016-08-17 14:17:29 +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 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
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
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
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
Mojca Lorber 94915a9ba7 fixes problem with splitted table when generating pdf report [SCI-302] 2016-08-11 15:24:18 +02:00
zmagod 2e1d81a985 fixed project archive in tutorial 2016-08-11 12:40:16 +02:00
Mojca Lorber b350dff826 fixes problem with splitted table when generating pdf report [SCI-302] 2016-08-11 10:42:36 +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 32699578ed Merge pull request #52 from biosistemika/bb_canvas_fixes
Bb canvas fixes
2016-08-11 09:29:21 +02:00
zmagod 5583105d8a fixed hound alert 2016-08-09 14:28:55 +02:00
zmagod 5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +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
Zmago Devetak 4bd489d29c Merge pull request #46 from ZmagoD/zd_SCI_303
update sidebar v2 [fixes SCI-303]
2016-08-08 08:56:01 +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 520cf2e0cf hound.... 2016-08-08 08:40:24 +02:00
zmagod e16abe486c fix hound alert 2016-08-08 08:37:22 +02:00
zmagod 756c3c777e styled workflow dots 2016-08-08 08:33:18 +02:00
Mojca Lorber c691ca63e2 fixing houndci-bot comment 2016-08-05 09:47:06 +02:00
Mojca Lorber 5d137324bc moving and targeting .label class 2016-08-05 09:12:17 +02:00
Jure Grabnar 2f0dc57ea6 Fix Hounds warning 2016-08-05 08:29:49 +02:00
Jure Grabnar a25a4354c6 Fix css, #hound. 2016-08-05 08:05:14 +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
zmagod f8f87e9540 Feed the Hound 2016-08-03 16:16:09 +02:00
zmagod 45dac782ca update sidebar [fixes SCI-303] 2016-08-03 16:09:45 +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
Jure Grabnar 598c5a63fd Add experiment level to project report contents modal 2016-08-03 12:52:05 +02:00
zmagod caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
Luka Murn b085aa1db3 Remove uneccesary project_activities HTML pages 2016-07-29 16:06:35 +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