Skip to content

merge from develop 2.0 for release #1345

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

Merged
merged 50 commits into from
Jun 6, 2015
Merged

merge from develop 2.0 for release #1345

merged 50 commits into from
Jun 6, 2015

Conversation

fehguy
Copy link
Contributor

@fehguy fehguy commented Jun 6, 2015

No description provided.

Nara Kasbergen and others added 30 commits May 14, 2015 15:36
Addresses #1021 mostly by adding label tags, generating unique element
ids as needed.

In the process, moved the label text that gets set in the
___ContentTypeView.js files to the respective handlebar templates; the
text was static as far as I could tell.

There are additional minor 508 improvements that can be made with the
tables (scope tags, header attributes)
when translate word, trim the word first, in case the word doesn't match the key of wordsMap.
fehguy added a commit that referenced this pull request Jun 6, 2015
merge from develop 2.0 for release
@fehguy fehguy merged commit 1f73415 into master Jun 6, 2015
vincent-zurczak pushed a commit to roboconf/swagger-ui that referenced this pull request Aug 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants