Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
This comparison is big! We’re only showing the most recent 250 commits
Commits on Feb 05, 2015
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-0.25.x' into hotfix-1.0.x 3034052
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x 6221870
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.1.x' into hotfix
Conflicts:
	pom.xml
3e12f69
@wigentics wigentics Double escape <>, so that it really works with the changelog plugin fe407f3
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-0.25.x' into hotfix-1.0.x 5100184
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x a4cdae7
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.1.x' into hotfix 164f2df
@wigentics wigentics Merge branch 'hotfix' 6f559b1
Commits on Feb 12, 2015
@rainerda rainerda Improve editing preformatted text
Add placeholders before/after the pre, if the pre is the first or the last element (or both).
5477ad9
@petrosalema petrosalema Merge pull request #1336 from rainerda/hotfix-0.25.x-SUP-142-editing-…
…preformatted-text

Improve editing preformatted text
ddae2c6
Commits on Feb 17, 2015
@rainerda rainerda Fix broken tests
Broken tests after SUP-142
(broken in 5477ad9)
31b8256
@rainerda rainerda fixed jslint errors 6152119
@wigentics wigentics Merge pull request #1339 from rainerda/hotfix-0.25.x-SUP-142-fix-sele…
…nium-tests

Fix broken tests
dcb97cd
@berni2288 berni2288 Fix inline elements not being deleted when deleting the text inside them
SUP-223
d4053f1
@petrosalema petrosalema Merge pull request #1338 from berni2288/hotfix-0.25.x-sup-223-2
Fix inline elements not being deleted when deleting the text inside them
05c82c4
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-0.25.23 b882b06
@GenticsDev GenticsDev Added generated changelog mapping b891985
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration bca370b
@wigentics wigentics Merge branch 'hotfix-0.25.x' into hotfix-1.0.x
Conflicts:
	pom.xml
	src/css/aloha.css
	src/plugins/common/format/lib/format-plugin.js
a3a242f
@wigentics wigentics Remove conflict markers af0934d
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.0.8-SNAPSHOT 7b03c17
@GenticsDev GenticsDev Added generated changelog mapping a691b1d
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration f5671c7
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x
Conflicts:
	pom.xml
245a70a
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.8 e0b9d6f
@GenticsDev GenticsDev Added generated changelog mapping f3620d1
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration f2687f8
Commits on Feb 18, 2015
@wigentics wigentics Merge branch 'hotfix-1.1.x' into hotfix a93d5c8
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.3 a3c8492
@GenticsDev GenticsDev Added generated changelog mapping be97d2d
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 0832719
@wigentics wigentics Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 0832719.
4c85da3
@wigentics wigentics Revert "Added generated changelog mapping"
This reverts commit be97d2d.
c72f53d
@wigentics wigentics Revert "[maven-release-plugin] prepare release alohaeditor-1.2.3"
This reverts commit a3c8492.
48a4c2a
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.3 04fa94e
@GenticsDev GenticsDev Added generated changelog mapping fa8a06f
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration ee28ebc
@wigentics wigentics Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit ee28ebc.
133ad8c
@wigentics wigentics Revert "Added generated changelog mapping"
This reverts commit fa8a06f.
48de519
@wigentics wigentics Revert "[maven-release-plugin] prepare release alohaeditor-1.2.3"
This reverts commit 04fa94e.
b214dd8
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.1.x' into hotfix
Conflicts:
	pom.xml
6323fa2
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.3 db5c1c8
@berni2288 berni2288 10180.SUP-223.bugfix Fix bad encoded text (changelog plugin bug?) 4a18b32
@wigentics wigentics Revert "[maven-release-plugin] prepare release alohaeditor-1.2.3"
This reverts commit db5c1c8.
70d35ac
@wigentics wigentics Merge branch 'hotfix-0.25.x' into hotfix-1.0.x 5d52b12
@wigentics wigentics Merge branch 'hotfix-1.0.x' into hotfix-1.1.x b66532f
@wigentics wigentics Merge branch 'hotfix-1.1.x' into hotfix 516bc11
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.3 239fc29
@GenticsDev GenticsDev Added generated changelog mapping ab1cc92
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration cab2e4b
@wigentics wigentics Merge branch 'hotfix' 21dec39
Commits on Feb 23, 2015
@npomaroli npomaroli Fix broken layout of aloha editor controls when page has
"direction" set to "rtl".
309463e
Commits on Feb 24, 2015
@npomaroli npomaroli Merge pull request #1343 from alohaeditor/hotfix-0.25.x-sup-66
Fix broken layout of aloha editor controls when page has
54d6716
@rainerda rainerda fixed incorrect jQuery usage 612ee61
@sebastianvogel sebastianvogel Fixed autoURL detection in IE and browser detection for IE11 3745e22
@wigentics wigentics Merge pull request #1344 from rainerda/hotfix-0.25.x-SUP-142-editing-…
…preformatted-text-addendum

fixed incorrect jQuery usage
2da31bf
@sebastianvogel sebastianvogel Fix type 7426d1b
@wigentics wigentics Merge pull request #1345 from sebastianvogel/hotfix-0.25.x-aw-945
Fixed autoURL detection in IE and browser detection for IE11
b9958eb
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-0.25.24 d6de8fc
@GenticsDev GenticsDev Added generated changelog mapping 55be8ea
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration c389302
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-0.25.x' into hotfix-1.0.x
Conflicts:
	pom.xml
cef9546
@wigentics wigentics Fix commit messages 0772dfe
@wigentics wigentics Merge branch 'hotfix-0.25.x' into hotfix-1.0.x d28b96b
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.0.9 9c43fbc
@GenticsDev GenticsDev Added generated changelog mapping ba3f718
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration a9eedb5
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x
Conflicts:
	pom.xml
e063916
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.9 3a5b063
@wigentics wigentics Revert "[maven-release-plugin] prepare release alohaeditor-1.1.9"
This reverts commit 3a5b063.
e2f04c0
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.9 9ca4d50
@GenticsDev GenticsDev Added generated changelog mapping 93b6369
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration ab12086
Commits on Feb 25, 2015
@wigentics wigentics Merge branch 'hotfix-1.1.x' into hotfix
Conflicts:
	pom.xml
6ac65b9
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.4 0a2c387
@GenticsDev GenticsDev Added generated changelog mapping c0560d2
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration bf46b2a
@wigentics wigentics Merge branch 'hotfix' 4684f1b
Commits on Mar 02, 2015
@patrickhoefer patrickhoefer Skip content rule check for aloha blocks 67a6689
Commits on Mar 03, 2015
@npomaroli npomaroli Fix delete behaviour in empty block level elements. 56c3975
@npomaroli npomaroli Merge pull request #1348 from alohaeditor/hotfix-0.25.x-SUP-64
Fix delete behaviour in empty block level elements.
d9165ff
@wigentics wigentics Fix commit messages db4d757
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-0.25.25 a773efe
@GenticsDev GenticsDev Added generated changelog mapping 6443f4e
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 80f0739
Commits on Mar 04, 2015
@npomaroli npomaroli Fix per-editable configuration of stripped elements
for the formatlesspaste plugin.
6c6ec47
@wigentics wigentics Merge branch 'hotfix-0.25.x' into hotfix-1.0.x
Conflicts:
	pom.xml
9f5b195
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.0.10 a8011e4
@GenticsDev GenticsDev Added generated changelog mapping c492a5c
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 0b2ca40
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x
Conflicts:
	pom.xml
a12cf62
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.10 d4ca6dc
@GenticsDev GenticsDev Added generated changelog mapping a968c73
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 367e9ea
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.1.x' into hotfix
Conflicts:
	pom.xml
20f8d91
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.5 57a1456
@GenticsDev GenticsDev Added generated changelog mapping e3eb417
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration a8517e5
@rainerda rainerda Configuration of align plugin documentation 0ffd2c4
Commits on Mar 05, 2015
@rainerda rainerda List button not selected
When editing a list, the corresponding list menu button was not selected.
2d22fce
@petrosalema petrosalema Merge pull request #1351 from rainerda/hotfix-1.0.x-sup-521-list-butt…
…on-not-shown

List button not selected
14642ce
Commits on Mar 06, 2015
@npomaroli npomaroli Add option to stop at specified elements when searching for
first or last visible element in a node.
f605070
@wigentics wigentics Merge pull request #1350 from rainerda/hotfix-0.25.x-sup-516-align-pl…
…ugin-documentation

