Commit Graph

754 Commits

Author SHA1 Message Date
Pranav Saxena 3046c38f59 CS-14831: Incorrect message with reset password for instance 2012-05-14 11:29:25 -07:00
Sanjay Tripathi 683b88d449 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2012-05-08 10:35:53 +05:30
Jessica Wang 248c41d349 cloudstack 3.0 UI - localization - add new label of MD5 checksum 2012-05-07 11:29:07 -07:00
Jessica Wang 36d92785ff cloudstack 3.0 UI - template page - localize "label.action.register.template" 2012-05-04 16:08:13 -07:00
Sanjay Tripathi 3c4a27d4c6 bug 13461: Usage server restart required after some configuration changes. 2012-05-04 11:04:30 +05:30
bfederle 57cc1ea378 WIP: Upload volume UI
Adds new action, upload volume, to the storage->volumes list view
header. This will present a dialog to specify URL & name of volume,
and select a VM to attach the volume to.

Server API calls are still incomplete and rely on hardcoded values.
2012-05-02 14:29:29 -07:00
bfederle 898952479e CS-14461: Add more infrastructure page shortcuts
-Add additional shortcuts for:
  -Primary storage
  -Secondary storgage
  -Virtual routers
  -System VMs

-Replace host stats with the new shortcuts

-Add 'zone' dropdown to create form for the newly added-shortcuts'
 sections, to support creating these items without a zone context
2012-04-30 10:32:43 -07:00
Jessica Wang 2f001e6413 cloudstack 3.0 UI - check in new localization labels (Simplified Chinese vesion). 2012-04-27 15:33:15 -07:00
Jessica Wang b8cb55bca1 cloudstack 3.0 UI - infrastructure - zone detail - physical network section - add Isolation method to listView. 2012-04-26 16:53:06 -07:00
Jessica Wang b5cb205570 cloudstack 3.0.x UI - checked in Japanese translation file provided by Tetsunori 2012-04-24 11:30:24 -07:00
bfederle 2119ae16df Add missing resource, max networks, to project resource tab 2012-04-23 22:33:18 +01:00
Jessica Wang 37e8d03f0a CS-14588: cloudstack 3.0 UI - VM Wizard - correct validation message for name field. 2012-04-23 13:39:26 -07:00
kishan f9528405af bug CS-14577: Use premium upgrade checker in components.xml, since usage is also OSS now
status CS-14577: resolved fixed
reviewed-by: Nitin
2012-04-20 16:12:03 +05:30
Pranav Saxena 78dc2ecf18 CS-13904 : Labels for service offering CPU and memory not consistent 2012-04-19 12:53:42 -07:00
Jessica Wang 9d694dd8e7 cloudstack 3.0 UI - localize validation message for vm host name. 2012-04-18 18:20:42 -07:00
Jessica Wang 4a7c7da191 CS-13896: cloudstack 3.0 UI - register template, register ISO - correct message and label. 2012-04-18 12:15:25 -07:00
Jessica Wang 8f6e3e5ea9 cloudstack 3.0 UI - add Network offering dialog - correct label of service offering from Compute offering to System offering. 2012-04-13 14:41:10 -07:00
pranav ee0f3e898c Bug 12833 addition of Fetch Latest Button on the Dashboard
Conflicts:

	client/WEB-INF/classes/resources/messages.properties
	ui/css/cloudstack3.css

