]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
it is GPL General Public License not GPL Public License
authorCash Costello <cash.costello@gmail.com>
Tue, 8 Nov 2011 11:45:18 +0000 (06:45 -0500)
committercash <cash.costello@gmail.com>
Thu, 17 Nov 2011 00:53:03 +0000 (19:53 -0500)
38 files changed:
documentation/examples/plugins/manifest_options/manifest.xml
documentation/examples/plugins/skeleton/manifest.xml
engine/tests/api/plugins.php
engine/tests/test_files/plugin_17/manifest.xml
engine/tests/test_files/plugin_18/manifest.xml
mod/blog/manifest.xml
mod/bookmarks/manifest.xml
mod/categories/manifest.xml
mod/custom_index/manifest.xml
mod/dashboard/manifest.xml
mod/developers/manifest.xml
mod/diagnostics/manifest.xml
mod/embed/manifest.xml
mod/externalpages/manifest.xml
mod/file/manifest.xml
mod/garbagecollector/manifest.xml
mod/groups/manifest.xml
mod/htmlawed/manifest.xml
mod/invitefriends/manifest.xml
mod/likes/manifest.xml
mod/logbrowser/manifest.xml
mod/logrotate/manifest.xml
mod/members/manifest.xml
mod/messageboard/manifest.xml
mod/messages/manifest.xml
mod/notifications/manifest.xml
mod/oauth_api/manifest.xml
mod/pages/manifest.xml
mod/profile/manifest.xml
mod/reportedcontent/manifest.xml
mod/search/manifest.xml
mod/tagcloud/manifest.xml
mod/thewire/manifest.xml
mod/tinymce/manifest.xml
mod/twitter/manifest.xml
mod/twitter_api/manifest.xml
mod/uservalidationbyemail/manifest.xml
mod/zaudio/manifest.xml

index 48a5a95587368f2d56ac1f5dbf8eba5aca1c2264..baa6cc3fa725a98fdbf69ebf26a14ea46a7cea0f 100644 (file)
@@ -6,8 +6,8 @@
        <blurb>A concise description.</blurb>
        <description>This is a longer, more interesting description of my plugin, its features, and other important information.</description>
        <website>http://www.elgg.org/</website>
-       <copyright>(C) Elgg 2010</copyright>
-       <license>GNU Public License version 2</license>
+       <copyright>(C) Elgg 2011</copyright>
+       <license>GNU General Public License version 2</license>
 
        <requires>
                <type>elgg_version</type>
index febe719992f45a9972eabb4836b2c516c14d0c4c..e31624432affe2395749fe028275c7044b6e3afb 100644 (file)
@@ -6,7 +6,7 @@
        <description>This is a description of my plugin and its features.</description>
        <website>http://www.elgg.org/</website>
        <copyright>(C) My Name or Company 2012</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
 
        <requires>
                <type>elgg_release</type>
index 8f5f5dd1e5adff1a4f5711da3ea7e257d05857cd..a0faaff0ebe7dbf450c6af089252fe88c370b112 100644 (file)
@@ -68,8 +68,8 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
                        'blurb' => 'A concise description.',
                        'description' => 'A longer, more interesting description.',
                        'website' => 'http://www.elgg.org/',
-                       'copyright' => '(C) Elgg 2010',
-                       'license' => 'GNU Public License version 2',
+                       'copyright' => '(C) Elgg Foundation 2011',
+                       'license' => 'GNU General Public License version 2',
 
                        'requires' => array(
                                array('type' => 'elgg_version', 'version' => '3009030802', 'comparison' => 'lt'),
@@ -117,8 +117,8 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
                        'version' => '1.0',
                        'description' => 'A 1.7-style manifest.',
                        'website' => 'http://www.elgg.org/',
-                       'copyright' => '(C) Elgg 2010',
-                       'license' => 'GNU Public License version 2',
+                       'copyright' => '(C) Elgg Foundation 2011',
+                       'license' => 'GNU General Public License version 2',
                        'elgg_version' => '2009030702',
                        'name' => 'Plugin Test 17',
                );
@@ -165,13 +165,13 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
        }
 
        public function testElggPluginManifestGetCopyright() {
-               $this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg 2010');
-               $this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg 2010');
+               $this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');
+               $this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');
        }
 
        public function testElggPluginManifestGetLicense() {
-               $this->assertEqual($this->manifest18->getLicense(), 'GNU Public License version 2');
-               $this->assertEqual($this->manifest17->getLicense(), 'GNU Public License version 2');
+               $this->assertEqual($this->manifest18->getLicense(), 'GNU General Public License version 2');
+               $this->assertEqual($this->manifest17->getLicense(), 'GNU General Public License version 2');
        }
 
 
index bb178ab9316d2c09c723377aa92483158acec6a8..70673426528afd4e1a19c3834c6eeeef0c61faec 100644 (file)
@@ -4,7 +4,7 @@
        <field key="version" value="1.0" />
        <field key="description" value="A 1.7-style manifest." />
        <field key="website" value="http://www.elgg.org/" />