Configuration of align plugin documentation
39eb1e0
@petrosalema petrosalema Merge pull request #1352 from alohaeditor/hotfix-1.0.x-sup-387
Add option to stop at specified elements when searching for
caa7829
@petrosalema petrosalema Merge pull request #1353 from alohaeditor/hotfix-0.25.x-sup-353
Fix per-editable configuration of stripped elements
812f4c7
Commits on Mar 09, 2015
@npomaroli npomaroli Fix possible javascript error in format plugin. 1369588
Commits on Mar 10, 2015
@npomaroli npomaroli Add workaround for delete behaviour in blockmanager,
when selection is in a table.
f3cccd2
@rainerda rainerda Add aloha-ui class to ui dialogs 6e32c5e
@npomaroli npomaroli Fix selection problem with editables nested in blocks. 5a4b814
@petrosalema petrosalema Merge pull request #1354 from alohaeditor/hotfix-0.25.x-sup-526
Fix possible javascript error in format plugin.
e5be68e
@petrosalema petrosalema Merge pull request #1357 from alohaeditor/hotfix-0.25.x-sup-502
Fix selection problem with editables nested in blocks.
c1c1b8f
@wigentics wigentics Merge pull request #1356 from rainerda/hotfix-0.25.x-sup-536
Add aloha-ui class to ui dialogs
8cbdc10
@petrosalema petrosalema Merge pull request #1355 from alohaeditor/hotfix-0.25.x-sup-501
Add workaround for delete behaviour in blockmanager,
ebb77e9
@patrickhoefer patrickhoefer replace global jQuery with $ f92e3e6
@wigentics wigentics Merge pull request #1347 from patrickhoefer/hotfix-1.0.x-SUP-493
Skip content rule check for aloha blocks
46fdd9e
@npomaroli npomaroli Fix check for empty tabs in toolbar. 7a7ca4a
Commits on Mar 11, 2015
@petrosalema petrosalema Merge pull request #1358 from alohaeditor/hotfix-0.25.x-sup-517
Fix check for empty tabs in toolbar.
968193f
@wigentics wigentics Merge branch 'hotfix-0.25.x' into hotfix-1.0.x c622b22
@wigentics wigentics Merge branch 'hotfix-1.0.x' into hotfix-1.1.x 1c96f24
@wigentics wigentics Merge branch 'hotfix-1.1.x' into hotfix 2e8910d
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-0.25.26 85c416a
@GenticsDev GenticsDev Added generated changelog mapping c5924a9
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration bc9f1bc
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-0.25.x' into hotfix-1.0.x
Conflicts:
	pom.xml
4bdd0f1
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.0.11 33a2f2a
@GenticsDev GenticsDev Added generated changelog mapping 5f6fa39
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 7388c1d
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x
Conflicts:
	pom.xml
8512b69
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.11 b7c5e01
@GenticsDev GenticsDev Added generated changelog mapping 58048ec
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration e201bbf
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.1.x' into hotfix
Conflicts:
	pom.xml
de5668f
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.6 1589be4
@npomaroli npomaroli Fix strange errors in old IE versions due to browser bug. c4f817a
@GenticsDev GenticsDev Added generated changelog mapping fa65815
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 3ba54d2
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix' 1cc0d33
Commits on Mar 12, 2015
@npomaroli npomaroli Fix positioning of toolbar on rtl pages with horizontal scrolling. c340536
@npomaroli npomaroli Fix bubbling of ENTER in the search field of the repository browser. 4781ad1
Commits on Mar 16, 2015
@petrosalema petrosalema Merge pull request #1361 from alohaeditor/hotfix-0.25.x-sup-58
Fix strange errors in old IE versions due to browser bug.
8007071
@petrosalema petrosalema Merge pull request #1362 from alohaeditor/hotfix-0.25.x-sup-574
Fix positioning of toolbar on rtl pages with horizontal scrolling.
cea11e1
@petrosalema petrosalema Merge pull request #1363 from alohaeditor/hotfix-1.0.x-sup-573
Fix bubbling of ENTER in the search field of the repository browser.
db38a78
@npomaroli npomaroli Add configurable sidebar fields for link plugin 95355cf
@petrosalema petrosalema Merge pull request #1364 from alohaeditor/hotfix-sup-588
Add configurable sidebar fields for link plugin
8ca9cda
Commits on Mar 17, 2015
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-0.25.x' into hotfix-1.0.x f0cb086
@wigentics wigentics Merge branch 'hotfix-1.0.x' into hotfix-1.1.x 0efecb0
@npomaroli npomaroli Fix changelog entry to be more user friendly. 9ca698c
@wigentics wigentics Merge branch 'hotfix-1.1.x' into hotfix 4f7918a
Commits on Mar 18, 2015
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-0.25.27 540bab9
@GenticsDev GenticsDev Added generated changelog mapping 90a2698
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 0536f5a
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-0.25.x' into hotfix-1.0.x
Conflicts:
	pom.xml
6d2bb6f
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.0.12 b1d7cc1
@GenticsDev GenticsDev Added generated changelog mapping 6bbd6c7
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration a276f68
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x
Conflicts:
	pom.xml
3badb99
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.12 c0f1073
@GenticsDev GenticsDev Added generated changelog mapping e5c3081
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 55a8ce3
@npomaroli npomaroli Fixed typo 3ada344
@wigentics wigentics Merge remote-tracking branch 'origin/hotfix-1.1.x' into hotfix
Conflicts:
	pom.xml
