Commit 99db76d8 by Kálmán Viktor

Merge branch 'ubuntu1604' into 'master'

Ubuntu1604



See merge request !384
parents a8272957 8509b3a3
...@@ -1632,9 +1632,9 @@ class MessageForm(ModelForm): ...@@ -1632,9 +1632,9 @@ class MessageForm(ModelForm):
fields = ("message", "enabled", "effect", "start", "end") fields = ("message", "enabled", "effect", "start", "end")
help_texts = { help_texts = {
'start': _("Start time of the message in " 'start': _("Start time of the message in "
"YYYY.DD.MM. hh.mm.ss format."), "YYYY-MM-DD hh:mm:ss format."),
'end': _("End time of the message in " 'end': _("End time of the message in "
"YYYY.DD.MM. hh.mm.ss format."), "YYYY-MM-DD hh:mm:ss format."),
'effect': _('The color of the message box defined by the ' 'effect': _('The color of the message box defined by the '
'respective ' 'respective '
'<a href="http://getbootstrap.com/components/#alerts">' '<a href="http://getbootstrap.com/components/#alerts">'
......
amqp==1.4.6 amqp==1.4.7
anyjson==0.3.3 anyjson==0.3.3
arrow==0.7.0 arrow==0.7.0
billiard==3.3.0.20 billiard==3.3.0.20
...@@ -19,7 +19,7 @@ django-taggit==0.14.0 ...@@ -19,7 +19,7 @@ django-taggit==0.14.0
docutils==0.12 docutils==0.12
Jinja2==2.7.3 Jinja2==2.7.3
jsonfield==1.0.3 jsonfield==1.0.3
kombu==3.0.26 kombu==3.0.30
logutils==0.3.3 logutils==0.3.3
MarkupSafe==0.23 MarkupSafe==0.23
netaddr==0.7.14 netaddr==0.7.14
......
# Pro-tip: Try not to put anything here. There should be no dependency in # Pro-tip: Try not to put anything here. There should be no dependency in
# production that isn't in development. # production that isn't in development.
-r base.txt -r base.txt
uWSGI==2.0.10 uWSGI==2.0.13.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment