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

3046 commits

Author SHA1 Message Date
zmagod 0d23f05698 Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440 2016-10-03 16:14:22 +02:00
zmagod 36fb2713b3 start fixing comments dates 2016-10-03 16:10:20 +02:00
Zmago Devetak 91c7d8a952 Merge pull request #176 from ZmagoD/zd_SCI_474 
Unify the comments
 2016-10-03 15:26:17 +02:00
zmagod ea17182372 generate notifications [fixes SCI-440] 2016-10-03 11:37:29 +02:00
Mojca Lorber 5b32be2137 adding subtitle in modal 2016-10-03 09:28:58 +02:00
zmagod 2ee02ec472 mark all seen notifications 2016-10-03 08:20:23 +02:00
Jure Grabnar 1e14955ade Prevent deleting asset on step update 2016-10-01 18:47:05 +02:00
Jure Grabnar d9fa882d6a Add check for locked files on step delete 2016-10-01 14:51:55 +02:00
Jure Grabnar a2d6d9a29a Add WOPI controlls to result 2016-10-01 11:23:32 +02:00
Luka Murn 49c5474219 Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2 
Fixed wrong CSS formatting and added release notes link to help link.
 2016-09-30 08:27:57 +02:00
Mojca Lorber 35477b1005 Remove Info tab and change comment title on results view 2016-09-29 16:43:19 +02:00
zmagod 60a503f115 added assignment image 2016-09-29 16:05:43 +02:00
zmagod e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Mojca Lorber c9fbf845f1 Remove Info tab and change comment title 2016-09-29 14:37:29 +02:00
Matej Zrimšek a6324d61c5 Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab. 2016-09-29 14:27:26 +02:00
Mojca Lorber 5d905f0094 refactoring 2016-09-29 14:18:04 +02:00
Luka Murn f1b74f1906 Fix image names in introductory popup 
This will make sure browsers don't display old, cached images to clients.
 2016-09-29 13:44:38 +02:00
Jure Grabnar ed8df3cc62 Add favicon url to iframe 2016-09-29 12:19:29 +02:00
zmagod cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +02:00
Mojca Lorber efa7a1d7b5 add sample information in pop-up 2016-09-28 15:46:41 +02:00
zmagod 2a86aaf7e4 changed popout content [fixes SCI-520] 2016-09-28 15:12:30 +02:00
Jure Grabnar e96e8486ea Add check file permissions to assets controller 
SCI-502 #close
 2016-09-28 09:33:44 +02:00
Jure Grabnar 5aea0fbb19 Refactor the rest of WOPI logic from Nejc 2016-09-28 09:33:44 +02:00
Jure Grabnar 0e9756ad94 Fix bad step view rebase 2016-09-28 09:33:44 +02:00
Nejc Bernot 1b260785ec First working version of office integration 
Only works on scinote-preview
 2016-09-28 09:33:44 +02:00
zmagod 2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
zmagod 1eb9f772f4 refactor sciNote comments js and unified all comments behavior [fixes SCI-474] 2016-09-27 10:30:48 +02:00
zmagod 980ff63104 fixed task comments 2016-09-27 09:18:46 +02:00
zmagod 02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
Mojca Lorber cc5cdf2577 Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321 2016-09-26 09:39:05 +02:00
Mojca Lorber c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
mz3944 1c1a7c231e Merge pull request #169 from mz3944/mz_help_button_SCI_13 
Added help dropdown. [SCI-13]
 2016-09-23 13:04:38 +02:00
okriuchykhin 4f0fb7074b Merge pull request #167 from okriuchykhin/ok_SCI-470 
Fix issue with long tags in dropdown list [fixes SCI-470]
 2016-09-23 13:00:06 +02:00
Matej Zrimšek fc86b7b1fd Added help dropdown. [SCI-13] 2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin e8ac754829 Fix issue with long tags in dropdown list [fixes SCI-470] 2016-09-23 11:05:17 +02:00
okriuchykhin b5c861583d Merge pull request #157 from okriuchykhin/ok_SCI_430 
Fixes issue with unneeded sort icon [fixes SCI-430]
 2016-09-22 16:39:26 +02:00
okriuchykhin 37eedf17a0 Merge pull request #155 from okriuchykhin/ok_SCI-451 
Fixes issue with zoom buttons on canvas [fixes SCI-451]
 2016-09-22 16:11:45 +02:00