reviewed-by: brian
2012-04-12 15:15:31 -07:00
Jessica Wang 0c33016c9f cloudstack 3.0 UI - security group - ingress rule - fix a bug that Account, Security group failed to be translated. 2012-04-11 17:29:19 -07:00
Jessica Wang cd9c24a978 cloudstack 3.0 UI - infrastructure - physical network - network service providers - Netscaler/F5/SRX - devices - change breadcrumb to show Devices instead of Netscaler/F5/SRX (to distinguish between provider and devices). 2012-04-11 11:38:51 -07:00
David Nalley d5377b0ae3 more line ending fixes 2012-04-06 22:51:32 -04:00
Jessica Wang 984c4bbdb7 cloudstack 3.0 UI - system service offering page - (1) add System VM Type dropdown in Add Service Offering dialog. (2) add System VM Type in detailView. 2012-04-04 16:36:30 -07:00
Alena Prokharchyk b14bac0977 bug 14539: 1) introduced 2 new config parameters defining default offerings for ssvm and cpvm - consoleproxy.service.offering and secstorage.service.offering
2) Added new api - changeServiceForSystemVm - to support service offering upgrade for system vms
3) Removed global config parameters that are not in use anymore: consoleproxy.ram.size, consoleproxy.cpu.mhz, secstorage.vm.ram.size, secstorage.vm.cpu.mhz
2012-04-03 10:52:32 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Brian Federle 698a1bb3cd Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
2012-03-28 15:03:17 -07:00
Brian Federle 3e2ca5a54f bug 14519
Show separate message for basic zone setup physical network UI
2012-03-28 15:01:43 -07:00
Jessica Wang 964eeeb515 bug 14514: cloudstack 3.0 UI - volume page - show download volume option when a volume's attached VM is stopped or when a volume is detached from a VM. 2012-03-28 14:35:10 -07:00
Brian Federle c568df743f Revert "Add support for OVM traffic labels in UI"
This reverts commit a199d1f7a2.
2012-03-28 14:34:04 -07:00
Brian Federle a199d1f7a2 Add support for OVM traffic labels in UI 2012-03-28 11:11:17 -07:00
bfederle 97d8941a54 bug 14057
Rename 'label' -> 'traffic label' in configure traffic type dialog.
2012-03-28 10:24:52 -07:00
Jessica Wang c91c9b3f3d cloudstack 3.0 UI - infrastructure - service providers - security group provider detail view - correct view all from view security groups to view rules. 2012-03-26 14:11:22 -07:00
Jessica Wang aaaaadf16f cloudstack 3.0 UI - infrastructure - service provider detail view - correct view all label from view provider to view devices. 2012-03-26 12:47:21 -07:00
Nitin Mehta a5a7be4c7e Bug 10808: Add Upload Volume api and do validation. 2012-03-24 13:59:59 +05:30
Jessica Wang cb0ea6385a cloudstack 3.0 UI - check in Chinese translation. 2012-03-23 10:00:18 -07:00
Alena Prokharchyk c42fceab27 bug 14446: removed elasticLBVm from components.xml
status 14446: resolved fixed
reviewed-by: Frank Zhang
2012-03-22 10:26:48 -07:00
Brian Federle 0db22e44e8 bug 14375
Use 'Management IP Addresses' in place of 'Private IP Addresses' for
label on system dashboards
2012-03-21 11:15:03 -07:00
Jessica Wang baa2acf2f6 cloudstack 3.0 UI - more labels translated. 2012-03-21 09:50:13 -07:00
Jessica Wang 3d327c03be bug 14056: cloudstack 3.0 UI - infrastructure page - zone detail - physical network listView - provide delete action in listView. 2012-03-20 14:31:56 -07:00
bfederle c23f1b8882 UI: Zone wizard update
-Allow for editing of traffic labels within the zone wizard; visible
 by going to the create physical network(s) step and clicking the
 'edit' button under each traffic type.

-Make hypervisor selection part of the create zone step, instead of
 the add cluster step -- this is to allow the physical network UI to
 have the selected hypervisor for the edit traffic labels dialog.

-Show drag-and-drop UI for basic zone setup, so that user can edit
 traffic labels for a basic zone. Note that user can only have one
 physical network here.

-Allow creation of storage traffic in a basic zone configuration, by
 optionally dragging storage traffic type icon to first physical
 network
