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

update #2

Merged
merged 95 commits into from
Aug 4, 2015
Merged

update #2

merged 95 commits into from
Aug 4, 2015

Conversation

jjhesk
Copy link

@jjhesk jjhesk commented Aug 4, 2015

up

JedWatson and others added 30 commits July 8, 2015 15:57
- removed href from path again
- added virtual function href to nested schema
- removed mixed tabs spaces
- removed tabs on empty lines
Updated TinyMCE Icons (& .ie7) to correct value for BlockQuote button…
Fix for #1280 href working now on LocalFiles Type
To avoid collision of inherited models (which reuse the same _revisions historyModel as the model inherited from), check for existance of _revisions model for inherited models and skip attempt to create a new model. (Inherited _revisions model will be used.)
Correctly display html returned by format(...) function
…ildren

Added check for duplicate _revisions models.
jjhesk added a commit that referenced this pull request Aug 4, 2015
@jjhesk jjhesk merged commit dedf8a7 into ONode:master Aug 4, 2015
jjhesk pushed a commit that referenced this pull request Mar 22, 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.

5 participants