800174e
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.7 3ca903f
@GenticsDev GenticsDev Added generated changelog mapping f04de6a
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 0b511b7
@wigentics wigentics Merge branch 'hotfix' 061bbe8
Commits on Mar 20, 2015
@rainerda rainerda Table plugin: errors with forward delete
Errors in table-plugin:
* When pressing delete in a paragraph right before a link with a table after the paragraph, the cursor will jump into the first table cell.
* When pressing delete in a link in the last position before a table, the cursor will not jump into the first table cell but the table gets deleted.

Fixed detecting if the cursor should jump into the first cell of the next table on forwarddelete.
SUP-622
dc7a35e
@petrosalema petrosalema Merge pull request #1368 from rainerda/hotfix-0.25.x-sup-622
Table plugin: errors with forwarddelete
c962034
Commits on Mar 24, 2015
@npomaroli npomaroli Fix weird drag'n'drop behaviour with blocks in IE
Also fix typing in non-editable areas with IE.
faeb6b8
@Jotschi Jotschi Merge pull request #1366 from alohaeditor/hotfix-0.25.x-sup-619
Fix weird drag'n'drop behaviour with blocks in IE
984b7cb
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-0.25.28 21151a2
@GenticsDev GenticsDev Added generated changelog mapping 3cb7680
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 0ea57d7
@Jotschi Jotschi Merge branch 'hotfix-0.25.x' of github.com:alohaeditor/Aloha-Editor i…
…nto hotfix-1.0.x

Conflicts:
	pom.xml
bab743d
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.0.13 b7939a9
@GenticsDev GenticsDev Added generated changelog mapping 241b939
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 0c346ba
Commits on Mar 25, 2015
@Jotschi Jotschi Merge branch 'hotfix-1.0.x' of github.com:alohaeditor/Aloha-Editor in…
…to hotfix-1.1.x

Conflicts:
	pom.xml
331eb82
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.13 0020956
@GenticsDev GenticsDev Added generated changelog mapping fa9f391
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 8738b37
@Jotschi Jotschi Merge branch 'hotfix-1.1.x' of github.com:alohaeditor/Aloha-Editor in…
…to hotfix

Conflicts:
	pom.xml
e479799
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.8 ea9977c
@GenticsDev GenticsDev Added generated changelog mapping 0744d6d
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration ba613f8
@Jotschi Jotschi Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor a9cd241
@sebastianvogel sebastianvogel Improve text of tooltips for the buttons which increase/decrease inde…
…ntation

in lists.
0a2882a
Commits on Mar 26, 2015
@cprerovsky cprerovsky Merge pull request #1370 from sebastianvogel/hotfix-1.0.x-sup-675
Improve text of tooltips for the buttons which increase/decrease indentation in lists.
4b49799
@npomaroli npomaroli Fix cell selection eef1bdd
Commits on Mar 30, 2015
@npomaroli npomaroli Merge pull request #1371 from alohaeditor/hotfix-1.0.x-sup-503
Fix cell selection
1922d06
Commits on Mar 31, 2015
@rainerda rainerda Fixed disappearing cursor on forward-delete
After forward-deleting the last letter of a link, the cursor disappeared from the editable.
This has been fixed
30d5669
@petrosalema petrosalema Merge pull request #1373 from rainerda/hotfix-1.0.x-sup-645-cursor-di…
…sappears-on-forwarddelete

Fixed disappearing cursor on forward-delete
134363f
Commits on Apr 01, 2015
@berni2288 berni2288 Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x c440b8a
@berni2288 berni2288 Merge remote-tracking branch 'origin/hotfix-1.1.x' into hotfix 588027d
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.0.14 3e2e937
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.14 9e352ca
@GenticsDev GenticsDev Added generated changelog mapping ba3fea6
@GenticsDev GenticsDev Added generated changelog mapping b192ef7
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 9f3e488
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration e9169b3
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.9 99a6b48
@GenticsDev GenticsDev Added generated changelog mapping b792962
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 8cacdcc
Commits on Apr 08, 2015
@npomaroli npomaroli Scroll to current selection, after command is executed. 4e4c99f
@npomaroli npomaroli Fix creating of empty block-level elements in IE11: add end breaks 40deadb
@npomaroli npomaroli Hide the insertLink button, when clicking into an editable
that disallowes insertion of links.
3916c7f
@npomaroli npomaroli Merge pull request #1376 from alohaeditor/hotfix-1.0.x-sup-740
Hide the insertLink button, when clicking into an editable
12db208
@npomaroli npomaroli Fix detection of lists when pasted from Word. 146ea46
@berni2288 berni2288 Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x 294fc7f
@berni2288 berni2288 Merge branch 'hotfix-1.1.x' into hotfix aabec62
Commits on Apr 09, 2015
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.10 ca79cea
@GenticsDev GenticsDev Added generated changelog mapping 635f4ec
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration b89707c
@sebastianvogel sebastianvogel RepositoryBrowser: make shrinkToFit option configurable for list 6f12000
@sebastianvogel sebastianvogel Sanitize shrink to fit option and convert string values to boolean an…
…d number
90b7577
Commits on Apr 13, 2015
@npomaroli npomaroli Fix moving cursor between blocks with IE and highlighting
of dropzones
dde5a60
@cprerovsky cprerovsky Merge pull request #1380 from alohaeditor/hotfix-1.0.x-sup-763
Fix moving cursor between blocks with IE and highlighting
554b303
@berni2288 berni2288 Merge branch 'hotfix-1.0.x' into hotfix-1.1.x c1305cf
@berni2288 berni2288 Merge branch 'hotfix-1.1.x' into hotfix b539237
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.11 cc3d5d8
@GenticsDev GenticsDev Added generated changelog mapping 1b2cfe1
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 80ac852
@petrosalema petrosalema Merge pull request #1375 from alohaeditor/hotfix-1.0.x-sup-158
Hotfix 1.0.x sup 158
b04d289
@petrosalema petrosalema Merge pull request #1377 from alohaeditor/hotfix-1.0.x-sup-143
Fix detection of lists when pasted from Word.
e06605a
@npomaroli npomaroli Fix initialization of inline drag and drop behaviour,
which is done in block.js to not be overridden in dragbehavior.js
3b82438
@petrosalema petrosalema Merge pull request #1379 from alohaeditor/hotfix-1.0.x-sup-749
Fix initialization of inline drag and drop behaviour,
01bd066
@petrosalema petrosalema Merge pull request #1378 from sebastianvogel/hotfix-1.0.x-sup-744
RepositoryBrowser: make shrinkToFit option configurable for list
91adb2d
Commits on Apr 14, 2015
@berni2288 berni2288 Merge remote-tracking branch 'origin/hotfix-1.0.x' into hotfix-1.1.x ade9a11
@berni2288 berni2288 Merge remote-tracking branch 'origin/hotfix-1.1.x' into hotfix e41a2f0
Commits on Apr 15, 2015
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.0.15 6e279ec
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.1.15 529fdff
@GenticsDev GenticsDev Added generated changelog mapping 02f9446
@GenticsDev GenticsDev Added generated changelog mapping 78baef8
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 52c5ad9
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration d8f5514
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.12 1b975a8
@GenticsDev GenticsDev Added generated changelog mapping 8476a93
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration dfcfb98
@berni2288 berni2288 Merge branch 'hotfix' cd0ddeb
Commits on Apr 17, 2015
@npomaroli npomaroli Empty customer sidebar attribute fields when selecting an external link. 58defa6
Commits on Apr 21, 2015
@npomaroli npomaroli Merge pull request #1381 from alohaeditor/hotfix-sup-807
Empty customer sidebar attribute fields when selecting an external link.
7ac2a90
@npomaroli npomaroli Add change handler to also store back the value
if pasted using the context menu.
91e1ae0
@petrosalema petrosalema Merge pull request #1385 from alohaeditor/hotfix-1.0.x-sup-827
Add change handler to also store back the value
f81c75a
@tpusztaiGentics tpusztaiGentics wordcontenthandler: Replace unnecessary new line characters (in text …
…nodes) added by Word with space characters.

This fixes issue SUP-845, where some spaces between words got lost in GCN when Word content was pasted to a tag, which used the Text/HTML part type (in this case all new lines are removed when saving the tag, which resulted in the lost spaces).

SUP-845
d88a75d
@petrosalema petrosalema Merge pull request #1384 from tpusztaiGentics/hotfix-1.0.x-sup-845
wordcontenthandler: Replace unnecessary new line characters (in text nodes) added by Word with space characters.
f849679
@berni2288 berni2288 Merge branch 'hotfix-1.0.x' into hotfix-1.1.x 7401b25
@berni2288 berni2288 Merge branch 'hotfix-1.1.x' into hotfix 731e166
Commits on Apr 22, 2015
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-1.2.13 6483683
@GenticsDev GenticsDev Added generated changelog mapping 99341f3
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration c125447
@berni2288 berni2288 Merge remote-tracking branch 'origin/hotfix' 931ad3f