Merge branch 'master' of git://github.com/Chill-project/Main

Resources/public/sass/_custom.scss

@@ -92,4 +92,18 @@ ul.custom_fields.choice li {
    p {
       font-family: 'open_sanslight';
    }
+}
+
+// inline time input
+.time_compound {
+    input[type=text], select {
+        width: 4em;
+        display: inline-block;
+        text-align: center;
+    }
+    
+    .separator {
+        margin-left: 0.2em;
+        margin-right: 0.2em;
+    }
 }

Resources/views/Form/fields.html.twig

@@ -87,6 +87,18 @@
     {% endif %}
 {% endspaceless %}
 {% endblock date_widget %}
+
+{%- block time_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{ block('form_widget_simple') }}
+    {%- else -%}
+        {%- set vars = widget == 'text' ? { 'attr': { 'size': 1 }} : {} -%}
+        {% set attr = {'class' : 'time_compound ' ~ attr.class|default('') } %}
+        <div {{ block('widget_container_attributes') }}>
+            {{ form_widget(form.hour, vars) }}{% if with_minutes %}<span class="separator">:</span>{{ form_widget(form.minute, vars) }}{% endif %}{% if with_seconds %}<span class="separator">:</span>{{ form_widget(form.second, vars) }}{% endif %}
+        </div>
+    {%- endif -%}
+{%- endblock time_widget -%}
         
 {% block form_errors %}
 {% spaceless %}

Security/Authorization/AuthorizationHelper.php

@@ -106,6 +106,9 @@ class AuthorizationHelper
                             // perform check on scope if necessary
                             if ($entity instanceof HasScopeInterface) {
                                 $scope = $entity->getScope();
+                                if ($scope === NULL) {
+                                    return true;
+                                }
                                 if ($scope->getId() === $roleScope
                                       ->getScope()->getId()) {
                                     return true;

Timeline/TimelineBuilder.php

@@ -130,7 +130,7 @@ class TimelineBuilder implements ContainerAwareInterface
             $union .= $append;
         }
         //add ORDER BY clause and LIMIT
-        $union .= sprintf(' ORDER BY date LIMIT %d OFFSET %d',
+        $union .= sprintf(' ORDER BY date DESC LIMIT %d OFFSET %d',
                 $number, $page * $number);
         
         return $union;