Skip to content

v0.6.0 #752

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.

Sign up for GitHub

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

Jump to bottom
Merged
hackerwins merged 98 commits into from
Nov 30, 2014
Merged

v0.6.0 #752

hackerwins merged 98 commits into from
Nov 30, 2014

Conversation

@hackerwins
Copy link
Member

@hackerwins hackerwins commented Nov 29, 2014

Update version.

feryardiant and others added 30 commits October 5, 2014 16:02
@feryardiant
change tplImageDialog 'h5' to 'label'
b34965a
@feryardiant
make <small> inside of <label> on 'tplVideoDialog'
9ca5cf2
@feryardiant
Overwrite <form> margin bottom on TWBS 2.3.2
6165f14
@feryardiant
Remove button's icon-* classes, because can cause conflict with fa-* …
b7b8920 
…when using TWBS 2.*
@feryardiant
put .row-fluid and .form-group in same element
b6e30a7
@feryardiant
Rebuild dist
f4e11f2
@feryardiant
Remove travis branch limit
7b1d408
@feryardiant
Remove bs2 test from index.html
7a83ff4
@lqez
Merge pull request #647 from feryardiant/develop-patched
a28afdc 
Develop patch
@feryardiant
Add TWBS3 responsive col-* for help dialog
f7b6618
Add Arabic translations for "undo" and "redo".
ab9339c
@hackerwins
Merge pull request #658 from Rev3rse/patch-1
1db0764 
Add Arabic translations for "undo" and "redo".
@easylogic
add simple plugin system
b5dd2e4
@easylogic
add simple plugin system
26883dd
@littlebigbot
Changed regex that matches youtube videos
deec066
@littlebigbot
Added dist files
6a8d8b8
@alipov
Adding hebrew lang.
71c2f99
@hackerwins
Merge pull request #665 from alipov/hebrew-lang
2d487a1 
Hebrew translation
@hackerwins
Merge pull request #664 from littlebigbot/youtube-matching
47349a9 
Fixed Youtube Regex
@littlebigbot
Added shortcuts setting that will be either true or false
958f1c1
@littlebigbot
Only enable shortcuts if the option is set to true
5f89de7
@littlebigbot
added dist files
2a31014
@dfisch
Added onsubmit callback
e1923a3
@ekavando
Update summernote-tr-TR.js
e256b3d
@hackerwins
Merge pull request #671 from eka7a/develop
e5dd36c 
Update summernote-tr-TR.js
Embed youtube with wmode as to prevent showing toolbar dialogs beneat…
3a7014a 
…h videos
@hackerwins
Merge branch 'develop' of github.com:easylogic/summernote into easylo…
5e11f2f 
…gic-develop

Conflicts:
	dist/summernote.js
	dist/summernote.min.js
@hackerwins
Merge branch 'easylogic-develop' into develop
b400cb3
@hackerwins
Merge branch 'develop' into youtube-as-opaque
36d9ed8 
Conflicts:
	dist/summernote.js
@hackerwins
Merge pull request #678 from HackerWins/youtube-as-opaque
a3b5a2d 
Embed youtube with wmode as opaque
jacobbroberg and others added 28 commits November 16, 2014 20:12
@jacobbroberg
Update da-DK language
eed9ff3 
- Moved da-DK video and fontstyle to ext files
- Prepared for #718 (Limit the size of image uploading) language texts
- Minor spell fix
maximumImageFileSize should be null for backward compatibility
dfee188
Fix wrong option name
b30ef02
Pass message to custom error handler
9148d00
@lqez
Merge pull request #718 from HackerWins/limit-filereader-size
b7fee76 
Limit filereader size
@hackerwins
Merge pull request #719 from AgileLeanWorks/update_da-DK_language
ce8eb26 
Update da-DK language
@shaunsantacruz
add placeholder text
a366774
@shaunsantacruz
change placeholder to opt in
fb4de6f
@shaunsantacruz
keep placeholder on :focus
7ad2c72
@shaunsantacruz
lighten placeholder text color
d5547a1
@matheusrrocha
add missing attribute in pt-BR lang file
f356264
@lqez
Merge pull request #734 from matheusrrocha/develop
08bad59 
add missing  attribute in pt-BR lang file
Replace keyup event with input event even it works on pasting text vi…
f7f0e06 
…a context menu
@hackerwins
Move video lang.
21509a1
@hackerwins
Move fontstyle lang.
b5f84af
Drop settings width of fullscreen editor with callback
5fb7782
@dandv
Improve English some more
775c64d
@hackerwins
Merge pull request #747 from dandv/patch-1
c13e500 
Improve English some more
@dandv
Integration with Meteor.js, http://meteor.com
d16a8cb
@hackerwins
Merge pull request #748 from dandv/meteor-integration
dd0cb69 
Integration with Meteor.js, http://meteor.com
@hackerwins
Fix #606(Added link appears below editable area).
7adaf45
@hackerwins
Merge pull request #744 from HackerWins/fullscreen-without-modifying-…
2ffc023 
…width

Drop settings width of fullscreen editor with callback
@hackerwins
Merge pull request #723 from alpacalips/feature/placeholder
278e5ab 
Placeholder text
@hackerwins
Also hide when focused.
88ac19a
@hackerwins
Update version v0.6.0.
65c1e20
@hackerwins
Merge branch 'master' into develop
d020831 
Conflicts:
	dist/summernote.js
	dist/summernote.min.js
@dandv
Improve Meteor packaging scripts
97c1df2
@hackerwins
Merge pull request #755 from MeteorPackaging/meteor-integration
173a54f 
Improve Meteor packaging scripts
hackerwins added a commit that referenced this pull request Nov 30, 2014
@hackerwins
Merge pull request #752 from HackerWins/develop
79b50f5 
v0.6.0
@hackerwins hackerwins merged commit 79b50f5 into master Nov 30, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.