2012-03-20 13:27:28 -07:00
Jessica Wang 59def829ca cloudstack 3.0 UI - code optimization - seperate code of Enabling Security Group provider code, Adding Netscaler provider, Creating guest network to different functions (to avoid repeating code and to give individual message for each action) 2012-03-20 11:55:09 -07:00
Jessica Wang 20acc4d315 bug 14377: cloudstack 3.0 UI - login - if login fails due to invalid username and password, show a generic error message instead of API returned error message. 2012-03-19 16:04:50 -07:00
bfederle 13864cc66a Add missing resource, max networks, to project resource tab 2012-03-14 16:11:22 -07:00
Jessica Wang 1ada4dc5c2 cloudstack 3.0 UI - Quick Installer - add host step - change text. 2012-03-13 10:50:51 -07:00
abhi ecad50c801 bug 14151,14153: configuration variables are now hidden; added ldapRemove command 2012-03-12 16:50:00 +05:30
Alena Prokharchyk 6910740582 Revert "bug 14151,14153: configuration variables are now hidden; added ldapRemove command"
Reverting the commit in order to fix the build
This reverts commit 0ab0fcfa5c3b8825b8a92e3c2d2dee8e8ca6152b.
2012-03-09 09:53:56 -08:00
abhi b7b751fdf6 bug 14151,14153: configuration variables are now hidden; added ldapRemove command 2012-03-09 16:56:01 +05:30
Jessica Wang 4761b9ec58 cloudstack 3.0 UI - (1) listView widget - add PreFilter() to exclude fields that shouldn't show upon conditions. (2) Instance page - add new field "Internal name" (e.g. "i-3-5-JW") that only shows for root-admin. 2012-03-08 13:30:06 -08:00
Jessica Wang 42df0d9286 bug 13301: fix typo 2012-03-05 14:49:56 -08:00
Jessica Wang 377fa4361f bug 12981: login screen - show explicit error messages when login fails. 2012-03-02 16:43:14 -08:00
Brian Federle d6a8db3826 Move untranslated labels into the 'new' section of properties files 2012-02-24 10:29:46 -08:00
Brian Federle 3a28cfddfa bug 13941
Add missing labels for user dashboard
2012-02-23 15:42:44 -08:00
Brian Federle 856f41bdf8 System, secondary storage UI fixes
-Add state field ('resourcestate') to list view

-Fix destroy action to have proper UI feedback
2012-02-23 15:07:43 -08:00
Jessica Wang 1c1ee6e69c localization files - move translated labels out of new labels section 2012-02-22 19:09:42 -08:00
Jessica Wang b683312df5 check in new Japanese localization file. 2012-02-22 18:30:30 -08:00
Brian Federle d6fc3f9010 Localizaton fixes
-Add conditional CSS for Japanese version

-Fix font wrapping in JA CSS for header bar, system dashboard

-Add some missing localization labels
2012-02-22 17:32:00 -08:00
Brian Federle e0be877706 Zone wizard: UI: Review step
Better final message before launch: make font size larger and
centered; include icon
2012-02-22 14:39:47 -08:00
Jessica Wang 186fe658d6 add new labels to message_ja.properties 2012-02-22 14:13:42 -08:00
Brian Federle 4b5586c8df Fix typo 2012-02-21 19:05:00 -08:00
Brian Federle 240dabea4b Navigation organizational changes
-Rename 'System' -> 'Infrastructure'

-Rename 'service offering' -> 'compute offering'
 (including all associated labels)

-Rename 'Configuration' -> 'Service Offerings'

-Move hypervisor capabilities under global settings

-Rename 'Compute' -> 'Compute and storage'
2012-02-21 18:54:43 -08:00
Jessica Wang 4d4af60690 localize new error message (for add guest network in multiple guest traffic types zone). 2012-02-21 17:08:02 -08:00
Brian Federle c36808d5d2 bug 13765
Properly sync returned sticky fields from the API with the UI form, by
dynamically generating createForm fields based on Lb sticky
capabilities object; this will keep the required and conditional
fields properly up to date with the API requirements.
2012-02-21 15:13:52 -08:00
Brian Federle 52f1f53234 bug 13784: Fix missing status localization 2012-02-21 13:50:30 -08:00
Brian Federle 1ca5612724 bug 13719
Change 'management server'->'hypervisor' in physical network description

