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

12275 commits

Author SHA1 Message Date
Jure Grabnar 0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +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
zmagod 6c5cc8aac9 fixes notification [fixes SCI-337] 2016-08-17 13:17:40 +02:00
zmagod 8d69ca0b88 adds active class to experiment name in sidebar [fixes SCI-331] 2016-08-17 11:21:48 +02:00
zmagod d557f3249f Adds single tasks to the experiment img [fixes SCI-329] 2016-08-17 11:13:49 +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
Zmago Devetak 13697e8688 Merge pull request #58 from ZmagoD/zd_SCI_74 
Filter search query for special chars [fixes SCI_74]
 2016-08-17 10:00:47 +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
Zmago Devetak 762b805651 Merge pull request #55 from ZmagoD/zd_papperclip_migration_bug 
fixes migration error
 2016-08-16 10:44:53 +02:00
Zmago Devetak 9b97dad03d Merge pull request #54 from ZmagoD/zd_SCI_39 
fixes loading samples error in blank project
 2016-08-16 10:44:35 +02:00
Jure Grabnar 275106c27c Add check for empty projects on move experiments 2016-08-16 10:20:36 +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
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
zmagod 852fe499fb clean up linked protocol 2016-08-12 16:31:40 +02:00
Jure Grabnar c387439fb2 Fix projects query for experiments 
Remove unneeded word in view
 2016-08-12 11:36:52 +02:00
