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

. #1

Open
wants to merge 120 commits into
base: master
Choose a base branch
from
Open

. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
fadbd89
Spanish translation for H4-H6
cantorrodista Jul 30, 2013
e19f591
es-AR translation for H4-H6
cantorrodista Jul 30, 2013
46e3d7a
Updated brazilian portuguese translation
aueda Oct 18, 2013
536ff15
Updated readme
Waxolunist Nov 21, 2013
5f32f54
Set default size if none given
Waxolunist Nov 21, 2013
de996f9
Some cleanup. Added grunt task for building. I don’t know ruby. Sorry…
Waxolunist Nov 21, 2013
8ade93c
Added bower configuration.
Waxolunist Nov 21, 2013
b1533aa
Removed unneccessary files and edited readme.
Waxolunist Nov 21, 2013
779abc1
Updated readme
Waxolunist Nov 22, 2013
c584088
Added copy task to copy src into dist
Waxolunist Nov 22, 2013
0491712
Moved grunt dependencies into devDependencies.
Waxolunist Nov 22, 2013
472e1a6
Updated tests
Waxolunist Nov 22, 2013
a1ab079
Removed color css because in this version colours are not supported.
Waxolunist Nov 22, 2013
32ea819
Build
Waxolunist Nov 22, 2013
4ef7dc9
Bumped version to 0.1.0
Waxolunist Nov 22, 2013
d49f6eb
Renamed component.json to bower.json
Waxolunist Nov 22, 2013
1d99cbf
Updated readme
Waxolunist Nov 22, 2013
e56387f
Add link to example
Waxolunist Nov 22, 2013
f64d92d
Updated readme.textile
Waxolunist Nov 22, 2013
bb62510
Merge pull request #1 from cantorrodista/master
Waxolunist Nov 22, 2013
3f4b591
Updated parser rules so that tests are working.
Waxolunist Nov 22, 2013
e6bdd93
Build to copy updated locales to dist.
Waxolunist Nov 22, 2013
61f6145
Removed default size because it was already there.
Waxolunist Nov 22, 2013
5c216c3
Added handlebars. Cleaned up code. Bumped version to 0.2.0 because its
Waxolunist Nov 22, 2013
0d851cd
Added hungarian translatiion.
Waxolunist Nov 22, 2013
1d3577e
Corrected french translation.
Waxolunist Nov 22, 2013
1ceb215
added strong, p, em to the list of allowed tags.
Waxolunist Nov 22, 2013
276ad76
Added all in one file.
Waxolunist Nov 22, 2013
a0b6059
Prepare for version 0.2.1
Waxolunist Nov 23, 2013
f0d76da
Polish translation update
dawid-drelichowski Nov 25, 2013
2a32b6b
Merge pull request #2 from dawid-drelichowski/patch-1
Waxolunist Nov 25, 2013
3568c46
v0.2.2
Waxolunist Nov 25, 2013
4eabd6b
Typo in readme fixed.
Waxolunist Nov 25, 2013
62151b8
Fixed some more translations to contain all headings.
Waxolunist Nov 25, 2013
2fcd0c8
Update readme.textile
Waxolunist Nov 29, 2013
4b133be
Update readme.textile
Waxolunist Nov 29, 2013
6ccd554
Update readme.textile
kaworu Dec 2, 2013
6760923
Merge pull request #3 from kAworu/master
Waxolunist Dec 5, 2013
646aa12
Readme updated for version 0.2.3
Waxolunist Dec 11, 2013
4b7688f
Merge branch 'master' of https://github.com/aueda/bootstrap-wysihtml5
Waxolunist Dec 11, 2013
e0ce572
Build version 0.2.3
Waxolunist Dec 11, 2013
7f429be
Added blockquote button to toolbar
Waxolunist Dec 13, 2013
8572ceb
2 new data attributes
Waxolunist Dec 13, 2013
7789180
2 new data attributes
Waxolunist Dec 13, 2013
8d774c5
build 0.2.4
Waxolunist Dec 13, 2013
42c4d57
Updated chinese and taiwan locales
Waxolunist Dec 13, 2013
cb80dbf
Documentation updated, resolves #6.
Waxolunist Dec 16, 2013
35ccfd9
Documentation for l10n updated.
Waxolunist Dec 16, 2013
435cd52
Updated german translation
Waxolunist Dec 17, 2013
f8bfcbb
Provide english locale as fallback. Close #8
Waxolunist Dec 17, 2013
afb157b
v0.2.5
Waxolunist Dec 17, 2013
fff3714
Update readme for v0.2.5
Waxolunist Dec 17, 2013
6cbcc49
Updated readme
Waxolunist Dec 17, 2013
a6b9160
Add concat tasks for concat commands.
Waxolunist Dec 19, 2013
2b3e613
Update readme
Waxolunist Dec 19, 2013
1d43738
Changre div to p - fixes #21
Waxolunist Dec 19, 2013
21b5312
Code clean up (wysihtml5 instead of wysi).
Waxolunist Dec 19, 2013
0b2eb17
Add button for small - see #19
Waxolunist Dec 19, 2013
6612b50
Add translation for small to english: #19
Waxolunist Dec 19, 2013
c63b60c
Update index-dev.html to use the new commands file.
Waxolunist Dec 19, 2013
d24440d
Provide fallbackstrings from english translations. fixes #24
Waxolunist Dec 19, 2013
a29dec0
Shortcuts get not overriden, they get merged with the default ones. T…
Waxolunist Dec 20, 2013
f576d53
Version 0.2.6
Waxolunist Dec 20, 2013
d5b2e68
Updated Updated brazilian portuguese translation.
aueda Dec 31, 2013
2e14d74
Updated French translation
siamkreative Jan 15, 2014
07ec5e6
Updates handlebars from 1.1.2 to 1.3.0
koppor Jan 15, 2014
d724708
Updates bootstrap from 3.0.0 to 3.0.2
koppor Jan 15, 2014
fe4b46f
Sets version to 0.2.7
koppor Jan 15, 2014
493fc0c
Merge pull request #26 from aueda/master
Waxolunist Jan 16, 2014
a014917
Merge pull request #27 from ThemeAvenue/master
Waxolunist Jan 16, 2014
d2d00b5
Merge branch 'master' of github.com:koppor/bootstrap3-wysihtml5-bower
Waxolunist Jan 16, 2014
1d5deee
Updated Bootstrap to 3.0.3
Waxolunist Jan 16, 2014
551cad0
Build for version 0.2.7
Waxolunist Jan 16, 2014
802e367
Updated french translation, change was made in dist instead of src
Waxolunist Jan 16, 2014
bb43c7f
Add test with multiple editors.
Waxolunist Feb 7, 2014
f956f54
fixes #30
Waxolunist Feb 7, 2014
938cf7e
Build for 0.2.8-alpha
Waxolunist Feb 8, 2014
f523929
fixes #32
Waxolunist Feb 11, 2014
f71a265
build v0.2.8
Waxolunist Feb 11, 2014
9e086e8
start new milestone 0.2.9
Waxolunist Feb 11, 2014
0877b65
Create bootstrap-wysihtml5.il-HE.js
SixSatori Feb 16, 2014
0c3f22c
Merge branch 'patch-1' of https://github.com/SixSatori/bootstrap3-wys…
Waxolunist Feb 17, 2014
5700771
build v0.2.9-alpha.1
Waxolunist Feb 17, 2014
98c0d87
Started new version v0.2.9-alpha.1
Waxolunist Feb 17, 2014
d6188ae
Added load event to example
Waxolunist Feb 20, 2014
45923a1
Added missing strings in es-ES, es-AR
Feb 23, 2014
619fb18
Merge pull request #38 from cheiff/master
Waxolunist Feb 23, 2014
420af57
backport of fix #39
Waxolunist Feb 28, 2014
7b74c45
custom templates example
Waxolunist Feb 28, 2014
312ae91
Merge branch 'master' of github.com:Waxolunist/bootstrap3-wysihtml5-b…
Waxolunist Feb 28, 2014
ed59b2f
Release 0.2.9
Waxolunist Feb 28, 2014
3736707
prepare v0.2.10
Waxolunist Feb 28, 2014
7e7ce6b
Corrected indention in readme
Waxolunist Feb 28, 2014
036694a
Updated readme with version from v0.3.0-wip
Waxolunist Mar 6, 2014
a2ddb09
Fixed issue #42
Waxolunist Mar 11, 2014
b212375
Pushing v0.2.10-alpha.1
Waxolunist Mar 11, 2014
2b15cd8
Preparing next alpha
Waxolunist Mar 11, 2014
7ebfd8e
Fixed version of jquery to be lower than 2.1.0
Waxolunist Apr 30, 2014
9137d7f
Updated readme
Waxolunist Apr 30, 2014
e304dd5
change readme to markdown
Waxolunist May 4, 2014
9e555b5
Add redme in md format
Waxolunist May 4, 2014
f946bde
Spanish language fixed: added string for small button (es_ES & es_AR)
May 19, 2014
c593331
Merge pull request #49 from jmlweb/master
Waxolunist May 20, 2014
00e468c
Resolved #43
Waxolunist Jun 11, 2014
6f59136
Release v0.2.10
Waxolunist Jun 11, 2014
876c9d1
Started new wip
Waxolunist Jun 11, 2014
aa95f44
Added section in README for font awesome
Waxolunist Jun 11, 2014
074a311
Updated grunt contribs
Waxolunist Jun 17, 2014
8c64497
Fixed #56
Waxolunist Jun 17, 2014
4519d63
Fixes #60
Waxolunist Jun 22, 2014
f2b63c3
Added bower update and npm update to build
Waxolunist Jun 22, 2014
62589e9
Release v0.2.11
Waxolunist Jun 22, 2014
4e9f4db
Updated links to issues
Waxolunist Jun 23, 2014
889faa9
Updated README.md
Waxolunist Jun 23, 2014
85a367d
Updated version number
Waxolunist Jun 24, 2014
0c575e7
NPM dev list was contrib-clean missing
Waxolunist Sep 8, 2014
dfa433f
Prepare release 0.3.3
Waxolunist Sep 8, 2014
6f8717c
fixed error in android chrome
Nov 5, 2014
ec71ec7
Update README.md
Waxolunist Apr 20, 2015
af85703
Merge pull request #104 from jguffey/master
Waxolunist Jul 2, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "components"
}
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.DS_Store
.c9revisions
/*.project
node_modules
components
3 changes: 0 additions & 3 deletions .settings/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions Gemfile

This file was deleted.

21 changes: 0 additions & 21 deletions Gemfile.lock

This file was deleted.

111 changes: 111 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
module.exports = function(grunt) {

grunt.registerTask('bowerupdate', 'update the frontend dependencies', function() {
var exec = require('child_process').exec;
var cb = this.async();
exec('bower update', {cwd: '.'}, function(err, stdout, stderr) {
console.log(stdout);
cb();
});
});

grunt.registerTask('npmupdate', 'update the development dependencies', function() {
var exec = require('child_process').exec;
var cb = this.async();
exec('npm update', {cwd: '.'}, function(err, stdout, stderr) {
console.log(stdout);
cb();
});
});

// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
handlebars: {
compile: {
options: {
namespace: 'wysihtml5.tpl',
processName: function(filePath) {
return filePath.split('/')[2].split('.')[0];
},
node: true
},
files: {
'src/generated/templates.js': ['src/templates/*.hbs']
}
}
},
uglify: {
options: {
banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
compress: {
drop_console: true
}
},
build: {
files: {
'dist/bootstrap3-wysihtml5.min.js': [
'src/generated/templates.js',
'src/bootstrap3-wysihtml5.js',
'src/generated/commands.js',
'src/locales/bootstrap-wysihtml5.en-US.js'
],
'dist/bootstrap3-wysihtml5.all.min.js': [
'components/wysihtml5/dist/wysihtml5-0.3.0.min.js',
'components/handlebars/handlebars.runtime.min.js',
'src/generated/templates.js',
'src/bootstrap3-wysihtml5.js',
'src/generated/commands.js',
'src/locales/bootstrap-wysihtml5.en-US.js'
]
}
}
},
cssmin: {
options: {
banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
},
minify: {
files: {
'dist/bootstrap3-wysihtml5.min.css': ['src/bootstrap3-wysihtml5.css']
}
}
},
clean: {
build: ["dist"]
},
copy: {
main: {
files: [
{expand: true, cwd: 'src/', src: ['*.js'], dest: 'dist/'},
{expand: true, cwd: 'src/', src: ['*.css'], dest: 'dist/'},
{expand: true, cwd: 'src/generated', src: ['*.js'], dest: 'dist/'},
{expand: true, cwd: 'src/', src: ['locales/*.js'], dest: 'dist/'},
]
}
},
concat: {
options: {
separator: '',
},
commands: {
src: ['src/commands/small.js'],
dest: 'src/generated/commands.js',
},
}
});

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-handlebars');

// Default task(s).
grunt.registerTask('dev', ['handlebars', 'concat:commands']);
grunt.registerTask('build', ['clean:build', 'handlebars', 'concat:commands', 'uglify', 'cssmin', 'copy']);
grunt.registerTask('with-update', ['bowerupdate', 'npmupdate', 'build']);
grunt.registerTask('default', ['build']);

};
Loading