Merge branch 'colorbox' of git://github.com/sembrestels/Tidypics

Conflicts:
	manifest.xml
	start.php

1 files changed, 17 insertions, 7 deletions

diff --git a/manifest.xml b/manifest.xml
index f1fe63581..3120d9f96 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
-	<name>Lightpics Photo Gallery</name>
-	<author>Lorea Developers</author>
-	<version>1.8-rc1</version>
-	<description>A simple photo gallery plugin, forked from Tidypics.</description>
+	<name>Tidypics Photo Gallery</name>
+	<author>Cash Costello</author>
+	<version>1.8.0-rc1</version>
+	<description>A photo gallery with albums, tagging, and a slideshow.</description>
 	<category>content</category>
 	<category>multimedia</category>
-	<website>https://lorea.org</website>
-	<copyright>(C) Cash Costello 2011-2012, Lorea 2012</copyright>
+	<website>https://github.com/cash/Tidypics</website>
+	<copyright>Cash Costello 2011-2012</copyright>
 	<license>GNU General Public License Version 2</license>
 	<requires>
 		<type>elgg_release</type>
@@ -17,4 +17,14 @@
 		<type>plugin</type>
 		<name>tidypics</name>
 	</conflicts>
-</plugin_manifest>
+	<suggests>
+		<type>plugin</type>
+		<name>colorbox</name>
+		<version>1.8</version>
+	</suggests>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>colorbox</plugin>
+	</requires>
+</plugin_manifest>
\ No newline at end of file