-       <field key="copyright" value="(C) Elgg 2010" />
-       <field key="license" value="GNU Public License version 2" />
+       <field key="copyright" value="(C) Elgg Foundation 2011" />
+       <field key="license" value="GNU General Public License version 2" />
        <field key="elgg_version" value="2009030702" />
 </plugin_manifest>
\ No newline at end of file
index 445a41c2e25660bf82010d9179be21473e1ad200..e0776ffc12fe3f3a8875f364bc0cca81905e63e8 100644 (file)
@@ -6,8 +6,8 @@
        <blurb>A concise description.</blurb>
        <description>A longer, more interesting description.</description>
        <website>http://www.elgg.org/</website>
-       <copyright>(C) Elgg 2010</copyright>
-       <license>GNU Public License version 2</license>
+       <copyright>(C) Elgg Foundation 2011</copyright>
+       <license>GNU General Public License version 2</license>
 
        <requires>
                <type>elgg_version</type>
index bd5f9c39629a59d240c8cb6e843c62752bd22bf1..29ee1bfc840e53bcbfd8fd3ae0fd2f8ab12651a4 100644 (file)
@@ -10,7 +10,7 @@
        <description>Adds simple blogging capabilities to your Elgg installation.</description>
        <website>http://elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 679d3f1d874169083b04b62787b9930c087e9e9a..b95af87f8eae875b26dc4fc68bf7c58f898a092c 100644 (file)
@@ -10,7 +10,7 @@
        <description>Adds the ability for users to bookmark internal and external sites.  Other users can then comment on the bookmarks.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index a2f4d97fc438fe6157280fc9a8713787907d294c..4a6bd08646546165c16517266934321b0294e26c 100644 (file)
@@ -9,7 +9,7 @@
        <description>Site-wide Categories lets administrators define categories that users across the site can add content to.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index f93251214172c32fa842fcd1996cc922f515195c..80187efbcc7475504973a4058d8e61c6a0416fdd 100644 (file)
@@ -7,7 +7,7 @@
        <description>A demonstration of how to create a front page plugin.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 14a620268301de8ed29843bfb8814418742f0cd6..cbbc1044c0303b1597ed956b50b683bf1db0f302 100644 (file)
@@ -7,7 +7,7 @@
        <description>A widget-based dashboard for your users</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 6b672e2310fa3d3422766b6552dd9630ed13c7c9..93a12945d8749bd5bfff7a379c0ead41183ea9ab 100644 (file)
@@ -9,7 +9,7 @@
        <description>A set of tools for writing plugins and themes. It is recommended that you have this plugin at the top of the plugin list.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
 
        <requires>
                <type>elgg_release</type>
index a9034d69564642475c72218a27f89b2c70b25366..21e847d226bf6e44ec1f48f2c536d088e0114789 100644 (file)
@@ -9,7 +9,7 @@
        <description>Elgg diagnostics tool</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index c33c8b40af4de31402a675379f2d40caba83418e..7ffbc23a466d3da4e42b6c18248cbafa20ce1b30 100644 (file)
@@ -8,7 +8,7 @@
        <description>Allows users to easily upload and embed media into text areas.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 389ad6960e9bc556a68dfbd768a8735d8bb17df7..f2aef09f3b3cc24fc960f0a795be55f2b2110637 100644 (file)
@@ -7,7 +7,7 @@
        <description>Create simple web pages for about, contact, privacy, and terms.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 85ff76b41ff2cb7ad9e26bb958f9d9c35c173d81..26282a8e31912d4b58f13efdf25137649e480453 100644 (file)
@@ -9,7 +9,7 @@
        <description>File browser plugin</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 1cbf33592263e08faf6dadfc2a576b7678afb81d..5aafebf380f4a67f9f5ed8929ced2ebbe944c11b 100644 (file)
@@ -8,7 +8,7 @@
        <description>Perform some database cleanup tasks</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index b8fd92de770b6fc2fdbf5103e06fffc0c163494c..fd28360d046deae4dc8c3d4f6d65769836943f3b 100644 (file)
@@ -9,7 +9,7 @@
        <description>Provides group support for elgg</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index aac599dee3ab4c424786168bfab376d7b21d4399..5c1f14cb52693886c439975ea6fe0a835cc2ec40 100644 (file)
@@ -8,7 +8,7 @@
        <description>Provides security filtering. Disabling this plugin is extremely insecure. DO NOT DISABLE.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 3</license>
+       <license>GNU General Public License version 3</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 0a1ed20125c0562dd921c69946866af495eebf75..b36238a05ef22eb153971408b417bb0996c92d0b 100644 (file)
@@ -8,7 +8,7 @@
        <description>Invite friends via email invites.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 5a18b88628e9f6189693477f919aaa4a7e23482a..62835fcf5fea0908f20a82f200c21c3116a401ad 100644 (file)