Matej Zrimšek 234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
zmagod 06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436 2016-09-21 19:20:55 +02:00
zmagod 9f56df02d2 removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
zmagod 42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod da86208441 styled step comments 2016-09-20 14:13:40 +02:00
Oleksii Kriuchykhin 411ee4ee77 Fixes issue with unneeded sort icon [fixes SCI-430] 2016-09-20 11:30:11 +02:00
zmagod cd64e035c0 set form validations 2016-09-20 09:50:03 +02:00
zmagod f48553e807 fixed ajax call 2016-09-19 16:12:07 +02:00
Oleksii Kriuchykhin a3b00d0ff8 Fixes issue with zoom buttons on canvas [fixes SCI-451] 2016-09-16 16:27:54 +02:00
Matej Zrimšek 20ca37f185 Readded client-side result's comment validation. 2016-09-16 15:57:54 +02:00
zmagod 938aa32190 js tweaks 2016-09-16 15:22:24 +02:00
Zmago Devetak 431227c0a4 Merge pull request #147 from maslick/resultCommentsError1000Chars 
Fixed: Comments in results have no error message if the text exceeds 1000 characters
 2016-09-16 09:38:38 +02:00
zmagod b9b466cd8e Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas 2016-09-16 09:28:19 +02:00
zmagod e90f0bd3d5 refactor step view 2016-09-16 09:04:21 +02:00
mlorb 587369e7a6 Merge pull request #152 from mlorb/ml_sci_428 
fixes responsiveness on mobile phone for sample view [SCI-428]
 2016-09-15 12:11:48 +02:00
zmagod 0a2ab57e28 styled new comments layout 2016-09-15 11:45:51 +02:00
zmagod e3ae22763e removed comments tab in protocol step 2016-09-15 08:46:14 +02:00
mlorb 098e17c0d8 Merge pull request #149 from mlorb/ml_sci_420 
fixes links and missing experiment level in search results [SCI-420]
 2016-09-14 15:42:16 +02:00
Zmago Devetak d0a180a1e8 Merge pull request #148 from ZmagoD/zd_SCI_342 
fixes sidebar expanded elements when adding new experiments
 2016-09-14 13:48:34 +02:00
Mojca Lorber a9029e0928 fixes responsiveness on mobile phone for sample view 2016-09-14 11:08:40 +02:00
Mojca Lorber 36378d03e2 fixes links and missing experiment level in search results 2016-09-13 17:13:58 +02:00
Zmago Devetak b26bf7b183 Merge pull request #136 from ZmagoD/zd_SCI_370 
Enabled to delete results in task archive [fixes SCI-370]
 2016-09-13 15:22:08 +02:00
zmagod 691ae94d2c enabled to delete results in task archive [fixes SCI-370] 2016-09-13 13:26:04 +02:00
zmagod 65383f1824 fixes sidebar expanded elements when adding new experiments [fixes SCI-342] 2016-09-13 13:09:57 +02:00
Pavel Maslov 15ea8fc0dc Bug fixed: comments in results have no error message if the text exceeds 1000 characters. 2016-09-13 12:01:56 +02:00
Zmago Devetak d37c7b853b Merge pull request #140 from ZmagoD/zd_SCI_341 
adds label to current project in clone experiment modal [fixes SCI-341]
 2016-09-13 11:59:01 +02:00
Jure Grabnar 6519e8dbb1 Add e-notation preprocessing to formulas 
SCI-350 #close
 2016-09-13 09:46:22 +02:00
Jure Grabnar fa3515d2eb Add formulas to reports 2016-09-13 09:46:21 +02:00
Jure Grabnar 3b364be70b Add formulas to steps tables 2016-09-13 09:44:17 +02:00
Jure Grabnar e096f936f9 Add formulas to results 2016-09-13 09:44:17 +02:00
Zmago Devetak 1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
mlorb f4029a04fd Merge pull request #142 from mlorb/ml_sci_415 
fixes navbar size when resizing window [SCI-415]
 2016-09-08 12:46:36 +02:00
Mojca Lorber 302a777615 fixes button collision 2016-09-08 12:37:06 +02:00
Luka Murn 0c1759c15a Merge pull request #135 from Ducz0r/lm-sci-397 
Resize archived experiment panels
 2016-09-07 11:14:53 +02:00
