Luka Murn
|
512efd3812
|
Fix 2 lines that were too long
|
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
|
9e3bb8edb7
|
Add dependant: :destroy to comments
|
2016-08-25 13:51:30 +02:00 |
|
Luka Murn
|
8a73a3ab5c
|
Update permission_helper.rb and routes.rb
|
2016-08-25 13:51:30 +02:00 |
|
Luka Murn
|
ff9bb17912
|
Update routes.rb
|
2016-08-25 13:51:30 +02:00 |
|
Luka Murn
|
319bcc7850
|
Add permissions for comments to permission_helper.rb
|
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 |
|
mlorb
|
4c0765a47e
|
Merge pull request #101 from mlorb/ml_sci_388
change position of overview and samples [SCI-388]
|
2016-08-25 13:02:20 +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 |
|
Luka Murn
|
c082bceafc
|
Merge pull request #98 from Ducz0r/lm-sci-385
Fix bug with linked tasks
|
2016-08-25 09:29:50 +02:00 |
|
zmagod
|
f515366d91
|
fixes workflowing after updating description, fixes canvas bug
|
2016-08-25 09:11:42 +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
|
92bb3dda99
|
hide last next button
|
2016-08-25 08:46:11 +02:00 |
|
zmagod
|
dbdbff12eb
|
add experiment level tutorial step [fixes SCI-338]
|
2016-08-24 19:03:58 +02:00 |
|
Luka Murn
|
77d69b4662
|
Merge pull request #97 from mlorb/ml_sci_387
replace description in add content to report window [SCI-387]
|
2016-08-24 18:40:30 +02:00 |
|
Luka Murn
|
3dddffaa34
|
Fix bug with linked tasks
This bug was a legacy of experiment level introduction.
Closes SCI-385, SCI-366.
|
2016-08-24 17:22:16 +02:00 |
|
Mojca Lorber
|
408af14e41
|
replace description in add content to report window
|
2016-08-24 17:19:29 +02:00 |
|
mlorb
|
2d90ad1a65
|
Merge pull request #88 from mlorb/ml_sci_362
fixes tile size in edit canvas [SCI-362]
|
2016-08-24 17:07:11 +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 |
|
Mojca Lorber
|
d04df349d5
|
fixes medium and small zoom
|
2016-08-24 14:18:12 +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 |
|
jbargu
|
3997ad7114
|
Merge pull request #91 from jbargu/jg_exp_navigation_sci_352
Fix experiment navigation (sidebar and secondary navigation)
SCI-352 #close
|
2016-08-24 11:50:04 +02:00 |
|
Jure Grabnar
|
dff5abf3d9
|
Fix module moving position not being updated
|
2016-08-24 11:42:21 +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
|
a091571d9c
|
Add consistent links for archive for all entities
|
2016-08-24 09:14:29 +02:00 |
|
Jure Grabnar
|
0cdb18ffcd
|
Update experiment links on sidebar between actions
|
2016-08-24 09:05:57 +02:00 |
|
Jure Grabnar
|
a41d851830
|
Fix secondary navigation for experiment level (overview)
|
2016-08-24 08:54:02 +02:00 |
|
mlorb
|
5c8d669cac
|
Merge pull request #81 from mlorb/ml_sci_364
fixes edit experiment [SCI-364]
|
2016-08-23 16:49:20 +02:00 |
|
Zmago Devetak
|
396325bd67
|
Merge pull request #86 from ZmagoD/zd_SCI_365
changed experiment create redirection [fixes SCI-365]
|
2016-08-23 16:30:48 +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 |
|
Zmago Devetak
|
65049692ea
|
Merge pull request #78 from ZmagoD/zd_SCI_349
updating thumbnail
|
2016-08-23 16:22:07 +02:00 |
|
zmagod
|
0429816154
|
deleted commented code
|
2016-08-23 16:21:11 +02:00 |
|