@@ -8,7 +8,7 @@
        <description>Enables users to like content on the site.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index d3b76ee8c71231ea23d3e5b42b56fee3b75f13d7..4527e2cbb301f214f2052866cc615f1fafa2fa56 100644 (file)
@@ -8,7 +8,7 @@
        <description>Browse the system event log</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index db04e762ffc19a4d6e7efd5aff75ecf516cd7e7d..1aa62e2e78f10ec00f92ec15ad963f1da46d9c07 100644 (file)
@@ -8,7 +8,7 @@
        <description>Rotate the system log at specific intervals</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index efd1ede5ef1140e296dd7b69ad061b684496d3c8..8b18c9f911b76ca2a60327760bde20afcc076dc4 100644 (file)
@@ -7,7 +7,7 @@
        <description>Lists the members of your site</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index b4f74c7d0d4bd7dfee61a26d5e746ae99c3be411..617813725ff883d9939b6748fd64bd037052f064 100644 (file)
@@ -8,7 +8,7 @@
        <description>This plugin allows users to put a message board on their profile for other users to post comments.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 238ccf42b46f4bd002c66ebdcdfb80fe05f3b838..73a58d9d460523e934208a7af890bea693362398 100644 (file)
@@ -8,7 +8,7 @@
        <description>Elgg internal messages plugin. This plugin lets user send each other messages.</description>
        <copyright>See COPYRIGHT.txt</copyright>
        <website>http://www.elgg.org/</website>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index a0748633189115ebde4d199cd3280099fbd3feb4..205476881816aa1cea27f0121eab6418ec12e18f 100644 (file)
@@ -7,7 +7,7 @@
        <description>Elgg notifications plugin</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 62111e258dedd719d963abb7d7c18421c06b6c6d..efd3d944f0ff624dfe9cf266e6f8f8c22f356f15 100644 (file)
@@ -8,7 +8,7 @@
        <category>api</category>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index dfc521e114dc23c5059c3820be2dc0c555950124..6990bd6b018da71d5fabd0eaa331f60ad1e7cd28 100644 (file)
@@ -9,7 +9,7 @@
        <description>Elgg Pages</description>
        <website>http://www.elgg.org</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index f56604c7e439b1d9e368d5bba962ab2165531a22..86fbc7b7b98ee259c5fcce06b07dc0e1db200f04 100644 (file)
@@ -8,7 +8,7 @@
        <category>social</category>
        <website>http://elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License Version 2</license>
+       <license>GNU General Public License Version 2</license>
        <activate_on_install>true</activate_on_install>
        <requires>
                <type>elgg_release</type>
index aea8f8114f2953bd4eb13c148ad790636aa21e11..e96620b01657b00a74f5af1fd69c9da4166eff01 100644 (file)
@@ -7,7 +7,7 @@
        <description>Adds the option for users to report content and for admins to check it out.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 9a952d3d896d27ab0250d8237a82fb85da96bd05..513d3a6b96b21e2be1b629eef1ff059634cc098b 100644 (file)
@@ -7,7 +7,7 @@
        <description>Allow search across entities of the site</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 1127e95595b13af29ba3fa6c395c82aea9645ebd..c0f89f35e4e4aedbab81b2796157270cbd0c101a 100644 (file)
@@ -8,7 +8,7 @@
        <description>Widget-based tag clouds.</description>
        <website>http://cashcostello.com/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 9f6b0eaa96af34598a0ac66002358adf580ecae2..962ed12f13731b8f956fb87b22a35a782ae6a340 100644 (file)
@@ -8,7 +8,7 @@
        <description>Microblogging for Elgg</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index ac7b23b291731da21b025648c8acc6463f542780..61bf0c22c85176c24f9abfc52cf9c0e1caa0f94d 100644 (file)
@@ -8,7 +8,7 @@
        <description>TinyMCE plugin.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 38380a2bafd8876bab15fe413a90650b1baab891..18fa8c9573f6196ef52994c129ebb6dfbf527789 100644 (file)
@@ -8,7 +8,7 @@
        <description>Elgg simple twitter widget</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 51ad0dcb4743135030eabdb2963232922bd9b4e7..86bba4b5001aa6ab3953b3e67f7e21d3597e5527 100644 (file)
@@ -8,7 +8,7 @@
        <category>bundled</category>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 232ba71ca4efca4d6d54d740ea5bccbe429e3a53..800dd2641a84d65b577480c54714bd9585aa89fc 100644 (file)
@@ -8,7 +8,7 @@
        <description>Simple user account validation via email.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>
index 767637a565a27d28001f5df6566c1b800e6a81c2..54f819658c69a4dc32948d3db3d4ae908f32d681 100644 (file)
@@ -9,7 +9,7 @@
        <description>This simple plugin lets users play mp3's in the page.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License version 2</license>
        <requires>
                <type>elgg_release</type>
                <version>1.8</version>