zmagod d482dff2e6 adds label to current project in clone experiment modal [fixes SCI-341] 2016-09-07 08:26:36 +02:00
Matej Zrimšek b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +02:00
zmagod b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod 9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
zmagod de6c03a73b setup experiment modal input validation 2016-09-06 11:44:03 +02:00
Zmago Devetak 9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
Luka Murn bda5120548 Resize archived experiment panels 
Closes SCI-397.
 2016-09-06 10:55:05 +02:00
Mojca Lorber 47983812e7 minimize buttons on mobile phone 2016-09-06 10:10:49 +02:00
Luka Murn 81883911c4 Merge pull request #132 from Ducz0r/lm-sci-228 
Updates to invite users to team modal window
 2016-09-05 15:53:15 +02:00
mlorb aea288371f Merge pull request #129 from mlorb/ml_sci_310 
adds tasks, experiment and project category in protocol search results [SCI-310]
 2016-09-05 15:31:35 +02:00
Mojca Lorber 6a802e9fa7 fixes redirection to project page for all categories in search results 2016-09-05 11:40:49 +02:00
Mojca Lorber 740392c687 optimization 2016-09-05 10:58:37 +02:00
zmagod 667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
Zmago Devetak ea26a532e4 Merge pull request #126 from ZmagoD/zd_SCI_332 
By default all experiments should be collapsed
 2016-09-02 15:58:03 +02:00
Mojca Lorber 83034f705d adds tasks, experiment and project category in protocol search results 2016-09-02 11:45:54 +02:00
Luka Murn 61f4fbd1d4 Remove warning info when removing pending user from organization 2016-09-01 13:23:53 +02:00
zmagod ac7ac95da8 [fixes SCI-332] 2016-09-01 10:38:20 +02:00
zmagod e8f971829a added project to session storage 2016-08-31 15:13:17 +02:00
zmagod eb394ce209 fixes searching tables bug [fixes SCI-402] 2016-08-31 11:01:10 +02:00
zmagod b05c3df4d3 adds toggle id only to elements with modules 2016-08-31 10:25:40 +02:00
zmagod eb39eedfdf [fixes SCI-398] again 2016-08-31 08:46:51 +02:00
Zmago Devetak 375a72db18 Merge pull request #114 from ZmagoD/zd_SCI_294_vol2 
fixes reports file name [fixes SCI-294]
 2016-08-30 14:59:07 +02:00
Mojca Lorber 43c3a0bb81 fixes merge again 2016-08-30 12:54:08 +02:00
Mojca Lorber 81f9e59dcd fixes merge 2016-08-30 12:14:15 +02:00
Mojca Lorber e8d187b5f6 Merge branch 'ml_sci_395' 
Conflicts:
	app/views/canvas/edit/modal/_move_module.html.erb
	app/views/canvas/edit/modal/_move_module_group.html.erb
 2016-08-30 11:41:25 +02:00
zmagod f356acb882 fixes reports file name [fixes SCI-294] 2016-08-30 11:36:39 +02:00
Zmago Devetak 6878adda46 Merge pull request #112 from ZmagoD/zd_SCI_338_vol2 
Tutorial
 2016-08-30 11:07:51 +02:00
jbargu fa357dd54f Merge pull request #110 from jbargu/jg_SCI_328_move_task_no_experiment 
Remove move on empty experiments
 2016-08-30 11:06:16 +02:00
Mojca Lorber 596d403d5f change position of buttons 2016-08-30 09:16:53 +02:00
zmagod 5518d1cd1e fixed 16 step of tutorial 2016-08-30 08:52:44 +02:00
Jure Grabnar 0c184dcdcf Remove Move button on empty experiments 
SCI-328 #close.
 2016-08-30 08:26:59 +02:00
zmagod 2ac20d1af1 adds new image + new panel title [fixes SCI-336] 2016-08-29 09:28:29 +02:00
Luka Murn a0311970f8 Add missing commits for showing image and not able to preview 2016-08-26 16:49:32 +02:00
zmagod d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
 2016-08-26 11:13:40 +02:00
Zmago Devetak 0cfc758f43 Merge pull request #102 from ZmagoD/zd_SCI_336 
implement first time popup logic
 2016-08-26 09:19:36 +02:00
zmagod 2031c42920 fixed confirmation text 2016-08-26 09:13:45 +02:00
zmagod 1738ca66d2 one-time introductory popup [fixes SCI-336] 2016-08-25 18:44:21 +02:00
Luka Murn 8018cff02e Merge pull request #103 from Ducz0r/bb_edit_delete_comments 
Edit&delete comments
 2016-08-25 17:18:48 +02:00
Zmago Devetak 1b21e55fea Merge pull request #100 from ZmagoD/zd_SCI_381 
Adds experiment and team to tag search resuls [fixes SCI-381]
 2016-08-25 15:43:50 +02:00
zmagod 8ff645fb89 disabled experiment dropdown actions 2016-08-25 15:16:51 +02:00
Zmago Devetak b090fd8d5b Merge pull request #95 from ZmagoD/zd_SCI_374 
adds edit workflow link if no workflow [fixes SCI-374]
 2016-08-25 14:07:33 +02:00
Luka Murn 6d86a02d7c Add individual permission checks in dropdowns 
Closes SCI-258.
 2016-08-25 13:51:50 +02:00
Luka Murn 24dd25d9f5 Add edit/delete result comment functionality 
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
 2016-08-25 13:51:31 +02:00
Luka Murn bac0455435 Add edit&delete functionality to step comments 
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
 2016-08-25 13:51:31 +02:00
Luka Murn c92d016f65 Add edit&delete module/task comments functionality 
This required a minor fix of comments.js.
 2016-08-25 13:51:31 +02:00
Luka Murn f0d9cb96fa Add edit project comments functionality 2016-08-25 13:51:30 +02:00
Luka Murn 15c0baeee8 Add delete project comment functionality 
This commit also removes the old code from @bberic.
 2016-08-25 13:51:30 +02:00
Luka Murn 5569a1e6d2 Revert 2 files that contained no changes 2016-08-25 13:51:30 +02:00
scibb a76d82d188 delete and edit comments for projects, protocols, results, and workflow elements 2016-08-25 13:51:30 +02:00
zmagod 5fabe06b8d implement first time popup logic 2016-08-25 11:44:49 +02:00
Mojca Lorber 4a5d720724 change position of overview and samples 2016-08-25 11:19:53 +02:00
zmagod 1120ef1407 adds experiment and team to tag search resuls [fixes SCI-381] 2016-08-25 10:40:03 +02:00
mlorb c38a4e2614 Merge pull request #94 from mlorb/ml_sci_375 
add move experiment instructions [SCI-375]
 2016-08-25 09:45:16 +02:00
mlorb 0a066f436f Merge pull request #96 from mlorb/ml_sci_369 
buttons update on experiment overview [SCI-369]
 2016-08-25 08:54:16 +02:00
zmagod dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Mojca Lorber 2a897432e1 update buttons on canvas view 2016-08-24 17:00:27 +02:00
jbargu 5c104ac050 Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error 
Fix 404 move experiment error
 2016-08-24 16:35:29 +02:00
Zmago Devetak 0de7ea31ea Merge pull request #90 from ZmagoD/zd_SCI_376 
fixes cloned experiment protocol [fixes SCI-376]
 2016-08-24 14:12:19 +02:00
zmagod 9393a96302 adds edit workflow link if no workflow [fixes SCI-374] 2016-08-24 14:10:50 +02:00
Mojca Lorber 0558d49e26 buttons update on experiment overview 2016-08-24 13:50:25 +02:00
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
Mojca Lorber f554dc6018 add move experiment instructions 2016-08-24 11:36:50 +02:00
Jure Grabnar 3e5e9aed22 Fix 404 on move experiment 
[fixes SCI-378]
 2016-08-24 11:09:03 +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 a41d851830 Fix secondary navigation for experiment level (overview) 2016-08-24 08:54:02 +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
zmagod 0429816154 deleted commented code 2016-08-23 16:21:11 +02:00
zmagod 2bbb439745 fixes cloned experiment protocol [fixes SCI-376] 2016-08-23 16:15:45 +02:00
Jure Grabnar 0d56cea3e4 Add placeholders for empty experiments 2016-08-23 10:37:48 +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 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