codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-05 16:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3-stable' of deluge-torrent.org:deluge into 1.3-stable

Browse Source
This commit is contained in:
Damien Churchill 2012-01-17 16:58:29 +00:00
commit 2600785cbb
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -12,11 +12,20 @@
* #1934: Fix Unicode error in AddTorrent Dialog * #1934: Fix Unicode error in AddTorrent Dialog
* #1957: Fix keyerror when adding columns for non-latin languages * #1957: Fix keyerror when adding columns for non-latin languages
* #1969: Fix menu item 'Quit & Shutdown' still available when not connected to daemon * #1969: Fix menu item 'Quit & Shutdown' still available when not connected to daemon
* #1895: Fix Files Tab showing wrong files due to torrent_info race condition
* #2010: Move speed text in titlebar to the beginning
==== WebUI ==== ==== WebUI ====
* Fix Webui files-tab menu setting wrong priority * Fix Webui files-tab menu setting wrong priority
* Update to ExtJS 3.4.0 * Update to ExtJS 3.4.0
* #1960: Fix statustab showing total_payload_download for upload as well * #1960: Fix statustab showing total_payload_download for upload as well
* Remove uneeded Titlebar to save space
* Fix clipped Browse button in WebUI
* #1915: Fix being unable to stop the status bar from autohiding
* Fix password box focus issue in Firefox
* Fix plugin uploads from behind a reverse proxy
* #2010: Move speed text in titlebar to the beginning
* #1936: Fix Referenced before assignment error in json_api
==== Console ==== ==== Console ====
* #1953: Fix flickering on every update * #1953: Fix flickering on every update

2
deluge/ui/web/js/deluge-all/Toolbar.js
View File

@ -197,5 +197,3 @@ Deluge.Toolbar = Ext.extend(Ext.Toolbar, {
deluge.add.show(); deluge.add.show();
} }
}); });
deluge.toolbar = new Deluge.Toolbar();

1
deluge/ui/web/js/deluge-all/UI.js
View File

@ -55,6 +55,7 @@ deluge.ui = {
deluge.preferences = new Deluge.preferences.PreferencesWindow(); deluge.preferences = new Deluge.preferences.PreferencesWindow();
deluge.sidebar = new Deluge.Sidebar(); deluge.sidebar = new Deluge.Sidebar();
deluge.statusbar = new Deluge.Statusbar(); deluge.statusbar = new Deluge.Statusbar();
deluge.toolbar = new Deluge.Toolbar();
this.detailsPanel = new Ext.Panel({ this.detailsPanel = new Ext.Panel({
id: 'detailsPanel', id: 'detailsPanel',