documentation

Quy · Jul 8, 2014 · d65f588 · d65f588
1 parent 8f374a9
commit d65f588
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 1 deletion.
diff --git a/LICENSE b/LICENSE
@@ -1,2 +1,6 @@
 ZenPhoto20 is licensed under the terms of the GNU General Public License,
 version 2 or later. The full text is included in the file ./zp-core/gpl-2.0-standalone.htm which can be viewed from a link at the bottom of each admin page. More information can be found at http://fsf.org/
+
+Portions of this software are derived or adapted from works covered by licenses other than the GNU General Public , e.g. http://www.opensource.org/licenses/mit-license.php. Licensing ZenPhoto20 under GNU General Public License is not intended to diminish any rights the copyright holders of these items may claim. All works are used with permission of the copyright holder.
+
+For a complete list of modifications,  including attribution and change dates, of original content please see https://github.com/ZenPhoto20/ZenPhoto20/commits/master.
diff --git a/zp-core/pickSource.php b/zp-core/pickSource.php
@@ -5,6 +5,8 @@
  *
  * @author Stephen Billard (sbillard)
  *
+ * copyright © 2014 Stephen L Billard
+ * 
  * @package admin
  */
 define('OFFSET_PATH', 1);

diff --git a/zp-core/zp-extensions/debug.php b/zp-core/zp-extensions/debug.php
@@ -3,6 +3,10 @@
 /*
  * Generate tab for debuging aids
  *
+ * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
+ *
  * @package plugins
  * @subpackage development
  */

diff --git a/zp-core/zp-extensions/debug/admin_tab.php b/zp-core/zp-extensions/debug/admin_tab.php
@@ -2,6 +2,10 @@
 /**
  * This is the "tokens" upload tab
  *
+ * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
+ *
  * @package plugins
  * @subpackage admin
  */

diff --git a/zp-core/zp-extensions/favoritesAlbums.php b/zp-core/zp-extensions/favoritesAlbums.php
@@ -21,7 +21,9 @@
  * in links so long as there is not a file/folder with of the stripped suffix name.
  *
  * @author Stephen Billard (sbillard)
- * 
+ *
+ * copyright © 2014 Stephen L Billard
+ *
  * @package plugins
  * @subpackage media
  */

diff --git a/zp-core/zp-extensions/favoritesAlbums/admin-album.php b/zp-core/zp-extensions/favoritesAlbums/admin-album.php
@@ -2,6 +2,11 @@
 /**
  * This script is used to create dynamic albums from a favorites page.
  * @author Stephen Billard (sbillard)
+ *
+ * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
+ *
  * @package plugins
  * @subpackage media
  */

diff --git a/zp-core/zp-extensions/purgeOptions.php b/zp-core/zp-extensions/purgeOptions.php
@@ -12,6 +12,8 @@
  *
  * @author Stephen Billard (sbillard)
  *
+ * copyright © 2014 Stephen L Billard
+ *
  * @package plugins
  * @subpackage admin
  */

diff --git a/zp-core/zp-extensions/purgeOptions/purgeOptions_tab.php b/zp-core/zp-extensions/purgeOptions/purgeOptions_tab.php
@@ -2,6 +2,10 @@
 /**
  * purge options tab
  *
+ * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
+ *
  * @package plugins
  * @subpackage admin
  */

diff --git a/zp-core/zp-extensions/themeEditor.php b/zp-core/zp-extensions/themeEditor.php
@@ -7,6 +7,9 @@
  * other plugin has attached the <i>theme_editor</i> filter.
  *
  * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
+ *
  * @package plugins
  * @subpackage admin
  */

diff --git a/zp-core/zp-extensions/themeEditor/themes-editor.php b/zp-core/zp-extensions/themeEditor/themes-editor.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Theme file editor
+ *
  * @package admin
  * @author Ozh
  */

diff --git a/zp-core/zp-extensions/tinymce/config/config.js.php b/zp-core/zp-extensions/tinymce/config/config.js.php
@@ -26,6 +26,8 @@
  * </ul>
  *
  * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
  */
 $filehandler = zp_apply_filter('tinymce_zenpage_config', NULL);
 

diff --git a/zp-core/zp-extensions/tinymce/plugins/pasteobj/pasteobj.php b/zp-core/zp-extensions/tinymce/plugins/pasteobj/pasteobj.php
@@ -4,6 +4,8 @@
  *
  * @author Stephen Billard (sbillard)
  *
+ * copyright © 2014 Stephen L Billard
+ *
  */
 // force UTF-8 Ø
 define('OFFSET_PATH', 3);

diff --git a/zp-core/zp-extensions/tinymce/plugins/pasteobj/pasteobj_popup.js b/zp-core/zp-extensions/tinymce/plugins/pasteobj/pasteobj_popup.js
@@ -2,6 +2,10 @@
  * pasteobj tinyMCE popup
  *
  * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
+ *
+ * adapted from the tinyMCE 4: compat3x
  */
 
 var tinymce, tinyMCE;

diff --git a/zp-core/zp-extensions/tinymce/plugins/pasteobj/plugin.min.js b/zp-core/zp-extensions/tinymce/plugins/pasteobj/plugin.min.js
@@ -2,6 +2,9 @@
  *
  * pasteobj plugin for tinyMCE
  * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
+ *
  */
 
 tinymce.PluginManager.add('pasteobj', function(editor, url) {

diff --git a/zp-core/zp-extensions/zenpotoCompatibilityPack.php b/zp-core/zp-extensions/zenpotoCompatibilityPack.php
@@ -32,6 +32,10 @@
  * <li>Category</li>
  * </ul>
  *
+ * @author Stephen Billard (sbillard)
+ *
+ * copyright © 2014 Stephen L Billard
+ *
  * @package plugins
  * @subpackage admin
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,8 @@ @@
      * </ul>
      *
      * @author Stephen Billard (sbillard)
+     *
+     * copyright © 2014 Stephen L Billard
      */
     $filehandler = zp_apply_filter('tinymce_zenpage_config', NULL);
@@ Expand Down @@