status 13719: resolved fixed
2012-02-21 12:56:53 -08:00
Jessica Wang 904825479f property files: move labels that have been translated out of "new labels" area. 2012-02-20 20:07:30 -08:00
Jessica Wang 1d819e63b6 check in Japanese translation. 2012-02-20 17:45:17 -08:00
Jessica Wang 1dfe656f2a bug 13864: IP Address page - add new field Purpose (only shown in Basic zone) 2012-02-20 10:24:08 -08:00
frank a1fa313902 Bug 13568 - secondary storage VM's static route for nfs server breaks things!
status 13568: resolved fixed
reviewed-by: Sheng Yang
2012-02-17 16:24:32 -08:00
Brian Federle f58cec83c6 bug 13702
Fix missing labels for instance state/actions
2012-02-17 16:01:16 -08:00
Brian Federle 80e4b5ef7c Add a few more missing localization labels 2012-02-17 14:12:53 -08:00
Brian Federle f223d8086c Add missing localization for LB UI 2012-02-17 13:54:23 -08:00
Jessica Wang fab34ce8e5 cloudstack 3.0 new UI - system - network chart - localize text in html code. 2012-02-16 18:01:06 -08:00
Jessica Wang 2f682ea904 cloudstack 3.0 new UI - add zone wizard - localize text in html code. 2012-02-16 17:23:44 -08:00
Jessica Wang cddbc4daeb cloudstack 3.0 new UI - localization - move new labels on the top. 2012-02-16 15:55:10 -08:00
Brian Federle 4b2709ceff Add missing localization for instances.js 2012-02-16 15:42:01 -08:00
Jessica Wang c05a040c56 cloudstack 3.0 new UI - add more localization labels. 2012-02-16 15:35:44 -08:00
Jessica Wang 9f86abccbd cloudstack 3.0 new UI - add more localization labels. 2012-02-16 15:25:17 -08:00
Jessica Wang c3c5b65428 cloudstack 3.0 new UI - add more localization labels. 2012-02-16 15:02:37 -08:00
Brian Federle 6d8a11c74b Complete localization for quick install wizard
-- Also separates EULA into an iframe-embedded HTML file
2012-02-16 14:45:10 -08:00
Jessica Wang e8c309b447 cloudstack 3.0 new UI - add more localization labels. 2012-02-16 13:55:56 -08:00
Jessica Wang 577f3a5f75 cloudstack 3.0 new UI - correct localization label format 2012-02-16 12:22:13 -08:00
Jessica Wang 68f12d9753 cloudstack 3.0 new UI - localize messages during zone creation. 2012-02-16 11:23:22 -08:00
Jessica Wang a9e99d3065 cloudstack 3.0 new UI - localize zone wizard. 2012-02-15 19:22:55 -08:00
Jessica Wang 0341d00082 cloudstack 3.0 new UI - system page - localize IP Ranges sections. 2012-02-15 15:52:50 -08:00
Jessica Wang 50fadb4e5c cloudstack 3.0 new UI - system page - localize primary storage section. 2012-02-15 14:59:19 -08:00
Jessica Wang 3536a2e941 cloudstack 3.0 new UI - system page - localize host section. 2012-02-15 14:42:13 -08:00
Jessica Wang 62c4133ed0 cloudstack 3.0 new UI - system page - localize zone actions. 2012-02-15 13:39:09 -08:00
Brian Federle 18bfc4090a WIP: Install wizard localization 2012-02-15 10:16:08 -08:00
Jessica Wang 3d7e423903 cloudstack 3.0 new UI - system page - localize network providers section. 2012-02-14 17:09:46 -08:00
Brian Federle 34999a25ae Projects UI localization
-Dashboard
-New project wizard
-Misc. missing localized strings
2012-02-14 16:00:52 -08:00
Brian Federle 4ed91ab252 Localization for instance wizard 2012-02-14 14:46:21 -08:00
Jessica Wang 55a999415b cloudstack 3.0 new UI - system page - (1) localize management traffic type (2) remove createVlanIPRange after creating guest network for basic zone. Because this AddGuestNetwork dialog is not available in basic zone any more. 2012-02-14 13:48:29 -08:00
Brian Federle 7479fd9b03 Localization for 'Allocated' state 2012-02-14 13:24:21 -08:00
Brian Federle c721344752 Missing detail view widget localization 2012-02-14 12:54:39 -08:00
Brian Federle cd8dd8fe38 Add missing instance detail tab localization 2012-02-14 12:54:39 -08:00
Jessica Wang 2c14d45702 cloudstack 3.0 new UI - system page - localize storage traffic type, public traffic type section. 2012-02-14 12:07:56 -08:00
Brian Federle 6136a598e7 Add missing labels to list view widget 2012-02-14 12:01:05 -08:00
Brian Federle 1f021e3226 Localize global settings 2012-02-14 12:01:04 -08:00
Brian Federle 8246aff812 Add missing localization for notifications labels 2012-02-14 12:01:04 -08:00
Jessica Wang 4d089c270c 3.0 UI - system page - localize KVM/XenServer/VMWare network label default display value. 2012-02-14 11:21:41 -08:00
Brian Federle 4ae31e4fca Translate new message properties 2012-02-14 11:20:25 -08:00
Jessica Wang 012be834b5 3.0 UI - localize Add network offering dialog. 2012-02-13 17:40:45 -08:00
Jessica Wang f25539e6cb 3.0 UI - localize network offering page. 2012-02-13 17:28:14 -08:00
Jessica Wang 17ac271c3e 3.0 UI - localize hypervisor capabilities page. 2012-02-13 16:43:05 -08:00
Brian Federle 744cd902d1 Localize domains section 2012-02-13 15:11:11 -08:00
Brian Federle 5bd1fcba6f Localize accounts/users 2012-02-13 14:57:24 -08:00
Jessica Wang a7b7f42312 3.0 UI - localize system service offering page. 2012-02-13 13:55:37 -08:00
Brian Federle 446ba7a5ec Localize Templates/ISOs 2012-02-13 11:33:42 -08:00
Brian Federle 90fac015a5 Localization for network->ip, security group sections 2012-02-10 13:36:28 -08:00
Brian Federle ef6e0daddb Add all existing messages codes to index.jsp dictionary 2012-02-10 12:30:37 -08:00
Brian Federle 6fed8f102a Localization for network->networks section 2012-02-09 15:58:00 -08:00
Brian Federle f1cd0a482a Localize storage->snapshots section 2012-02-09 15:09:13 -08:00
Brian Federle 2f26cf87b6 Fix some message labels 2012-02-09 14:52:15 -08:00
Brian Federle 9ee043efde Localization for storage->volumes section 2012-02-09 14:15:06 -08:00
Brian Federle 881a46ff54 Localize admin dashboard 2012-02-09 13:16:10 -08:00
Brian Federle 5bfe6be091 Localize more VM states 2012-02-09 12:33:19 -08:00
Brian Federle ea869c5eb7 Localize 'Expunging' state 2012-02-09 12:30:56 -08:00
Brian Federle 32d6e994c3 Localization for projects UI 2012-02-09 12:22:10 -08:00
Brian Federle 9d4437e089 UI localization for core.js 2012-02-09 11:49:31 -08:00
Brian Federle 969ac05171 Add more messages 2012-02-09 11:12:13 -08:00
Brian Federle d2284e4439 UI: localization
-Put localization wrappers around listView, detailView widgets

