Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to jQuery library inclusion in bootstrap.vm, Mexican Spanish translation and fixes to Spanish translation #62

Merged
merged 6 commits into from
Aug 15, 2016

Conversation

morgaraf
Copy link
Contributor

Hello,

I have had problems for BBB to work in Sakai 11, and so I discovered they were due to a problem in the inclusion of the jQuery library (assumed in Sakai's library, but available in BBB's).

I have created a Mexican Spanish translation of BBB, based on the Spanish translation, so I discovered some small problems in the original translation and I fixed them.

@jfederico
Copy link
Member

The content in the bbb-tool directory was moved to the root. Can you make the adjustments to your repo so the merge can be done?

@jfederico
Copy link
Member

jfederico commented Aug 15, 2016

Also, the jquery file may be taken from:

/library/webjars/jquery/1.11.3/jquery.min.js

Which seems to have changed in sakai 11, although, it is not really required as it is loaded as part of the main page.

@morgaraf
Copy link
Contributor Author

It's true. I did not see that one before. However, if there is one in
the bigbluebutton-sakai package, wouldn't it be better to use that one?

On 15/08/16 12:17, Jesus Federico wrote:

Also, the jquery file should be taken from:

/library/webjars/jquery/1.11.3/jquery.min.js


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
https://github.com/blindsidenetworks/bbb-tool/pull/62#issuecomment-239865171,
or mute the thread
https://github.com/notifications/unsubscribe-auth/ANbrzUj1YUGIvNTmatbepcz3RF_TJUqZks5qgJ8ngaJpZM4JjzpE.

Conflicts:
	tool/src/webapp/WEB-INF/bootstrap.vm
@jfederico
Copy link
Member

No it is not. The old version must be there because it was used in previous versions. It is always better to avoid duplication. In fact all those versions will be removed.

@morgaraf
Copy link
Contributor Author

morgaraf commented Aug 15, 2016

OK Done! Do I need to do anything else? Do I have to recreate the pull request?

@jfederico jfederico merged commit 60cec80 into sakaicontrib:master Aug 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants