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

Mosaico v0.17 update #48

Merged
merged 147 commits into from
Sep 1, 2018
Merged
Changes from 1 commit
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
e9e7be7
More conditions for scrollfix.js
bago Nov 6, 2017
c2dcba3
Dependency updates + ko 3.4.2 compatibility
bago Nov 8, 2017
0ef3aa1
Modified README with link to ASP.NET Core backend
gordon-matt Nov 22, 2017
f247808
Modified README with link to ASP.NET MVC 5 backend
gordon-matt Dec 21, 2017
920a0ca
Revert ko-reactor to 1.3.9 + Embed ko-undomanager and ko-wrap
bago Feb 6, 2018
8a3829a
Move away from bower. Switch to plain npm
bago Feb 6, 2018
9f05dff
Move away from bower. Switch to plain npm
bago Feb 6, 2018
b3caa15
Added reference to Rails engine
denics Feb 14, 2018
53707a7
Merge pull request #412 from denics/patch-1
bago Feb 14, 2018
135a10a
Force jquery-ui 1.11 because of jquery-ui 1.12 not being compatible
bago Feb 23, 2018
be67120
Fix specs according to bower removal refactoring
bago Feb 23, 2018
6b266a2
Fixes for bower removal
bago Feb 23, 2018
8a84c81
Minor change trying to debug a weird issue with npm on CI tools
bago Feb 23, 2018
07a278d
Update dev dependencies
bago Feb 23, 2018
dd8b98a
Fix travis declaration (we don't support node 5, but we support node …
bago Feb 23, 2018
e84f042
Use jquery3+jquery migrate instead of jquery 1.12 (security issues)
bago Feb 23, 2018
d3731f7
Forgot a change in the jquery 3 upgrade
bago Feb 23, 2018
16c5952
Depdendencies update (ko 3.4.2, reactor 1.4.0, ko-sortable 1.0.0)
bago Feb 23, 2018
77a31e0
Merge branch 'master' into master
bago Feb 23, 2018
25d6954
Added link to ASP.NET Core backend to README
bago Feb 23, 2018
e868df2
Updated jasmine to 3.0.0 + added grunt clean task
bago Feb 23, 2018
69c9f1d
Basic wrapper/undomanager spec
bago Feb 23, 2018
0f74f07
Replace knockout-wrap with a simple adhoc function
bago Feb 23, 2018
41bbcb6
grunt-contrib-clean is a dev dependency, not a runtime dependency
bago Feb 26, 2018
93b7d39
build fixes + package-lock update
bago Feb 26, 2018
08591d0
Update versafix to 1.1.16 release from the versafix-template project
bago Feb 28, 2018
80d8366
Move to official evol-colorpicker npm (new releases merged our PR, so…
bago Feb 28, 2018
9a5a967
Added community links to README
bago Feb 28, 2018
f50dce0
Reduce logging + Prepare 0.17 release
bago Feb 28, 2018
6d92444
Logging improvements
bago Feb 28, 2018
7c03070
Switch back from console.debug to console.log
bago Feb 28, 2018
0e1441a
Add license banner + Grunt compress task to make the binary release a…
bago Feb 28, 2018
9de157f
Show debug where console.debug is available, otherwise mute it.
bago Feb 28, 2018
56df38c
Automatically inject package version number in the code during the build
bago Feb 28, 2018
6ae1e1d
Added grunt release task
bago Feb 28, 2018
54e1e76
Testing grunt release plugin
bago Feb 28, 2018
30d199d
release 0.17.0
bago Feb 28, 2018
0cf5342
Explicit bin naming for the release assets
bago Feb 28, 2018
cf4b5a4
New license_check grunt goal + new dist goal.
bago Mar 6, 2018
f912dae
Fixes with test popup prompt
bago Mar 6, 2018
f3158d7
Minor fixes for package.json
bago Mar 6, 2018
cea294f
Minor fixes to grunt release and lib minification size
bago Mar 6, 2018
0aa0df9
Merge external dependencies to a single js+css file
bago Mar 6, 2018
a11333b
Make "dist" folder more comprehensive
bago Mar 6, 2018
3c5bc47
Moved index/editor.html to src folder
bago Mar 6, 2018
f6cb2f0
use passive events by default + sourcemaps for dependencies bundle
bago Mar 7, 2018
5f43b24
wysiwyg/tinymce: add debug option + default to "br" newlines on short…
bago Mar 7, 2018
fffd539
Rename droppable binding to avoid name clash
bago Mar 8, 2018
59a60fb
Fast fail on unsupported jqueryui version
bago Mar 8, 2018
079d81b
we now supprot latest ko-sortable (bump devdependencies)
bago Mar 8, 2018
38936bf
Attempt to catch some tinymce exceptions
bago Mar 8, 2018
f0b662c
DOWNGRADE tinymce to 4.5.8 + Fix for ko-sortable 1.1.0 support
bago Mar 8, 2018
e73d150
Update README.md
bago Mar 9, 2018
9e27542
Fix order for deps being bundled
bago Mar 9, 2018
959b2cf
Merge branch 'master' of github.com:voidlabs/mosaico
bago Mar 9, 2018
e188979
Support quoted strings in template language declarations
bago Mar 9, 2018
47f0761
revert test changes
bago Mar 9, 2018
b834a71
deal with both JSON and JS for the data parameter during startup
bago Mar 11, 2018
83fad54
avoid use deprecated properties to detect webkit
bago Mar 11, 2018
71857c3
use debug for expected exceptions
bago Mar 11, 2018
311ad6c
trim options key/labels for select widget
bago Mar 11, 2018
2c228fe
Missing localization string for gallery paginator
bago Mar 11, 2018
ee4f0ff
placeholder for pt_BR lang
bago Mar 11, 2018
4096327
Update mosaico-nl.json (POEditor.com)
bago Mar 11, 2018
b17f69d
Update mosaico-en.json (POEditor.com)
bago Mar 11, 2018
1cecbf0
Update mosaico-fr.json (POEditor.com)
bago Mar 11, 2018
ad1f2fc
Update mosaico-de.json (POEditor.com)
bago Mar 11, 2018
e164ea8
Update mosaico-it.json (POEditor.com)
bago Mar 11, 2018
eb56a85
Update mosaico-ru.json (POEditor.com)
bago Mar 11, 2018
fb6c6fb
Update mosaico-sr_RS.json (POEditor.com)
bago Mar 11, 2018
d4c5271
Update mosaico-es.json (POEditor.com)
bago Mar 11, 2018
c62478c
Update mosaico-sv.json (POEditor.com)
bago Mar 11, 2018
4a5db6e
Update mosaico-pt_BR.json (POEditor.com)
bago Mar 11, 2018
3fa915c
Some 3rd party CI conf (appveyor + circleci)
bago Mar 11, 2018
e3f711a
Trim option keys while dealing with variants
bago Mar 11, 2018
ba2b851
Cleanup
bago Mar 11, 2018
a1bd360
Update versafix-1 parsing test + basic variant test
bago Mar 11, 2018
6815447
Coverage test with travisCI
bago Mar 11, 2018
3053ba9
Testing with travis and codecov
bago Mar 11, 2018
8268d14
Docs refactoring
bago Mar 12, 2018
9c3fbd3
"dist" is better than "bin"
bago Mar 12, 2018
1617ccb
release 0.17.1
bago Mar 12, 2018
48b516f
Revert build optimization to keep npm3 compatibility
bago Mar 19, 2018
5db26e7
Minor style fixes (sync upstream)
bago Mar 19, 2018
81fc4e4
tinymce binding improvements
bago Mar 20, 2018
8cbaf7e
Merge branch 'master' of github.com:voidlabs/mosaico
bago Mar 20, 2018
af11da0
wywisyg: more options
bago Mar 21, 2018
59a9de1
Default to inline-block for editable contents and outline them on hover
bago Mar 21, 2018
efb5c35
Added image tool to browser the gallery
bago Mar 21, 2018
9cb7c03
Update mosaico-nl.json (POEditor.com)
bago Mar 21, 2018
9a53be6
Update mosaico-en.json (POEditor.com)
bago Mar 21, 2018
a1ecee5
Update mosaico-fr.json (POEditor.com)
bago Mar 21, 2018
2c0f050
Update mosaico-de.json (POEditor.com)
bago Mar 21, 2018
657c462
Update mosaico-it.json (POEditor.com)
bago Mar 21, 2018
f306305
Update mosaico-pt_BR.json (POEditor.com)
bago Mar 21, 2018
769e81d
Update mosaico-ru.json (POEditor.com)
bago Mar 21, 2018
1e3b47b
Update mosaico-sr_RS.json (POEditor.com)
bago Mar 21, 2018
25cc062
Update mosaico-es.json (POEditor.com)
bago Mar 21, 2018
585b9c1
Update mosaico-sv.json (POEditor.com)
bago Mar 21, 2018
3538d27
trivial: package.lock was not updated according to npm3 compatibility…
bago Mar 21, 2018
3c8d0a3
Trying to prevent inline-editable to collapse when empty
bago Mar 21, 2018
87c6373
Move debug about inline editable after tinymce have initialized
bago Mar 21, 2018
e886624
extract unused bindings to their own file + extracted preloader to it…
bago Mar 21, 2018
70a694d
release 0.17.2
bago Mar 22, 2018
98f524c
Temporary workaround for #430
bago Mar 23, 2018
aab8b17
Avoid opacity "on hover" in Safari/Midori
bago Mar 23, 2018
7872f91
Refactor hover/selection effects to deal with webkit (safari) issues
bago Mar 26, 2018
3719be6
minor visual tweak for selections
bago Mar 26, 2018
70fe3e8
prevent double tooltips on image upload button (safari/edge)
bago Mar 26, 2018
d65e135
Prevent downloading resources while parsing the master template
bago Mar 26, 2018
70c1c79
Move makeEditableHover to style_mosaico.less near the makeSelectable
bago Mar 26, 2018
1b55220
Merge pull request #434 from voidlabs/safariworkaround
bago Mar 26, 2018
5b5fdfe
release 0.17.3
bago Mar 26, 2018
a8adc3a
Rename dependencies bundle to fix a tinymce issue in IE11
bago Jul 25, 2018
792dcef
Update versafix to 1.1.17
bago Jul 25, 2018
b89fab9
Add a comment about a broken option
bago Jul 25, 2018
aca726b
Update/improve dependencies
bago Jul 25, 2018
1321e6f
Prepare for 0.17.4 release / downgrade csswring to 6.0.3 to keep node…
bago Jul 25, 2018
881d673
Fix lock file for downgraded csswring
bago Jul 25, 2018
3d43955
NODE – update version
Hiswe Aug 22, 2018
dac5e93
DEPENDENCIES – update patch/minor
Hiswe Aug 22, 2018
00829fa
PRETTIER – add
Hiswe Aug 22, 2018
4e1947e
DEPENDENCIES – update and fix code
Hiswe Aug 22, 2018
1256e48
Merge remote-tracking branch 'upstream/master' into mosaico-v0.17-update
Hiswe Aug 22, 2018
40b2650
DEPENDENCIES – add back mosaico's editor's one
Hiswe Aug 23, 2018
2a75d5e
DEPENDENCIES – remove bower
Hiswe Aug 23, 2018
8a606c5
BUILD – can do again \O/
Hiswe Aug 23, 2018
6a15994
DEPENDENCIES – update
Hiswe Aug 23, 2018
d50b176
I18N – fix some
Hiswe Aug 25, 2018
9b03456
DOWNLOAD – first step of making a download without the images
Hiswe Aug 25, 2018
3b06112
ICONS – fix some
Hiswe Aug 25, 2018
b774fdc
DOWNLOAD – implement CDN images
Hiswe Aug 26, 2018
6e4ee75
ICONS – fix more
Hiswe Aug 26, 2018
523ca96
ICONS – fix some more
Hiswe Aug 26, 2018
43c2885
DEPENDENCIES – update
Hiswe Sep 1, 2018
6ef0962
DEPENDENCIES – update font-awesome
Hiswe Sep 1, 2018
f5d6414
PREVIEW – begin to add on smaller devices
Hiswe Sep 1, 2018
39f483b
PREVIEW – change icon when active
Hiswe Sep 1, 2018
274d9de
BUILD – fix tinymce plugins
Hiswe Sep 1, 2018
1ed3161
PREVIEW – fix edit zone resizing on small device
Hiswe Sep 1, 2018
ca1a846
PREVIEW – highlight current item selected
Hiswe Sep 1, 2018
512ed30
BUILD – forcing “npm install” should be obsolete: no more use of bower
Hiswe Sep 1, 2018
a5872c6
README – update
Hiswe Sep 1, 2018
0e1bac8
RELEASE – keep bin folder
Hiswe Sep 1, 2018
0b0238a
HEROKU – revert back dependencies install for installing in heroku
Hiswe Sep 1, 2018
b2fb552
HEROKU – add back gulpfile for building
Hiswe Sep 1, 2018
db23d9e
HEROKU – add back src folder
Hiswe Sep 1, 2018
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
Prev Previous commit
Next Next commit
Minor fixes to grunt release and lib minification size
bago committed Mar 6, 2018

Verified

This commit was signed with the committer’s verified signature. The key has expired.
juliusknorr Julius Knorr
commit cea294fd8e99b96081d62998cb03ce430d4f96dc
5 changes: 3 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ module.exports = function(grunt) {
fullPaths: false,
standalone: 'Mosaico'
},
transform: [['browserify-shim', {global: true}], 'uglifyify'],
transform: [['browserify-shim', {global: true}], ['uglifyify', {global: true}]],
cacheFile: 'build/main-incremental.bin',
banner: '/** \n'+
' * <%= pkg.description %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %> \n'+
@@ -290,7 +290,7 @@ module.exports = function(grunt) {
compress: {
dist: {
options: {
archive: 'release/mosaico-<%= pkg.version %>-bin.zip'
archive: 'release/<%= pkg.name %>-<%= pkg.version %>-bin.zip'
},
files: [
{ src: ['dist/**', 'templates/versafix-1/**', '*.html', 'README.md', 'NOTICE.txt', 'LICENSE', 'favicon.ico'], dest: '/' },
@@ -300,6 +300,7 @@ module.exports = function(grunt) {

release: {
options: {
additionalFiles: ['package-lock.json'],
tagName: 'v<%= version %>',
// the release 0.14.0 plugin is buggy and they are all done BEFORE the tagging, so we stick to 0.13.1 until a new proper release is done.
beforeRelease: ['clean', 'build'],