scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-27 10:08:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

rename ortanizations -> teams

Browse source
This commit is contained in:
zmagod 2017-01-25 14:22:06 +01:00
parent 883a6ea544
commit afd8328e9c
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/protocols/steps.js.erb
View file

@ -185,12 +185,8 @@ function formCallback($form) {
setTimeout(function() {
initStepsComments();
<<<<<<< HEAD
openLinksInNewTab();
animateSpinner(null, false);
=======
SmartAnnotation.preventPropagation('.atwho-user-popover');
>>>>>>> smart-annotations
}, 1000);
return true;
});
@ -281,12 +277,10 @@ function formNewAjax($form) {
formCallback($form);
formNewAjax($form);
applyCancelOnNew();
<<<<<<< HEAD
animateSpinner(null, false);
=======
TinyMCE.destroyAll();
SmartAnnotation.preventPropagation('.atwho-user-popover');
>>>>>>> smart-annotations
});
}

0
app/views/projects/index/_org_projects.html.erb → app/views/projects/index/_team_projects.html.erb
View file