Merge branch 'release/v1.0.0' into stable

Conflicts: project/Build.scala
gnieh · Sep 21, 2014 · b2f66c4 · b2f66c4
2 parents f2abf83 + 467b743
commit b2f66c4
Show file tree

Hide file tree

Showing 19 changed files with 259 additions and 191 deletions.
diff --git a/blue-common/src/main/resources/application.conf b/blue-common/src/main/resources/application.conf
@@ -48,7 +48,11 @@ blue {
 
     # the prefix of this \BlueLaTeX installation
     # if it is installed at the root of the domain, then leave this string empty
-    path-prefix = "/api"
+    # if the prefix is absolute (i.e. starting with a `/`) then the API is expected to
+    # be at the root of the virtual host.
+    # if the path is relative (i.e. not starting with `/`) then the client
+    # is expected to send its requests by appending its own prefix to the API prefix if it has any.
+    path-prefix = "api"
 
   }
 

diff --git a/blue-core/src/main/scala/gnieh/blue/core/impl/user/RegisterUserLet.scala b/blue-core/src/main/scala/gnieh/blue/core/impl/user/RegisterUserLet.scala
@@ -106,7 +106,7 @@ class RegisterUserLet(val couch: CouchClient, config: Config, context: BundleCon
                 ErrorResponse("unable_to_register", s"Something went wrong when registering the user $username. Please retry")))
           }
         } recover {
-          case SohvaException(_, ConflictException(_)) =>
+          case ConflictException(_) =>
             logWarn(s"User $username already exists")
             (HStatus.Conflict,
               ErrorResponse("unable_to_register", s"The user $username already exists"))

diff --git a/blue-web/src/main/assets/less/mobile.less b/blue-web/src/main/assets/less/mobile.less
@@ -227,6 +227,9 @@
                 width: 39px!important;
             }
         }
+        .centerRightCol {
+          padding-left: 40px!important;
+        }
         .leftCol {
           left: 40px;
           .close {
@@ -235,26 +238,26 @@
                 display: none;
               }
           }
-          .centerRightCol {
-            padding-left: 40px!important;
-          }
-        }
-        &.close, &.open {
+          &.close, &.open {
             -moz-transition: left .5s;
             -o-transition: left .5s;
             transition: left .5s;
             -webkit-transition: left .5s;
-        }
-        &.close {
-            left: -300px;
-        }
-        .bg {
-            height: 100%;
-            left: 0;
-            position: fixed;
-            top: 0;
-            width: 100%;
-            z-index: -1;
+          }
+          &.close {
+              left: -300px;
+              .bg {
+                display: none;
+              }
+          }
+          .bg {
+              height: 100%;
+              left: 0;
+              position: fixed;
+              top: 0;
+              width: 100%;
+              z-index: -1;
+          }
         }
     }
     #form-page {

diff --git a/blue-web/src/main/resources/webapp/ace/ext-language_tools.js b/blue-web/src/main/resources/webapp/ace/ext-language_tools.js
diff --git a/blue-web/src/main/resources/webapp/i18n/resources-locale_default.js b/blue-web/src/main/resources/webapp/i18n/resources-locale_default.js
@@ -59,9 +59,14 @@
         "value":"Affiliation",
         "description":"Affiliation"
     },
+    {
+        "key":"_Registration_Password_will_sent_in_email_",
+        "value":"A confirmation email will be sent with instructions define your password",
+        "description":"Registration Password will be sent in email"
+    },
     {
         "key":"_Registration_Success_",
-        "value":"You are now registred please check your email to define your password.",
+        "value":"You are now registred please check your mailbox to define your password.",
         "description":"Registration success"
     },
     {
@@ -91,7 +96,7 @@
     },
     {
         "key":"_Reset_Wait_email_confirm_request_",
-        "value":"Please ckeck your email",
+        "value":"Please check your mailbox",
         "description":"Reset password succed"
     },
     {
@@ -220,13 +225,13 @@
         "description":"Ace settings: Key binding"
     },
     {
-        "key":"_Show_wrap_",
-        "value":"Show wrap",
+        "key":"_Wrap_mode_",
+        "value":"Wrap mode",
         "description":"Ace settings: Show wrap"
     },
     {
         "key":"_Full_line_selection_",
-        "value":"Full lline selection",
+        "value":"Full line selection",
         "description":"Ace settings: Full lline selection"
     },
     {
@@ -261,7 +266,7 @@
     },
     {
         "key":"_Enable_behaviours_",
-        "value":"Enable behaviours",
+        "value":"Enable auto-pairing of special characters (', \", ...)",
         "description":"Ace settings:  Enable behaviours"
     },
     {
@@ -344,6 +349,16 @@
         "value":"Are you sure you want to remove the paper: \"\\s\"?",
         "description":"Delete paper confirmation"
     },
+    {
+        "key":"_Delete_synchronized_file_confirm_",
+        "value":"Are you sure you want to remove the file: \"\\s\"?",
+        "description":"Delete synchronized file confirmation"
+    },
+    {
+        "key":"_Delete_resource_confirm_",
+        "value":"Are you sure you want to remove the resource: \"\\s\"?",
+        "description":"Delete resource confirmation"
+    },
     {
         "key":"_Ascending_",
         "value":"Ascending",
@@ -876,6 +891,21 @@
 
 
 
+    {
+        "key":"_username_tooltip_",
+        "value":"The unique name of the user.",
+        "description":"tooltip: Username"
+    },
+    {
+        "key":"_first_name_tooltip_",
+        "value":"The first name of the user.",
+        "description":"tooltip: Firstname"
+    },
+    {
+        "key":"_last_name_tooltip_",
+        "value":"The last name of the user.",
+        "description":"tooltip: lastname"
+    },
     {
         "key":"_files_tooltip_",
         "value":"All files of the paper.",