-Add initial localization for instances section
2012-02-09 10:39:59 -08:00
Alena Prokharchyk 30f9d1d82e Merged listCapacity and ListTopConsumedResources calls. To list most consumed resources, pass sortBy=usage to listCapacity api 2012-02-08 13:33:06 -08:00
Jessica Wang 0d5cc14acc cloudstack 3.0 new UI - localization - add template action. 2012-02-07 12:30:30 -08:00
Nitin Mehta 93b8178f19 Bug 13059: Introduce a new api to list top consumed resources in cloudstack.
Reviewed-By: Kishan
2012-02-06 20:32:40 +05:30
frank 6701bf5563 fix a typo for ovm in components.xml 2012-01-31 14:48:51 -08:00
kishan 8f2cf82b24 Bug 12996: Removed createConfiguration API command
Status 12996: resolved fixed
Reviewed-By: Nitin
2012-01-30 14:36:50 +05:30
Alena Prokharchyk a8758d292e ElasticLB support in Basic zone.
When elb capability is enabled on the network offering, we:

1) on each createLB command:
* associate ip address to the LB rule owner
* create LB rule

2) on each deleteLb command:
* delete the rule
* disassociate ip address

The rule belongs to the owner, so proper usage events are generated
2012-01-19 13:57:37 -08:00
Alena Prokharchyk 5adfc9953f Can enable/disable static nat and create IpForwarding/Firewall rules in Basic zone now.
Made Netscaler a StaticNat/Firewall provider. Murali will take care of actual implementation on the backend.
2012-01-19 13:56:59 -08:00
Alena Prokharchyk ff1e8413f1 1) Added StaticNat/Firewall/Lb capabilities to Netscaler element. Renamed it to "NetscalerElement" from NetscalerLoadBalancingElement as it serves more services now
2) Added elasticIp and elasticLb network capabilities. Provided support to create network offering with these capabilities.
3) Added one more default network offering having elasticip and elasticlb
4) Public network support to Basic zone. You can associate/disassociate IP addresses now
2012-01-19 13:56:59 -08:00
anthony 0156ec7cdd bug 11497:
1. remove Garbagecollection primary storage allocator. other storage allocators fails may because there is primary storage with the same tag, it is not caused by no primary storage capacity.
2. delete template will try to delete templates in secondary storage in the API.

