Revision f533f224
ID | f533f224c12dd100b22ca6abd9e64aa4e597329a |
Merge branches api-current and ui-0.4, minor fixes
Merge branches api-current and ui-0.4: * Fix merge conflicts * Fix minor bug in reconciliation mgmt command * Add comments in settings.py.dist * minor PEP8 fixes
Files
- added
- modified
- copied
- renamed
- deleted
- api
- contrib
- db
- ganeti
- locale
- logic
- settings.py.dist (diff)
- tools
- ui
- i18n.py (diff)
- static
- body-bg.png
- body-bg2.png
- close-popup.png
- disks-icon.png
- dropdown-arrow.gif
- footer-bg.png
- header-bg.png
- icon-view.png (diff)
- icons
- indicators
- machines
- large
- archlinux-off.png
- archlinux-on.png
- centos-off.png
- centos-on.png
- debian-off.png
- debian-on.png
- fedora-off.png
- fedora-on.png
- freebsd-off.png
- freebsd-on.png
- gentoo-off.png
- gentoo-on.png
- netbsd-off.png
- netbsd-on.png
- openbsd-off.png
- openbsd-on.png
- redhat-off.png
- redhat-on.png
- slackware-off.png
- slackware-on.png
- suse-off.png
- suse-on.png
- ubuntu-off.png
- ubuntu-on.png
- unknown-off.png
- unknown-on.png
- windows-off.png
- windows-on.png
- medium
- archlinux-off.png
- archlinux-on.png
- centos-off.png
- centos-on.png
- debian-off.png
- debian-on.png
- fedora-off.png
- fedora-on.png
- freebsd-off.png
- freebsd-on.png
- gentoo-off.png
- gentoo-on.png
- netbsd-off.png
- netbsd-on.png
- openbsd-off.png
- openbsd-on.png
- redhat-off.png
- redhat-on.png
- slackware-off.png
- slackware-on.png
- suse-off.png
- suse-on.png
- ubuntu-off.png
- ubuntu-on.png
- unknown-off.png
- unknown-on.png
- windows-off.png
- windows-on.png
- small
- archlinux-off.png
- archlinux-on.png
- centos-off.png
- centos-on.png
- debian-off.png
- debian-on.png
- fedora-off.png
- fedora-on.png
- freebsd-off.png
- freebsd-on.png
- gentoo-off.png
- gentoo-on.png
- netbsd-off.png
- netbsd-on.png
- openbsd-off.png
- openbsd-on.png
- redhat-off.png
- redhat-on.png
- slackware-off.png
- slackware-on.png
- suse-off.png
- suse-on.png
- ubuntu-off.png
- ubuntu-on.png
- unknown-off.png
- unknown-on.png
- windows-off.png
- windows-on.png
- large
- os
- jQueryRotate.js
- list-view.png (diff)
- machines
- archlinux-off.png
- archlinux-on.png
- centos-off.png
- centos-on.png
- debian-off.png
- debian-on.png
- freebsd-off.png
- freebsd-on.png
- gentoo-off.png
- gentoo-on.png
- netbsd-off.png
- netbsd-on.png
- openbsd-off.png
- openbsd-on.png
- redhat-off.png
- redhat-on.png
- slackware-off.png
- slackware-on.png
- suse-off.png
- suse-on.png
- ubuntu-off.png
- ubuntu-on.png
- unknown-off.png
- unknown-on.png
- windows-off.png
- windows-on.png
- machines-icon.png
- main.css (diff)
- meta-edit.png
- meta-remove.png
- meta-save.png
- meta-wiz-bg.png
- meta-wiz-inner-bg.png
- networks-icon.png
- okeanos.png
- okeanos_console.png
- os_logos
- archlinux-off.png
- archlinux.png
- centos-off.png
- centos.png
- debian-off.png
- debian.png
- fedora-off.png
- fedora.png
- freebsd-off.png
- freebsd.png
- gentoo-off.png
- gentoo.png
- netbsd-off.png
- netbsd.png
- openbsd-off.png
- openbsd.png
- redhat-off.png
- redhat.png
- slackware-off.png
- slackware.png
- suse-off.png
- suse.png
- ubuntu-off.png
- ubuntu.png
- unknown-off.png
- unknown.png
- windows-off.png
- windows.png
- popup-bg.png
- popup-inner-bg.png
- progress.gif
- single-view.png (diff)
- synnefo.js (diff)
- vncviewer
- AuthPanel.class
- ButtonPanel.class
- CapabilityInfo.class
- CapsContainer.class
- ClipboardFrame.class
- DesCipher.class
- HTTPConnectSocket.class
- HTTPConnectSocketFactory.class
- InStream.class
- MemInStream.class
- OptionsFrame.class
- RecordingFrame.class
- ReloginPanel.class
- RfbProto.class
- SessionRecorder.class
- SocketFactory.class
- VncCanvas.class
- VncCanvas2.class
- VncViewer.class
- VncViewer.jar (diff)
- ZlibInStream.class
- wave.gif
- templates
- footer.html
- home.html (diff)
- list.html
- machine_console.html
- machines.html (diff)
- machines_console.html
- machines_icon.html
- machines_list.html
- machines_single.html
- networks.html (diff)
- standard.html
- tests.py (diff)
- urls.py (diff)
- views.py (diff)