summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations from Transifex for Juno" into stable/kilo2015.1.0rc22015.1.0Jenkins2015-04-2455-102996/+2602
|\
| * Import translations from Transifex for JunoAkihiro Motoki2015-04-2455-102996/+2602
| | | | | | | | | | | | | | | | | | * Import ~100% completed translations (translations available for 12 languages) * Delete incomplete languages * Update language list in openstack_dashboard settings.py Change-Id: Ie65227e510d95504ed94fb35f0f7273739759601
* | Merge "Format numbers in a locale sensitive manner" into stable/kiloJenkins2015-04-244-7/+7
|\ \
| * | Format numbers in a locale sensitive mannerDoug Fish2015-04-234-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create Volume, Create Snapshot, Extend Volume and Flavors and Quota all fail to format numbers in a locale sensitive manner. This patch changes the code to use the intcomma filter before quota, instead of after. Once quota has added text the number can no longer be formatted. (Pulled from gate, can't pass checks) Change-Id: Id9749d9b25d93185b917708b85471e6f765033e2 Closes-Bug: 1314801 (cherry picked from commit 0872b4a40334a6df863f88e5aa56b31363aff28e)
* | | Merge "update .tx/config to match Kilo Transifex resources" into stable/kiloJenkins2015-04-241-3/+3
|\ \ \ | | |/ | |/|
| * | update .tx/config to match Kilo Transifex resourcesAkihiro Motoki2015-04-231-3/+3
| | | | | | | | | | | | | | | (Pulled from gate, can't pass checks) Change-Id: I167d7787d3096c35a9ad73634e69058306731e44
* | | Merge "Updated from global requirements" into stable/kiloJenkins2015-04-241-1/+1
|\ \ \
| * | | Updated from global requirementsOpenStack Proposal Bot2015-04-231-1/+1
| |/ / | | | | | | | | | Change-Id: I5602a6489684db95934130f3ce83c8eb37af2d3d
* | | Merge "Initialize variable 'networks' before referencing" into stable/kiloJenkins2015-04-231-1/+1
|\ \ \
| * | | Initialize variable 'networks' before referencinglin-hua-cheng2015-04-231-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Fixes the possible UnboundLocalError on the utility class. Change-Id: I52d27f90a583f1216a927147d1bd414c5f866608 Closes-Bug: #1444421 (cherry picked from commit 2e4996d2d220df0ae36a863fe694706e6f7aeb40)
* | | Merge "Fix addition of plugin panel to panel group" into stable/kiloJenkins2015-04-2312-12/+128
|\ \ \ | |_|/ |/| |
| * | Fix addition of plugin panel to panel groupJanet Yu2015-04-2312-12/+128
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert fix from bug #1329050, which adds a plugin panel to its dashboard's class. Adding a plugin panel to a dashboard whose class has its panels defined in a tuple will fail because the new plugin cannot be appended to the tuple. The code errors out before the panel gets added to the dashboard's panel list. However, at this point, the panel has already been registered with the dashboard. This causes Dashboard.get_panels() to see the panel in its registry but not in its panel groups. Consequently, the panel gets put in the "Other" panel group instead of its configured one, as described in bug #1378558. By not adding the the plugin panel to its dashboard's class, the panel gets added to its dashboard's panel list. Now the original issue from bug #1329050 resurfaces. The root cause of that is that every time Dashboard._autodiscover() is called, it instantiates all its panel group classes, wiping out any panels previously added to any of the panel groups. Avoid this by always processing all the plugin panel groups before any of the plugin panels, which also ensures that the panel groups exist before their panels. Making this change exposed an issue where the Horizon URLs were being loaded twice during the plugin infrastructure's unit tests, causing plugin panels to be added multiple times to their dashboards. Fix that by removing the second, unnecessary call. Also create a second test plugin panel group and panel to test the scenarios described in the two bugs addressed here, adding two panel groups at a time. Change-Id: Id6a99c3ff18102c8f47431638d4dda98f14ec641 Closes-Bug: 1378558 (cherry picked from commit e2ef492311a427fe3b5b41a6df6bd9be5a22c174)
* | Merge "Make status column on admin network table translatable" into stable/kiloJenkins2015-04-231-1/+3
|\ \ | |/ |/|
| * Make status column on admin network table translatableDoug Fish2015-04-171-1/+3
| | | | | | | | | | | | | | | | | | The status values in the admin network table are hardcoded to English. They need to be translatable. Change-Id: I0fefdcd294ce7fdcfd7822af685501d7f4f0255e Closes-Bug: 1442341 (cherry picked from commit 5c9d3ace3537b10c87c926b3463d4f476b9bcad4)
* | Merge "Hide Cancel button if no cancel_url is provided" into stable/kiloJenkins2015-04-231-0/+2
|\ \
| * | Hide Cancel button if no cancel_url is providedlin-hua-cheng2015-04-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no cancel_url is defined on the ModalFormView class, hide the Cancel button. Change-Id: Id27c60525560dcfdb5cfafa2c4cd7b4edffea158 Closes-Bug: #1434548 (cherry picked from commit 0e116f2a0b35cf4b013ae6fd9b693f096a967e0c)
* | | Updated from global requirementsOpenStack Proposal Bot2015-04-231-1/+1
| | | | | | | | | | | | Change-Id: Id82cdc54b3e4348ace8cc4e1a61b5bb9a035def5
* | | Merge "[Launch Instance Fix] Security Group Nova Net" into stable/kiloJenkins2015-04-221-1/+7
|\ \ \ | |/ / |/| |
| * | [Launch Instance Fix] Security Group Nova NetTravis Tripp2015-04-171-1/+7
| |/ | | | | | | | | | | | | | | | | | | When nova networking is enabled, the input to security groups needs to be by name. When neutron, it needs to be by id. This solves that issues. Change-Id: If32671af90facd16e60caa33ed84ba7c9796ad11 Closes-Bug: #1445235 (cherry picked from commit b7de0333b13f73f6a66380623d7579373709c756)
* | update .gitreview for stable/kiloThierry Carrez2015-04-171-0/+1
|/ | | | Change-Id: I9a4f4f3ee683d00d4268f015758c9dbf56a1a603
* Updated from global requirementsOpenStack Proposal Bot2015-04-161-11/+11
| | | | Change-Id: I0d7a798915deab02fdde0783a3905d4d95c9d831
* Merge "Net name field is not required when creating port"2015.1.0rc1proposed/kiloJenkins2015-04-141-1/+2
|\
| * Net name field is not required when creating portliyingjun2015-02-191-1/+2
| | | | | | | | | | | | | | | | Add required=False to network name field to create port form when creating port. Change-Id: Ie4575345e6cf948c931feb4619c88fcc5358995d Closes-bug: #1423335
* | Merge "Imported Translations from Transifex"Jenkins2015-04-148-186/+191
|\ \
| * | Imported Translations from TransifexOpenStack Proposal Bot2015-04-148-186/+191
| | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: Ic1ee5149f6a96fe61a3e91029d111e221817b586
* | | Merge "[Heat] Resource url mapping improvement"Jenkins2015-04-141-0/+26
|\ \ \ | |/ / |/| |
| * | [Heat] Resource url mapping improvementTatiana Ovchinnikova2015-04-131-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch set adds nested stacks and autoscaling groups to resource url mapping to make proper links to resources from stacks details. Some resource types from Neutron component are also added. Closes-Bug: 1443454 Change-Id: I0f95aa3381401e30e68bf34c0d3bc5895ce8a433
* | | Merge "Add missing telemetry policy example file"Jenkins2015-04-141-0/+1
|\ \ \
| * | | Add missing telemetry policy example fileliyingjun2015-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Telemetry policy file is missing in local_settings.py.example, Add `'telemetry': 'ceilometer_policy.json',` to POLICY_FILES. Change-Id: Idfd1bc5d562e725eb0f0c0747e438b421470fd78 Closes-bug: #1433395
* | | | Merge "Adding styling for disabled and danger action items"Jenkins2015-04-142-3/+13
|\ \ \ \
| * | | | Adding styling for disabled and danger action itemsThai Tran2015-03-252-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need styling for action-list menu-item for disabled and danger items. Added attributes to li and a in menu-item for bootstrap to pick it up. However, bootstrap does NOT support contextual styling of menu-items . Basically, adding danger to the menu-item will not work. We have to add this via our own css Closes-bug: #1435627 Partially Implemenents: blueprint angularize-identity-tables Change-Id: Ia38292e3968e94d17e2ae9b193bbbd28b02097ab
* | | | | Merge "Add Russian to settings.py"Jenkins2015-04-131-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add Russian to settings.pyDoug Fish2015-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Russian translation is 100% in transifex. We should include it in settings.py. Change-Id: I8a9950ba9a09d7a2e53670d9ce2c4fc884797288 Closes-Bug: 1443514
* | | | | Merge "Imported Translations from Transifex"Jenkins2015-04-133-173/+173
|\ \ \ \ \
| * | | | | Imported Translations from TransifexOpenStack Proposal Bot2015-04-133-173/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: I6527de26970ab5233d351abd2518e10ed89fe20e
* | | | | | Merge "Fixing typo in AVAILABLE_REGIONS section"Jenkins2015-04-131-1/+1
|\ \ \ \ \ \
| * | | | | | Fixing typo in AVAILABLE_REGIONS sectionShaoquan Chen2015-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it says: A tuple of tuples which define multiple regions. But actually it is a list of tuples, like: AVAILABLE_REGIONS = [ ('http://cluster1.example.com:5000/v2.0', 'cluster1'), ('http://cluster2.example.com:5000/v2.0', 'cluster2'), ] Change-Id: Icbb4799689d650bac0bc17737b5747cff10a6154 Closes-Bug: #1442965
* | | | | | | Merge "Fixing typo in OPENSTACK_NEUTRON_NETWORK section"Jenkins2015-04-131-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixing typo in OPENSTACK_NEUTRON_NETWORK sectionShaoquan Chen2015-04-121-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a typo in OPENSTACK_NEUTRON_NETWORK section of settings.rst: ... or you do no not wish to ... Closes-Bug: #1443011 Change-Id: Ic23dae0a081399a1b2227fa97e54d01219a1c725
* | | | | | Merge "Imported Translations from Transifex"Jenkins2015-04-1229-1943/+2156
|\ \ \ \ \ \
| * | | | | | Imported Translations from TransifexOpenStack Proposal Bot2015-04-1229-1943/+2156
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: Ib05d7e5545a4ac5b0283e1096f5d46c4e19bfb8d
* | | | | | Merge "Removing scope digest from login directive"Jenkins2015-04-121-3/+2
|\ \ \ \ \ \
| * | | | | | Removing scope digest from login directiveThai Tran2015-04-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call to digest is not needed since $timeout service already does it. Change-Id: I3aca5283211f852b10d0aab86803c0db7b63a516 Closes-bug: #1441871
* | | | | | | Merge "added network id field in update network model"Jenkins2015-04-121-1/+4
|\ \ \ \ \ \ \
| * | | | | | | added network id field in update network modelMasco Kaliyamoorthy2015-04-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In update network model, only name field is shown. Since duplicate name is allowed, it is difficult to differentiate the two with same name. This patch adding the readonly text input to show the network id. Change-Id: I15096b65d6b410e36d7eb5d99c767b9dc8e801a1 Closes-Bug: #1442031
* | | | | | | | Merge "Fixing typo in CONSOLE_TYPE documentation"Jenkins2015-04-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing typo in CONSOLE_TYPE documentationShaoquan Chen2015-04-111-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, it is saying ``"SERIAL"`` is available since 2005.1(Kilo) in settings.rst in ``CONSOLE_TYPE`` section, it should be 2015 instead. Change-Id: I5ac748f433f6423da8286e0b32f418a8a51e875d Closes-Bug: #1442959
* | | | | | | | Merge "Adding horizon to jshint"Jenkins2015-04-122-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Adding horizon to jshintThai Tran2015-04-082-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppressing error by adding horizon to global jshint configuration. Change-Id: Ibd7d0262255a567a1e0c9efcc25bd32a8a3f86b4 Closes-bug: #1441780
* | | | | | | | Merge "Silently drop access to non-existent flavours"Jenkins2015-04-112-52/+7
|\ \ \ \ \ \ \ \
View Lorry Controller Status