scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 19:51:01 +08:00
Code Issues Projects Releases Packages Wiki Activity
5719 commits 39 branches 184 tags 168 MiB
Commit graph

1698 commits

Author SHA1 Message Date
zmagod
f918746946 hide the dropdown if user has no permissions(technician) [fixes SCI-371] 2016-08-23 09:26:52 +02:00
zmagod
03a3759cf5 fixes project overview style and add no description link [fixes SCI-360] 2016-08-23 08:52:53 +02:00
zmagod
9a05935067 fixed search result link for experiment [fixes SCI-347] 2016-08-22 15:35:47 +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
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
Jure Grabnar
5bb99adb25 Add frontend logic for moving workflows from canvas 2016-08-19 17:11:17 +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
zmagod
6bb8d075e0 truncate asset name in task step and result [fixes SCI-294] 2016-08-18 09:22:12 +02:00
Zmago Devetak
4897e2da0c Merge pull request #68 from ZmagoD/zd_SCI_330 
Zd sci 330
 2016-08-18 08:10:20 +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
Matej Zrimšek
27a9dac412 File permissions corrected, with some refactoring. 2016-08-17 18:23:24 +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
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
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
0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +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
8d69ca0b88 adds active class to experiment name in sidebar [fixes SCI-331] 2016-08-17 11:21:48 +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
7abc8f3a90 Merge branch 'master' into experiment-level 2016-08-17 09:28:35 +02:00
Jure Grabnar
275106c27c Add check for empty projects on move experiments 2016-08-16 10:20:36 +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
Jure Grabnar
d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
Jure Grabnar
555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
Jure Grabnar
9173c83502 Select current project in clone modal 2016-08-11 17:20:06 +02:00
Jure Grabnar
5c40d04eb2 Add missing clone modal 2016-08-11 16:59:56 +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
7f21ae138a Set clone actions/routes/view 
DRY code for showing AJAX on project#show page
 2016-08-11 09:46:15 +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
7b0f323576 Add expiring URL to experiment img 2016-08-09 16:37:44 +02:00
zmagod
5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +02:00
Jure Grabnar
9f7df0af76 Fix checkbox in experiment reports 2016-08-09 13:13:50 +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
zmagod
1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +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
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
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
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
45dac782ca update sidebar [fixes SCI-303] 2016-08-03 16:09:45 +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
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
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
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
4d57479cf9 Remove comment 
Closes SCI-38.
 2016-07-29 16:40: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
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
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
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
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
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
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
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