Skip to content

Commit

Permalink
[fc] Repository: mockup
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2018-08-09T15:27:43-03:00
Author: Franco Pellegrini (frapell) <frapell@gmail.com>
Commit: plone/mockup@84499a9

Do not fail if initializing with another language or external script

Files changed:
M CHANGES.rst
M mockup/patterns/tinymce/pattern.js
Repository: mockup

Branch: refs/heads/master
Date: 2018-09-14T11:55:58-03:00
Author: Franco Pellegrini (frapell) <frapell@gmail.com>
Commit: plone/mockup@ad707d5

Serve content.min.css with karma tests suite

Files changed:
M mockup/js/grunt.js
M mockup/patterns/tinymce/pattern.js
Repository: mockup

Branch: refs/heads/master
Date: 2018-09-14T11:56:25-03:00
Author: Franco Pellegrini (frapell) <frapell@gmail.com>
Commit: plone/mockup@9ac8508

Fix tinymce and mimetypeselector tests

Files changed:
M mockup/tests/pattern-textareamimetypeselector-test.js
M mockup/tests/pattern-tinymce-test.js
Repository: mockup

Branch: refs/heads/master
Date: 2018-09-18T10:47:55-03:00
Author: Franco Pellegrini (frapell) <frapell@gmail.com>
Commit: plone/mockup@8a34ef6

Merge branch 'master' into frapell-tinymce

Files changed:
A package-lock.json
M CHANGES.rst
M bower.json
M mockup/patterns/thememapper/pattern.js
M mockup/patterns/tinymce/js/links.js
M mockup/tests/pattern-tinymce-test.js
Repository: mockup

Branch: refs/heads/master
Date: 2018-09-18T18:59:14+02:00
Author: Sune Broendum Woeller (sunew) <sune@woeller.dk>
Commit: plone/mockup@04220cb

Merge pull request #861 from plone/frapell-tinymce

Do not fail if initializing with another language or external script

Files changed:
M CHANGES.rst
M mockup/js/grunt.js
M mockup/patterns/tinymce/pattern.js
M mockup/tests/pattern-textareamimetypeselector-test.js
M mockup/tests/pattern-tinymce-test.js
  • Loading branch information
sunew committed Sep 18, 2018
1 parent 2e31810 commit 3ae0fbc
Showing 1 changed file with 81 additions and 7 deletions.
88 changes: 81 additions & 7 deletions last_commit.txt

Large diffs are not rendered by default.

0 comments on commit 3ae0fbc

Please sign in to comment.