215 Commits

Author SHA1 Message Date
Jenkins
b5ef5893d5 Merge "Replace python version for tox" 5.0.0.0b1 2017-04-06 11:02:11 +00:00
Vitaliy
36c9dcf564 Replace python version for tox
Basepython version changed from python3.4 up to python3.5 for tox.

Change-Id: I87d38eb710731c7ecf6cfde90cf1609e495996dc
2017-04-05 12:51:03 +00:00
Jenkins
2f9513b5f9 Merge "Use bindep to define binary deps" 2017-04-05 10:38:19 +00:00
Jenkins
d2069fc2b4 Merge "Modify "Interval" field to select format" 2017-04-05 10:21:30 +00:00
Vitaliy
58a58dd3aa Use bindep to define binary deps
Rely on infra [0] to install only those that we need for our
tests.

[0] http://docs.openstack.org/infra/bindep/index.html

Change-Id: I7ebf64fbd13d79029e76ec30ba311daa69724c1e
2017-04-04 23:32:31 +00:00
Jenkins
6037076e9c Merge "fixed the mistake in using update job web page" 2017-03-30 14:14:51 +00:00
Jenkins
96b54e336b Merge "Replace django_date with datetime.datetime.strftime" 2017-03-28 14:25:13 +00:00
Jenkins
2f018690e7 Merge "Added project_id for keystone v3 credentials" 2017-03-28 14:16:11 +00:00
OpenStack Proposal Bot
983aa78d37 Updated from global requirements
Change-Id: I7cd9bd93477b658f657fc1542e4209f1311d777e
2017-03-23 15:10:53 +00:00
Jenkins
4741484813 Merge "The Python 3.5 is added" 2017-03-20 16:18:17 +00:00
kavithahr
2b4ab9276e The Python 3.5 is added
The Python 3.5 was missing in setup.cfg and tox.ini
hence added that version.

Change-Id: I9e3d7b85d7a7db4dde27fc75820d38c366259c08
2017-03-11 19:12:00 +05:30
Memo Garcia
dc8c12afef Better error message in horizon
Change-Id: I74384e092cb02c1f7a1979e7fa7a5e555befcd97
2017-03-10 17:02:28 +00:00
Memo Garcia
c12d4dabfd Added project_id for keystone v3 credentials
freezer dashboard now supports multi-domain accounts

Change-Id: Ia924210c38cc9e95f5fad3a62ce6170e6de2c71a
Closes-bug: 1671860
2017-03-10 15:52:35 +00:00
jiangpch
d78e627783 Replace django_date with datetime.datetime.strftime
The django_date transforms time to string with i18n, which will
cause error while using chinese, we can fix this either encode
the date_str using 'utf8' or use datetime.datetime.strftime to
do the transform job.

Closes-Bug: #1671315

Change-Id: Ice599334b29125cfac69ab30e04b956024f34517
2017-03-09 02:38:33 +00:00
Jenkins
4e94b1e1c0 Merge "Add the missing name in confirm delete modal" 2017-03-08 14:40:35 +00:00
Jenkins
83aaebf879 Merge "Place the error message to correct position" 2017-03-08 14:22:22 +00:00
Jenkins
d718cbdc7d Merge "Optimize the checks of instance id for create action" 2017-03-08 14:22:16 +00:00
Jenkins
0a49ff6b97 Merge "Modify the 'Attach To Session' form to 'Bootstrap Modal'" 2017-03-08 14:22:13 +00:00
Jenkins
5d3c08d5f1 Merge "Remove the redundant codes" 2017-03-08 14:22:05 +00:00
Tong Shan
bc2066f6bd fixed the mistake in using update job web page
In page "create job" configuration interval help information
is following some format,but when "update" is not the same.

Change-Id: I83761bbea9d6fd4b226254a8a018d27a792def1c
2017-03-02 00:18:44 +00:00
Ruslan Aliev
8add59f426 Removes useless 'verify' option in Client args
Change-Id: Id384e89852ad1070d89faa41f60a5940567718f8
Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
2017-02-15 18:46:50 +04:00
qiaomin
f702a606ca Place the error message to correct position
Modify the error message 'You must define nova network id to restore'
to be around the 'Nova Network ID' field.

Change-Id: Ic732a33c2fd754afa6d1d796b8d9e6f1e382c135
Closes-Bug: #1663888
2017-02-11 22:40:54 +08:00
qiaomin
031917bbcb Optimize the checks of instance id for create action
Make the checks of "Nova Instance ID" and 'Cinder Volume ID'
more correct for create action.

Change-Id: I051cca74d629febb01203c1eb4f2d35f091a7b8d
Closes-Bug: #1663887
2017-02-11 22:29:52 +08:00
Jenkins
40f832375f Merge "Optimize the checks of container for create action" 2017-02-11 12:48:07 +00:00
Jenkins
af82e3617b Merge "Modify "Restore From Date" field to datetime format" 2017-02-11 12:47:58 +00:00
qiaomin
880b4f2619 Modify the 'Attach To Session' form to 'Bootstrap Modal'
Click the 'attach to session' button in the table row actions
of the 'Jobs' page, There should not switch to another page
and should open a 'Bootstrap Modal' form.

Change-Id: I3555224ce81ef1fa346adf95f18f3c592f7c0f2f
Closes-Bug: #1663272
2017-02-09 23:17:33 +08:00
qiaomin
7e3edaf05c Modify "Interval" field to select format
Modify the "Interval" filed in "Create Job" form
to select format, support user to choose 'Continuous',
'Weeks', 'Days' and so on. This makes the user input life easier.

