Skip to content

Commit a447ed6

Browse files
author
Johannes Schüth
committed
Simplify licensing in aloha editor and prepare release.
1 parent b682d15 commit a447ed6

20 files changed

+95
-543
lines changed

‎LICENSE.txt

+36-14
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,42 @@
11
Aloha Editor License
22
====================
33

4+
Aloha Editor is a WYSIWYG HTML5 inline editing library and editor.
5+
Copyright (c) 2010-2014: Gentics Software GmbH, Vienna, Austria.
6+
Licensor: Gentics Software GmbH, Vienna, Austria.
7+
8+
All rights reserved
9+
10+
411
Aloha Editor is meant to be an free and open source for all now and in future.
512

613
We encourage continuous, self sustainable development supported by both the open source
714
community and commercial stake holders. This way both parties (community and commercial users)
815
profit from each other by code and financial resources for core development.
9-
Therefore we adopted a dual licensing approach for Aloha Editor. All contributor need to
10-
agree and sign the CLA (http://aloha-editor.org/contribution.php), if they want to push in
11-
the master repository of Aloha Editor.
16+
Therefore we adopted a dual licensing approach for Aloha Editor.
1217

13-
Open source Software License
14-
===========================
15-
The Open Source version of Aloha Editor is released under the terms of GPLv2 or later.
16-
http://www.gnu.org/licenses/gpl-2.0.html (or see license text below)
18+
If you downloaded this package of Aloha Editor from http://www.aloha-editor.org, you are using
19+
the Aloha Editor Community Edition. The Aloha Editor Community Edition is licensed
20+
under the terms of the GPLv2. These terms are included in this this file.
1721

18-
As an additional permission to the GNU GPL version 2, you may distribute non-source
19-
(e.g., minimized or compacted) forms of the Aloha-Editor source code without the copy
20-
of the GNU GPL normally required, provided you include this license notice and a URL
21-
through which recipients can access the Corresponding Source.
22+
If you purchased and downloaded this package of Aloha Editor from http://www.aloha-editor.com
23+
you are using Aloha Editor Enterprise. Aloha Editor Enterprise is licensed
24+
as commercial software covered by the Aloha Editor Enterprise licensing terms.
25+
These terms are included in this this file.
2226

2327

24-
Commercial Software License
28+
Contribution
29+
===========================
30+
All contributor need to agree and sign the CLA (http://aloha-editor.org/contribution.php), if they want to push in
31+
the master repository of Aloha Editor.
32+
33+
34+
Commercial Software License - Aloha Editor Enterprise
2535
============================
26-
The commercial version of Aloha Editor allows to use, modify, copy and distribute without
27-
any restrictions as stated in the commercial license agreement.
36+
37+
Aloha Editor is commercial software covered by the Aloha Editor licensing
38+
terms as stated at http://aloha-editor.com/terms/; you can use, redistribute
39+
it and/or modify it under the terms of the Aloha Editor Enterprise license.
2840

2941
Translation License
3042
===================
@@ -33,6 +45,16 @@ Attribution License V3.0 BY. By contributing translations you agree to the licen
3345
http://creativecommons.org/licenses/by/3.0/
3446

3547

48+
Open source Software License - Aloha Editor Community Edition
49+
===========================
50+
The Open Source version of Aloha Editor is released under the terms of GPLv2 or later.
51+
http://www.gnu.org/licenses/gpl-2.0.html (or see license text below)
52+
53+
As an additional permission to the GNU GPL version 2, you may distribute non-source
54+
(e.g., minimized or compacted) forms of the Aloha-Editor source code without the copy
55+
of the GNU GPL normally required, provided you include this license notice and a URL
56+
through which recipients can access the Corresponding Source.
57+
3658
GNU GENERAL PUBLIC LICENSE
3759
Version 2, June 1991
3860

‎build/LICENSE.commercial.txt

-13
This file was deleted.

‎build/LICENSE.gpl.txt

-374
This file was deleted.

‎build/aloha/commercial-header.frag

-19
This file was deleted.

‎build/aloha/gpl-header.frag

-27
This file was deleted.

‎build/aloha/license-header.frag

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*!
2+
* This file is part of the Aloha Editor Community Edition (http://www.aloha-editor.org)
3+
* and Aloha Editor Enterprise (http://aloha-editor.com) package.
4+
*
5+
* Aloha Editor is a WYSIWYG HTML5 inline editing library and editor.
6+
* Copyright (c) 2010-2014: Gentics Software GmbH, Vienna, Austria.
7+
* Licensor: Gentics Software GmbH, Vienna, Austria.
8+
* All rights reserved
9+
*
10+
* Aloha Editor is dual licensed:
11+
* If you downloaded this package of Aloha Editor from http://www.aloha-editor.org,
12+
* you are using the Aloha Editor Community Edition. The Aloha Editor Community Edition
13+
* is licensed under the terms of the GPLv2. These terms are included in the
14+
* LICENSE.txt file.
15+
*
16+
* If you purchased and downloaded this package of Aloha Editor from
17+
* http://www.aloha-editor.com. You are using Aloha Editor Enterprise.
18+
* Aloha Editor Enterprise is licensed as commercial software covered by the
19+
* Aloha Editor Enterprise licensing terms.
20+
* These terms are included in the LICENSE.txt file.
21+
*/

‎build/cdn-package.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<files>
4242
<!-- License -->
4343
<file>
44-
<source>${project.basedir}/build/LICENSE.${build.license}.txt</source>
44+
<source>${project.basedir}/LICENSE.txt</source>
4545
<outputDirectory>/</outputDirectory>
4646
<destName>LICENSE.txt</destName>
4747
</file>
@@ -95,7 +95,5 @@
9595
</file>
9696
</files>
9797

98-
99-
10098
<includeBaseDirectory>false</includeBaseDirectory>
10199
</assembly>

‎build/changelog/entries/2014/02/10012.enhancement

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
core: A shim has been added to the Aloha object to replace the deprecated jQuery.browser.
2+
Aloha.browser now performs the same function as $.browser. This allows Aloha to be run in applications using
3+
jQuery 1.9.* and 2.*.*. Code references to $.browser have been changed to Aloha.browser.

‎build/changelog/entries/2014/02/10013.feature

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
It is now possible to use a configured table of characters to replaces characters in headerids names.
2+
This provides a means for translating special characters in headerid strings into those that are safe for files systems, for example.

‎build/changelog/entries/2014/02/10014.enhancement

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
format-plugin: Possibility to remove list items from ordered lists, unordered lists and definition lists added.

‎build/changelog/entries/2014/02/10015.enhancement

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
list-plugin: Various enhancements have been added to the plugin.
2+
3+
* It is now possible to add definition lists.
4+
* It is now possible to set pre-defined or user defined styles on lists.
5+
* Preview templates are now render in the Aloha toolbar list style submenus.
6+
* The corresponding list button will be highlighted when the cursor is on a list.
7+
* The class "alohafocus" will be set on focused definition lists.

‎build/changelog/entries/2014/02/10016.enhancement

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The Aloha Editor licenses packages were merged. From now on only one download package variation will be distributed.

‎build/ctct-aloha-browser-changelog.md

-3
This file was deleted.

‎build/dev-changelog.md

-9
This file was deleted.

‎build/dist-package.xml

+2-13
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<!-- License -->
2020
<file>
21-
<source>${project.basedir}/build/LICENSE.${build.license}.txt</source>
21+
<source>${project.basedir}/LICENSE.txt</source>
2222
<outputDirectory>/alohaeditor-${project.version}</outputDirectory>
2323
<destName>LICENSE.txt</destName>
2424
</file>
@@ -102,18 +102,7 @@
102102
<includes>
103103
<include>**/*</include>
104104
</includes>
105-
</fileSet>
106-
107-
<!-- Changelog -->
108-
<fileSet>
109-
<directory>${project.basedir}/</directory>
110-
<outputDirectory>/alohaeditor-${project.version}</outputDirectory>
111-
<includes>
112-
<include>/CHANGELOG*</include>
113-
</includes>
114-
</fileSet>
115-
105+
</fileSet>
116106
</fileSets>
117-
118107
<includeBaseDirectory>false</includeBaseDirectory>
119108
</assembly>

‎build/f-definition-list-and-styles.md

-5
This file was deleted.

‎build/f-remove_list_formats.md

-1
This file was deleted.

‎build/filtered/wro-csslint.xml ‎build/wro/wro-csslint.xml

File renamed without changes.

‎build/filtered/wro.xml ‎build/wro/wro.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<js>/target/build-profile-with-common-plugins/rjs-output/lib/require.js</js>
88
<js>/target/build-profile-with-common-plugins/rjs-output/lib/vendor/jquery-1.7.2.js</js>
99
<js>/target/build-profile-with-common-plugins/rjs-output/lib/aloha-jquery-noconflict.js</js>
10-
<js>/build/aloha/${build.license}-header.frag</js>
10+
<js>/build/aloha/license-header.frag</js>
1111
<js>/target/build-profile-with-common-plugins/rjs-output/lib/aloha.js</js>
1212
</group>
1313
<group name="build-profile-with-common-plugins-bare">
@@ -20,11 +20,11 @@
2020
<js>/target/build-profile-with-common-extra-plugins/rjs-output/lib/require.js</js>
2121
<js>/target/build-profile-with-common-extra-plugins/rjs-output/lib/vendor/jquery-1.7.2.js</js>
2222
<js>/target/build-profile-with-common-extra-plugins/rjs-output/lib/aloha-jquery-noconflict.js</js>
23-
<js>/build/aloha/${build.license}-header.frag</js>
23+
<js>/build/aloha/license-header.frag</js>
2424
<js>/target/build-profile-with-common-extra-plugins/rjs-output/lib/aloha.js</js>
2525
</group>
2626
<group name="build-profile-with-common-extra-plugins-bare">
27-
<js>/build/aloha/${build.license}-header.frag</js>
27+
<js>/build/aloha/license-header.frag</js>
2828
<js>/target/build-profile-with-common-extra-plugins/rjs-output/lib/aloha.js</js>
2929
</group>
3030

0 commit comments

Comments
 (0)