Mojca Lorber e6f205368b fixes tutorial bug of inappropriate window 2016-08-12 11:33:27 +02:00
Jure Grabnar d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
zmagod c9ff249067 fixed hound alert 2016-08-12 11:11:52 +02:00
zmagod 6c7cfb4467 filter search query for special chars [fixes SCI_74] 2016-08-12 11:08:51 +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
Jure Grabnar 9173c83502 Select current project in clone modal 2016-08-11 17:20:06 +02:00
Jure Grabnar 3c36293770 Add activity for cloning experiment 2016-08-11 17:00:33 +02:00
Jure Grabnar 5c40d04eb2 Add missing clone modal 2016-08-11 16:59:56 +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
zmagod d1f6a0f58d fixed hound 2016-08-11 16:24:44 +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
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 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 060da59bbb fixes migration error 2016-08-11 09:19:12 +02:00
Jure Grabnar 1ca34a7986 Fix result texts/tables 2016-08-10 15:44:33 +02:00
Jure Grabnar 52e6d7d300 Fix step comments 2016-08-10 15:44:33 +02:00
Jure Grabnar 3e72f29bfd Fix uploading of step assets 2016-08-10 15:44:33 +02:00
Jure Grabnar d69195a4f6 Fix uploading of result assets 2016-08-10 15:44:33 +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
zmagod 7653f2b9ec fixed hound 2016-08-10 11:26:27 +02:00
Jure Grabnar b2855d69f6 Fix hound warning 2016-08-10 09:24:06 +02:00
zmagod deb739efa6 fixes loading samples error in blank project 2016-08-10 09:13:12 +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 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
Jure Grabnar e995165876 Double quotes -> single quotes (#hound) 2016-08-09 13:19:32 +02:00
Jure Grabnar 9f7df0af76 Fix checkbox in experiment reports 2016-08-09 13:13:50 +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
Jure Grabnar 1a7a7a1d1a Add info to experiment archive cards 
Also add addtional check for due date on archive experiment
 2016-08-09 11:04:46 +02:00
Jure Grabnar a0fe31479f Fix permissions for archived experiments 2016-08-09 10:00:44 +02:00
Jure Grabnar 0ca5725f9b Archive/restore of experiments now work 2016-08-08 16:35:45 +02:00
zmagod 1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +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
Jure Grabnar 5c858ee577 Add missing experiment archive page 2016-08-08 15:04:38 +02:00
Jure Grabnar 2bd74866e0 Fix my_modules archive page 2016-08-08 15:04:02 +02:00
Jure Grabnar 5a023483d7 Prepare views for experiment archive 2016-08-08 14:19:35 +02:00
Jure Grabnar 775a39344c Fix experiment archive permissions 2016-08-08 13:40:08 +02:00
Jure Grabnar deecbf082c Remove badly merged code 2016-08-08 13:06:20 +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
zmagod 04d171997e Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41 2016-08-05 15:56:21 +02:00
zmagod 9c5c4f0a3a Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44 2016-08-05 15:23:01 +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 d9702b6964 Remove unneeded new element 2016-08-05 08:36:06 +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
Jure Grabnar 8b2b134614 Migrate old reports to new experiment level reports 2016-08-04 13:19:46 +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
zmagod fd8187370e Feed the Hound part 3 2016-08-03 13:16:51 +02:00
Jure Grabnar 0c51f7bc8b Saving/editing of reports now works 2016-08-03 13:15:40 +02:00
zmagod 9d4a67a5b6 Feed the Hound 2 2016-08-03 13:11:46 +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
Jure Grabnar aedaf2f30a Adding of experiment content now works in reports 2016-08-03 12:52:52 +02:00
Jure Grabnar 5854e72878 Add experiments_contents action 2016-08-03 12:52:52 +02:00
Jure Grabnar 9092dd6914 Replace all occurences of module_elements 2016-08-03 12:52:52 +02:00
Jure Grabnar ff081cd844 Simplify project contents dialog 2016-08-03 12:52:51 +02:00
Jure Grabnar dc82830a8f Add checkbox behaviour to experiment contents 2016-08-03 12:52:51 +02:00
Jure Grabnar 3f33ebe59a Fix wrong closure in experiment contents 2016-08-03 12:52:51 +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 41e8c54aa5 Rename _module_element_controls to element_controls 2016-08-03 12:52:06 +02:00
Jure Grabnar 1e334d9075 Remove unneeded "Add new report element" 2016-08-03 12:52:06 +02:00
Jure Grabnar d82ba163ed Add experiment to report screen 
Only placeholder for now, JS still needs fixing.
 2016-08-03 12:52:06 +02:00
Jure Grabnar ac708e7497 Remove no module group from reports 2016-08-03 12:52:06 +02:00
Jure Grabnar 797685fbf0 Remove workflows from project content dialog (report) 2016-08-03 12:52:06 +02:00
Jure Grabnar daca739262 Add new line to selector for readability 2016-08-03 12:52:06 +02:00
Jure Grabnar 598c5a63fd Add experiment level to project report contents modal 2016-08-03 12:52:05 +02:00
zmagod d11b0b11e9 Feed the Hound 2016-08-03 09:44:05 +02:00
zmagod caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
Mojca Lorber ffa64445df fixes issue SCI-223 2016-08-02 16:30:07 +02:00
Zmago Devetak 43230384b5 Merge pull request #40 from ZmagoD/zd_SCI_261 
Fixed search query [fixes SCI-261]
 2016-08-02 11:44:00 +02:00
zmagod 18d73467c8 fixed hound warning 2016-08-02 11:16:07 +02:00
zmagod 166f907780 fixed search error 2016-08-02 11:10:30 +02:00
zmagod f184ee3f2d fixing hound warnings 2016-08-02 09:13:30 +02:00
zmagod 9581e2751f fixes samples page for experiment level [fixes SCI-44] 2016-08-02 08:44:07 +02:00
zmagod 6e3ce92348 add checking for step content 2016-08-01 11:23:22 +02:00
Luka Murn 40fe4e54a9 Feed the Hound #2 2016-07-29 16:48:56 +02:00
Luka Murn ecf5b5a2c1 Feed the Hound 2016-07-29 16:46:25 +02:00
Luka Murn 4d57479cf9 Remove comment 
Closes SCI-38.
 2016-07-29 16:40:42 +02:00
zmagod 95da62adde fixed hound 2016-07-29 16:38:42 +02:00
zmagod 25b99b6570 fixed search [fixes SCI-261] 2016-07-29 16:32:54 +02:00
Luka Murn 8a2b54819a More fixes on secondary navigation 2016-07-29 16:20:35 +02:00
Luka Murn bed8687dbd Remove some unused commented code 2016-07-29 16:08:30 +02:00
Luka Murn b085aa1db3 Remove uneccesary project_activities HTML pages 2016-07-29 16:06:35 +02:00
Luka Murn ed2226c14b Refactor sidebar 2016-07-29 15:58:47 +02:00
Luka Murn 34af50a9d0 Fix breadcrumbs & sidebar so it works 2016-07-29 15:47:41 +02:00
Luka Murn 0f0689eddc Fix permission helper 2016-07-29 11:43:15 +02:00
Luka Murn 4ea86d6aa1 Code style fixes 2016-07-29 10:41:08 +02:00
Luka Murn edafcaeed6 Move route module_archive_project -> module_archive_experiment 
Also add some new routes, move some templates.
 2016-07-29 10:25:02 +02:00
Luka Murn ebda92ef05 Add experiments_controller 2016-07-29 10:21:21 +02:00
Luka Murn 1ad265835b Move route canvas_project -> canvas_experiment 2016-07-29 10:08:28 +02:00
Luka Murn 0c75423cc0 Add TODO to project overview page 2016-07-29 09:46:26 +02:00
Luka Murn b64e200b91 Refactor canvas a lot. 
Also refactor localization files concerning canvas.
 2016-07-28 16:41:10 +02:00
Luka Murn c8ef3b1899 Fix first time generator 2016-07-28 16:40:51 +02:00
zmagod e95f518964 refactor canvas_controller, experiments_controller 2016-07-28 16:01:53 +02:00
zmagod d91aa5c60b fixed translation sting 'name' to 'experiment' 2016-07-28 14:57:47 +02:00
zmagod 23a46d5fb3 added translations to experiment create and edit flash messages 2016-07-28 14:52:11 +02:00
zmagod 352944fc33 added new/edit experiment modals 2016-07-28 14:44:44 +02:00
Luka Murn 1953e295b6 Hotfix for search results bug 2016-07-28 13:29:26 +02:00
zmagod 9d23cfd940 fixed experiment routes 2016-07-28 11:30:34 +02:00
zmagod c11932b45b fixed layout 2016-07-28 11:00:56 +02:00
zmagod d16c0fe706 fixed edit canvas 2016-07-28 10:09:05 +02:00
zmagod 54c4051906 added canvas under experiments 2016-07-28 09:01:44 +02:00
zmagod a17106b883 added experiments controller and fixed sidebar 2016-07-27 16:18:26 +02:00
Zmago Devetak c869db2506 Merge pull request #35 from ZmagoD/zd_SCI_40 
Edit canvas controller to work with experiments
 2016-07-27 12:11:19 +02:00
zmagod 485d93f8b9 refactor canvas permissions 2016-07-27 11:35:07 +02:00
Jure Grabnar 1a1c4bb68a Remove needless join from MyModuleGroup 2016-07-27 10:18:57 +02:00
zmagod 5c7501a273 added experiments canvas labels in localization file and fixed canvas views 2016-07-26 14:21:59 +02:00
zmagod 0a84ecdfc1 edit canvas controller to work with experiment 2016-07-26 14:02:06 +02:00
Jure Grabnar 77ed1c5fd3 Change invalid references to project in search and shorten lines. 2016-07-26 12:59:37 +02:00
Jure Grabnar 80621c9b6b Add experiment text to all searches related to experiment 2016-07-26 12:26:48 +02:00
Jure Grabnar 690ad0fffa Add a few experiment permissions 2016-07-26 12:26:48 +02:00
Jure Grabnar 3be562bdf6 Add experiment to search results 2016-07-26 12:26:48 +02:00
Jure Grabnar 6d26203796 Add missing target var to result searches 2016-07-26 12:26:48 +02:00
Jure Grabnar 5283027da1 Add missing target var to searches. 2016-07-26 12:26:48 +02:00
Jure Grabnar 0361f006ca Add SearchableModel to Experiment and fix children 2016-07-26 12:26:48 +02:00
Jure Grabnar 49cd8a783d Update first time data generator with experiment. 2016-07-26 12:20:31 +02:00
Zmago Devetak b13747291e Merge pull request #32 from ZmagoD/zd_SCI_31 
Fixing modules after integrating experiment-level
 2016-07-26 09:18:16 +02:00
zmagod 346bffe08f fixed protocol.rb 2016-07-26 09:17:24 +02:00
zmagod c27ffa9fbf fixed project_my_module method 2016-07-26 08:44:09 +02:00
Luka Murn 3187843d14 Change updated_by -> last_modified_by 2016-07-25 14:47:13 +02:00
zmagod 6053c782f9 fixed permission_helper [fixes SCI-34] 2016-07-25 12:07:10 +02:00
zmagod 18d66ece56 migrated model related functions to experiment.rb [fixes: SCI-31] 2016-07-25 11:25:10 +02:00
zmagod 426bce48b2 fixed permission_helper 2016-07-25 09:31:40 +02:00
zmagod b3c61cfa41 fixed project_my_modules method 2016-07-25 09:13:04 +02:00
zmagod 7c9a0bc2bb fixed models 2016-07-22 15:36:48 +02:00
zmagod 389ee7ea43 start fixing modules 2016-07-22 14:31:09 +02:00
Luka Murn 785fb2cba1 Initial migration & changes in ActiveRecords 2016-07-22 10:43:55 +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