shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity
13,268 Commits 77 Branches 204 Tags
Commit Graph

13268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tino Vazquez
53f73b80c7 Merge branch 'F-4373' of https://github.com/juanmont/one into juanmont-F-4373 2016-11-15 19:57:23 +01:00
Tino Vázquez
7c05a28fbb Merge pull request #152 from juanmont/F-4839 
F #4839 Added a new login error when oned is not running
 2016-11-15 19:49:19 +01:00
juanmont
d2c0dd6853 F #4373 Added a custom css file in css folder 
- changed some SCSS file to work with labels
 - Added link custom.css in index.erb
 2016-11-15 17:55:10 +01:00
juanmont
50410be943 F #4839 Added a new login error when oned is not running 2016-11-15 17:52:25 +01:00
Tino Vázquez
c24dcad2f1 Merge pull request #150 from juanmont/master 
B #4767 removed input persistent image when you select CDROM
 2016-11-15 16:25:39 +01:00
juanmont
375d146406 B #4767 removed input persistent image when you select CDROM 2016-11-15 16:21:38 +01:00
Tino Vázquez
2565f29b0b Merge pull request #148 from n40lab/F4584_enhanced_storagedrs 
F5484 Enhance StorageDRS allowing VM deployment
 2016-11-15 16:00:34 +01:00
mcabrerizo
bb1ae39f4e F5484 Enhance StorageDRS allowing VM deployment 2016-11-15 14:20:41 +01:00
Tino Vázquez
9dd1c7fd10 Merge pull request #146 from n40lab/B4897 
Fix B4897 NIC is not removed from vCenter if you detach a NIC when in POWEROFF
 2016-11-14 19:58:01 +01:00
juanmont
ffbe120dd0 F #4838 and F #4826 (buttons.js new variable) (#145) 
* B #4838 change color VNC

 - Ctrl-alt-del change to red
 - close change to grey

* F #4826 new tag for buttons
 2016-11-14 12:49:17 +01:00
Tino Vázquez
8383424009 Merge pull request #135 from juanmont/B-4799 
B #4799 Sunstone sort by IP
 2016-11-14 12:20:59 +01:00
Javi Fontan
e2bc33bdf1 Revert "merge with origin/master" 
This reverts commit 5e231696890334871be82d92c966f88e0ddd5a2d.
 2016-11-14 11:45:15 +01:00
Tino Vazquez
be09537a83 Merge branch 'feature-2921' 2016-11-11 13:21:15 +01:00
Tino Vázquez
9a162e9f64 Merge pull request #141 from juanmont/feature-2921 
Added DISKIO graphs in storage tab of VMs
 2016-11-11 13:20:38 +01:00
Tino Vázquez
01039ee7c6 Merge pull request #143 from n40lab/feature-2921 
F2921: : get disk IO information from vcenter
 2016-11-11 12:57:55 +01:00
Jaime Melis
084b154978 B #4909: TAGS attribute are not being set in EC2 2016-11-11 11:11:51 +01:00
Tino Vazquez
5f2b9a62d2 Fix typo 2016-11-10 15:57:36 +01:00
Javi Fontan
17d1886ca6 F #4898: add max_upload_file_size to sunstone conf 2016-11-10 15:40:32 +01:00
Javi Fontan
e4fbee2c7e Merge pull request #144 from juanmont/F-4898 
F-4898 set max upload file in sunstone
 2016-11-10 15:17:17 +01:00
mcabrerizo
3cbd3e7964 Fix B4897. Clean up 2016-11-09 20:17:52 +01:00
juanmont
e9e6bfd27e Merge branch 'feature-2921' of https://github.com/OpenNebula/one into feature-2921 2016-11-09 20:12:40 +01:00
juanmont
5e23169689 merge with origin/master 2016-11-09 20:12:23 +01:00
mcabrerizo
bf58b09e4b Fix B4897 2016-11-09 20:12:08 +01:00
juanmont
e115900c65 F-2921 Added new function isDiskGraphsSopported 2016-11-09 20:11:45 +01:00
juanmont
e9fa4cb3c5 removed console.log 2016-11-09 19:45:04 +01:00
mcabrerizo
7ac51227ab Add MONITORING elements for vCenter 2016-11-09 16:41:29 +01:00
vagrant
2481db726a F#2921 Add vcenter disks I/O information 2016-11-09 15:29:36 +00:00
Tino Vázquez
646f7520fa Merge pull request #140 from n40lab/B4749 
Fix duplicated NICs issue
 2016-11-08 19:20:57 +01:00