Change-Id: Ida460d260d96c0b99f5ced035009221bba91b109
Closes-Bug: #1663235
2017-02-09 22:21:03 +08:00
Jenkins
45f7f08cd2 Merge "Clean imports in code" 2017-02-09 02:03:18 +00:00
Jenkins
a819f1cc89 Merge "Optimize the form fields for create action" 2017-02-08 11:10:24 +00:00
Jenkins
7112c69423 Merge "Add .project and .pydevproject to .gitignore" 2017-02-08 08:26:49 +00:00
qiaomin
71f9e3a650 Modify "Restore From Date" field to datetime format
Modify the "Restore From Date" filed in "Create Action" form
to datetime format. This makes the user life easier.

Change-Id: I602a8640098be2ffb592c613b734dceda5b1eaeb
2017-02-08 12:24:39 +08:00
qiaomin
58409a84de Add the missing name in confirm delete modal
Change-Id: Ifc28241aa22d1e97a59a35bd2ff8eff150a0b25b
Closes-Bug: #1658557
2017-02-07 23:10:55 +08:00
qiaomin
f7165967b5 Remove the redundant codes
DeleteInstance action inherits from tables.DeleteAction,
the tables.DeleteAction has already define some attributes.
So this patch remove the repeated attributes.

Change-Id: I7cab3cf609b75e483d5507af113501aa957436c5
2017-02-07 22:54:52 +08:00
qiaomin
39a9a2e6db Optimize the checks of container for create action
Make the checks of container more correct for create action.

Change-Id: If1bdb46e2c76db69ff5301fa5439c8ae4f87bca5
Closes-Bug: #1662190
2017-02-07 21:49:28 +08:00
qiaomin
a40c839d5b Optimize the form fields for create action
Remove the unused 'Nova network ID'. This field item is only
required when the 'Action' choose 'Restore' and the 'Mode' choose 'Nova'.

Change-Id: Iaa7225b44f7a62f28dad230e320d65f04bdcc2d4
Closes-Bug: #1662196
2017-02-06 23:07:34 +08:00
Cao Xuan Hoang
02a4288827 Clean imports in code
This patch set modifies lines which are importing objects
instead of modules. As per openstack import guide lines, user should
import modules in a file not objects.

http://docs.openstack.org/developer/hacking/#imports

Change-Id: Ibfaf35be7506db820bea8e41a7fc8fcaf20fe08a
2017-02-06 11:21:15 +07:00
caowei
b170d23be5 Add .project and .pydevproject to .gitignore
Eclipse generates these.

Change-Id: I970a1862333f376e9c8f426e75bc0a7268af43a1
2017-02-05 21:55:35 +08:00
caowei
a502aead57 Fix installation freezer dashboard
Change _7050_freezer.py to _7050_freezer_remove_panel_.py
in the README.rst

Change-Id: I8c057880f0ac055c3fdff830e611ffdc0a143c85
2017-02-05 20:46:21 +08:00
Jenkins
308b8c4d67 Merge "Remove link to modindex" 4.0.0.0rc1 4.0.0 2017-02-02 16:26:20 +00:00
Jenkins
fc2cb12b53 Merge "Use 'trimmed' for blocktrans in html page" 2017-02-02 16:17:23 +00:00
Jenkins
6fd461f03c Merge "Add the missing name in confirm delete modal" 2017-02-02 15:39:23 +00:00
Jenkins
70f46a62ef Merge "Remove the redundant "required=True"" 2017-02-02 15:20:48 +00:00
Jenkins
5fb80daf35 Merge "Restore nova from UI" 2017-02-02 15:11:53 +00:00
Jenkins
8ae2857e01 Merge "Updated from global requirements" 2017-02-02 15:10:52 +00:00
Jenkins
eb3c61482b Merge "Removes unnecessary utf-8 coding" 2017-02-02 14:21:57 +00:00
Rajiv Kumar
f2ca898324 Remove link to modindex
The documentation build does not generate any module index, thus
remove the link to the page.

Change-Id: I555fcb3b005e53c447372ce25c57ef4cac5cd811
2017-01-27 10:28:42 +05:30
qiaomin
ac7908c15e Remove the redundant "required=True"
The django form field default is "required=True", so this patch
remove the redundant "required=True" in the form.

Change-Id: Id2342cea882134099a43f2149e7b56168a015afe
2017-01-26 23:15:30 +08:00
qiaomin
7fb16fa84a Use 'trimmed' for blocktrans in html page
Add trimmed option to blocktrans, blocktrans trimmed
option removes newlines from contents of blocktrans
and replaces any whitespace at the beginning and end of a line into
a single space. This makes translator life easier.
More detail is described in the bug report.

Change-Id: I9a5c3e958260a94d8a44dc3946e25a690f00f30e
Closes-Bug: #1659559
2017-01-26 22:27:07 +08:00
OpenStack Proposal Bot
7343bc45da Updated from global requirements
Change-Id: I040705aa26e19bd74c1b655eaa922ee702a20fc2
2017-01-25 20:20:01 +00:00
qiaomin
6de8df0b9f Add the missing name in confirm delete modal
Change-Id: Idcf6ae03c96712a3204c606f659543e5738008a3
Closes-Bug: #1658557
2017-01-23 23:13:09 +08:00