scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 15:33:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
667 commits 43 branches 185 tags 169 MiB
Commit graph

230 commits

Author SHA1 Message Date
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