Tino Vázquez
32ed883d28 Merge pull request #137 from juanmont/F-4841 
F #4841 IE Compatibility mode force off
 2016-11-08 19:07:42 +01:00
Tino Vázquez
e54dd154c1 Merge pull request #136 from juanmont/B-4800 
B #4800 Sunstone show IP on main info page
 2016-11-08 19:06:58 +01:00
Tino Vázquez
ac06922975 Merge pull request #133 from juanmont/feature-4826 
F #4826: Confirm all vms actions
 2016-11-08 18:53:32 +01:00
juanmont
fb5d36e96e F-4898 set max upload file in sunstone 2016-11-08 15:21:47 +01:00
mcabrerizo
1205d23e60 Fix duplicated NICs issue 2016-11-08 12:46:53 +01:00
Corey Melanson
0a91d6e941 work around cleanup bug for vms with multiple nics 2016-11-08 12:45:32 +01:00
mcabrerizo
1c61d158a0 Test fix 2016-11-08 11:47:05 +01:00
Sledge Sulaweyo
ad74e4fe2d B #4656: EC2QueryServer.rb redender launch time using the utc xmlschema 
The resulting string before/after this change:

Time.at(Time.now).xmlschema
=> "2016-11-05T22:11:37+01:00"

Time.at(Time.now).utc.xmlschema
=> "2016-11-05T21:11:34Z"
 2016-11-05 22:12:37 +01:00
Laurent Grawet
1ba3862b64 vnm_mad: Use absolute instead of relative path to require scripts in vnmmad-load.d directory (#139) 2016-11-05 21:46:15 +01:00
Laurent Grawet
9c92e6ea1e tm_mad: fix wrong variable names that prevents execution of migrate_other (#138) 2016-11-05 21:24:28 +01:00
Javi Fontan
72603252f5 Merge branch 'feature-4888' 2016-11-04 11:31:30 +01:00
Roy Keene
f46d64f785 B #4896: xpath.rb can't print XPath-specified attributes 
Signed-off-by: Ruben S. Montero <rsmontero@opennebula.org>
 2016-11-04 11:02:20 +01:00
Javi Fontan
4c555b0d16 B #4895: onedb fsck breaks with volatile disks 2016-11-03 18:06:29 +01:00
juanmont
21a088d548 F #4841 IE Compatibility mode force off 
- new tag meta in index.erb and login.erb for force the compatibility mode off
 2016-11-03 17:05:00 +01:00
Javi Fontan
33b30089f5 F #4888: Check if bridge contains incorrect vlan 2016-11-03 15:45:31 +01:00
Javi Fontan
a46863fab0 F 2921: get disk IO information from kvm probes 2016-10-31 18:37:15 +01:00
juanmont
21913d5825 B #4800 Sunstone show IP on main info page 2016-10-31 13:17:54 +01:00
juanmont
8dd9da2cd3 B #4799 Sunstone sort by IP 2016-10-31 13:14:39 +01:00
juanmont
cccffde4a6 F #4826: Confirm all vms actions 
- new tag 'confirm_vms' in .yalm files
 - change in users: cloud, admin and groupadmin
 2016-10-31 13:05:10 +01:00
Javi Fontan
b43bc21b1a Merge pull request #132 from winem/issue-4882 
regex match from the beginning to the end of the string in nic_deacti…
 2016-10-31 11:48:54 +01:00
Marcel Weinberg
c8cf25aa88 extended regex to match the chains in deactivate_nic 2016-10-31 10:01:26 +01:00
Marcel Weinberg
4d3f6b2e47 regex match from the beginning to the end of the string in nic_deactivate 2016-10-26 19:49:25 +02:00