Commits

Paola Morales  committed 4e57d86 Merge

Merge branch 'juanpicado' into development

  • Participants
  • Parent commits 9fdeba0, 17cb782

Comments (0)

Files changed (3)

File src/site/apt/index.apt

   Main
   -------
 
-  <<encuestame 1.1.33-SNAPSHOT>> is on development. We are working actively on own free time for  first release  this project.
+  <<encuestame 1.1.35-SNAPSHOT>> is on development. We are working actively on own free time for  first release  this project.
 
   This is an important release of Encuestame including a lot of exciting new advances! See
 

File src/site/apt/releases.apt

-release v1.1.33
-
-        * Validation features in SignUp.
-
-        * Pictures thumbnail generator.
-
-        * Update user profile enhancement.
-
-        * Upgraded Spring Security 3.0.5.RELEASE version.
-
-release v1.1.32
-
-        * Upload pictures.
-
-        * Sign up User Improvement, wizard feature
-
-release v1.1.31  
-
-	* Replaced config xml by spring annotations.
-  
-	* OAuth Spring Security feature (prototype).
-
-	* Upgrade Spring Security version.
-    
-	* Update Spring mobile version .
-
-	* Improvement TweetPoll interface .
-   
-release v1.1.32
-	
-	* Upload pictures.
-
-	* Sign up User Improvement, wizard feature

File src/site/site.xml

         <title>Encuestame Java Open Source Survey System, Twitter, Poll, Surveys.</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta name="description" content="Open Source Java Survey System, Twitter, Poll, Surveys." />
-        <meta name="keywords" content="survey, java, open source, poll, twitter, spring framework" />
+        <meta name="keywords" content="survey, java, open source, poll, twitter, spring framework, social, dojo" />
         <meta name="google-site-verification" content="Cp-ow0L1hAqhoCF_7-og3NgKqUk01S-Ln_JQkZV5Bx0" />
         <meta http-equiv="Expires" content="never"/>
         <meta name="Revisit-After" content="2"/>
             <item name="Main" href="index.html" />
             <item name="Download" href="download.html" />
             <item name="Features" href="features.html" />
-            <item name="Users Forum" href="http://forum.encuestame.org" />
             <item name="Sourceforge.net Project Page" href="http://sourceforge.net/projects/encuestame/" />
+            <item name="GitHub Project Page" href="https://github.com/juanpicado/encuestame/" />
         </links>
 
         <menu name="Encuestame Project">
             <item name="Main" href="index.html" />
             <item name="Features" href="features.html" />
+            <item name="Demo Site" href="http://demo.encuestame.org" />
             <item name="Download" href="download.html" />
-            <item name="Releases" href="releases.html" />
-            <item name="Source Repository" href="source-repository.html" />
+            <item name="Releases" href="http://wiki.encuestame.org/en/Changelog" />
+            <item name="Source Repository" href="http://code.encuestame.org" />
             <item name="License" href="license.html" />
         </menu>