status 11497: resolved fixed

GarbageCollecting

Conflicts:

	server/src/com/cloud/template/HyervisorTemplateAdapter.java
2012-01-12 16:20:44 -08:00
Edison Su d65c6e765d fix netapp related commands 2012-01-12 15:22:01 -08:00
Edison Su 3aa9a312b4 seems netapp part of code is missing due to merge
Revert "bug 10837: rename api related to netapp"

This reverts commit 5db6b500dd1bbb96bfddbd7eda6cf1f616e2e0f9.

Conflicts:

	api/src/com/cloud/api/commands/MigrateVolumeCmd.java
	client/tomcatconf/commands-ext.properties.in
2012-01-12 15:17:27 -08:00
frank 478dc04108 Bug 11357 - cloud-management dead but pid file exists
flesh out details information when PID file still existing while management server already died

status 11357: resolved fixed
2012-01-12 13:54:00 -08:00
frank 391f3e8b30 Bug 12777 - Add storage network configuration into CloudStack
fix typo: changing ListTafficTypeImplementorsCmd to ListTrafficTypeImplementorsCmd
2012-01-09 10:53:08 -08:00
frank 4bb580de86 Bug 12777 - Add storage network configuration into CloudStack
new API: UpdateStorageNetworkIpRangeCmd

Bug 12777: resolved fixed
2012-01-06 11:07:15 -08:00
frank ea422af8a9 Bug 12777 - Add storage network configuration into CloudStack
Let StorageGuru inherit PodBaseNetworkGuru
2012-01-06 11:07:14 -08:00
frank cb6058906d Bug 12777 - Add storage network configuration into CloudStack
add the new API to commands.properties
2012-01-06 11:07:14 -08:00
frank f72940e041 Bug 12777 - Add storage network configuration into CloudStack
most finish
2012-01-06 11:06:18 -08:00
Kelven Yang 74c2506f42 bug 12843: initialize uuid column for tables that have default data content 2012-01-05 17:38:50 -08:00
anthony 12eae7148c SWIFT: listSwift refine 2011-12-22 14:28:27 -08:00
anthony fea9ca582c SWIFT : add listSwift api 2011-12-21 16:55:08 -08:00
frank 011e23b8c4 load ManagementServerExtImpl in component.xml 2011-12-16 10:32:17 -08:00
anthony f436c147b8 SWIFT : add swift api 2011-12-15 11:48:25 -08:00
frank 6e35f93208 Bug 11939 - unify components.xml and components-premium.xml into components.xml
more fix
2011-12-07 13:52:17 -08:00
frank 88e4cdc458 Bug 11939 - unify components.xml and components-premium.xml into components.xml
status 11939: resolved fixed
2011-12-07 11:34:57 -08:00
Abhinandan Prateek 1dee569f0e bug 8313: LDAP connector tested with ApacheDS 2011-12-05 11:51:21 +05:30
Abhinandan Prateek 50a1bfed06 bug 8313: disabling LDAPAuthenticator 2011-12-04 15:42:15 +05:30
Abhinandan Prateek c4f624e7c9 bug 8313: ldap authentication, still need to fix the MD5 encoded password, cuurent authenticator only works with plaintext password 2011-12-04 15:11:06 +05:30
Alena Prokharchyk c106660682 Changed the API commands names to use correct abbreviations 2011-12-01 09:57:46 -08:00
Naredula Janardhana Reddy 09905b641b bug 10617: merge code from branch bug10617. 2011-12-01 14:17:52 +05:30
Naredula Janardhana Reddy e4b5a62402 bug 10796: merging code from branch 2011-11-30 15:03:43 +05:30