Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
99db76d8
authored
8 years ago
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ubuntu1604' into 'master'
Ubuntu1604 See merge request
!384
parents
a8272957
8509b3a3
Pipeline
#180
passed with stage
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
circle/dashboard/forms.py
+2
-2
requirements/base.txt
+2
-2
requirements/production.txt
+1
-1
No files found.
circle/dashboard/forms.py
View file @
99db76d8
...
@@ -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">'
...
...
This diff is collapsed.
Click to expand it.
requirements/base.txt
View file @
99db76d8
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
...
...
This diff is collapsed.
Click to expand it.
requirements/production.txt
View file @
99db76d8
# 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.1
0
uWSGI==2.0.1
3.1
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment