Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml?rev=1603060&r1=1603059&r2=1603060&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml (original) +++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml Tue Jun 17 05:41:09 2014 @@ -12,9 +12,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns="http://maven.apache.org/XDOC/2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"> <properties> <title>SugarCRM Plugin</title> <author email="[email protected]"> @@ -32,17 +31,16 @@ </p> <p> You can find the OpenMeetings Plugin also in the - <a href="http://www.sugarforge.org/projects/openmeetings/" - target="_blank" rel="nofollow">SugarCRM Plugin database</a> + <a href="http://www.sugarforge.org/projects/openmeetings/" target="_blank" rel="nofollow">SugarCRM Plugin database</a> . </p> <p> A demo version of the SugarCRM plugin is available at <a href="http://demo.e-schwert.de/sugarcrm/" target="_blank" rel="nofollow">demo.e-schwert.de</a> - . Username: demo Password: Demouser55 + . Username: demo Password: Demouser55 </p> </section> - + <section name="Features"> <p>The plugin contains the following features: </p> <ul> @@ -51,38 +49,38 @@ <ol> <li>Integrated with calendar </li> <li>Integrated with SugarCRM meetings </li> - <li>Sends invetations emails to meeting participants </li> + <li>Sends invetations emails to meeting participants </li> <li>Configurable room type </li> </ol> </li> - </ul> + </ul> </section> - <section name="Installation the SugarCRM Plugin for OpenMeetings"> + <section name="Installation the SugarCRM Plugin for OpenMeetings"> <p>In SugarCRM's administration web-interface you will find the module loader. </p> <a class="fancybox-buttons" href="images/moodle_plugin_conference.png"> - <img src="images/SugarCRM_Installation.png" alt="" width="640" - height="320" /> + <img src="images/SugarCRM_Installation.png" alt="" width="640" height="320" /> </a> <ol> <li>Upload the module with module loader in administration area. </li> <li>Configure OpenMeetings settings. </li> - <li>Create OpenMeetings rooms. </li> + <li>Create OpenMeetings rooms. </li> </ol> </section> - - <section name="Demo video"> - <p>The demo video of SugarCRM plugin show you the plugin in action </p> - <object style="height: 390px; width: 640px"> - <param name="movie" value="http://www.youtube.com/v/xrDbcXqxDq8?version=3&feature=player_detailpage"/> - <param name="allowFullScreen" value="true"/> - <param name="allowScriptAccess" value="always"/> - <embed src="http://www.youtube.com/v/xrDbcXqxDq8?version=3&feature=player_detailpage" type="application/x-shockwave-flash" allowfullscreen="true" allowScriptAccess="always" width="640" height="360"/> - </object> + + <section name="Demo video"> + <p>The demo video of SugarCRM plugin show you the plugin in action </p> + <object style="height: 390px; width: 640px"> + <param name="movie" value="http://www.youtube.com/v/xrDbcXqxDq8?version=3&feature=player_detailpage" /> + <param name="allowFullScreen" value="true" /> + <param name="allowScriptAccess" value="always" /> + <iframe width="640" height="360" src="https://www.youtube.com/embed/xrDbcXqxDq8?feature=player_embedded" + frameborder="0" allowfullscreen=""></iframe> + </object> </section> </body> -</document> \ No newline at end of file +</document>
Modified: openmeetings/trunk/singlewebapp/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1603060&r1=1603059&r2=1603060&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/pom.xml (original) +++ openmeetings/trunk/singlewebapp/pom.xml Tue Jun 17 05:41:09 2014 @@ -99,24 +99,79 @@ <system>jira</system> <url>http://issues.apache.org/jira/browse/OPENMEETINGS</url> </issueManagement> + <ciManagement> + <system>jenkins</system> + <url>https://builds.apache.org/view/M-R/view/OpenMeetings/job/openmeetings/</url> + </ciManagement> <developers> <developer> <id>sebawagner</id> <name>Sebastian Wagner</name> <email>[email protected]</email> + <url>https://twitter.com/#!/dead_lock</url> </developer> <developer> - <id>solomax</id> - <name>Maxim Solodovnik</name> - <email>[email protected]</email> + <id>sebawagner</id> + <name>Sebastian Wagner</name> + <email>[email protected]</email> + <url>https://twitter.com/#!/dead_lock</url> </developer> <developer> <id>vdegtyarev</id> <name>Vasiliy Degtyarev</name> <email>[email protected]</email> </developer> - <!-- TODO --> + <developer> + <name>Alexei Fedotov</name> + </developer> + <developer> + <name>Evgeny Rovinsky</name> + </developer> + <developer> + <name>Oliver Becherer</name> + </developer> + <developer> + <name>Eugen Schwert</name> + </developer> + <developer> + <name>Sascha Xander</name> + </developer> + <developer> + <name>Johnny Strom</name> + </developer> + <developer> + <name>Timur Tleukenov</name> + </developer> + <developer> + <name>Alvaro Bustos</name> + </developer> + <developer> + <name>George Kirkham</name> + </developer> + <developer> + <name>Stephen Cottham</name> + </developer> + <developer> + <name>Irina Arkhipets</name> + </developer> + <developer> + <name>Denis Kandrov</name> + </developer> + <developer> + <name>Yulia Algaer</name> + </developer> + <developer> + <name>Artyom Horuzhenko</name> + </developer> </developers> + <contributors> + <contributor> + <name>Michael Wuttke</name> + </contributor> + <contributor> + <name>Thibault Le Meur</name> + </contributor> + </contributors> <scm> <connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp</developerConnection> @@ -125,21 +180,28 @@ </scm> <mailingLists> <mailingList> - <name>Openmeetings User List</name> + <name>User List</name> <post>[email protected]</post> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> <archive>http://mail-archives.apache.org/mod_mbox/openmeetings-user</archive> </mailingList> <mailingList> - <name>Openmeetings Development List</name> + <name>Spanish User List</name> + <post>[email protected]</post> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/openmeetings-user-espanol</archive> + </mailingList> + <mailingList> + <name>Development List</name> <post>[email protected]</post> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> <archive>http://mail-archives.apache.org/mod_mbox/openmeetings-dev</archive> </mailingList> <mailingList> - <name>Openmeetings commit List</name> + <name>Commits List</name> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> <archive>http://mail-archives.apache.org/mod_mbox/openmeetings-commits/</archive> @@ -234,6 +296,10 @@ <version>${red5-client.version}</version> <exclusions> <exclusion> + <groupId>org</groupId> + <artifactId>jaudiotagger</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.mina</groupId> <artifactId>mina-core</artifactId> </exclusion>
