lp://qastaging/~unity-team/unity/trusty-1292218

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/unity/7.2

Unity Team: Pending requested 2014-12-08

Diff: 1637 lines (+429/-192)

32 files modified

dash/previews/ErrorPreview.cpp (+1/-0)
dash/previews/PaymentPreview.cpp (+3/-1)
debian/changelog (+11/-0)
launcher/SwitcherView.cpp (+1/-1)
lockscreen/BackgroundSettings.cpp (+13/-11)
lockscreen/BackgroundSettings.h (+0/-1)
lockscreen/CofView.cpp (+15/-2)
lockscreen/CofView.h (+3/-1)
lockscreen/LockScreenAbstractShield.h (+11/-1)
lockscreen/LockScreenController.cpp (+11/-2)
lockscreen/LockScreenController.h (+6/-0)
lockscreen/LockScreenPanel.cpp (+3/-1)
lockscreen/LockScreenSettings.cpp (+2/-0)
lockscreen/LockScreenSettings.h (+2/-1)
lockscreen/LockScreenShield.cpp (+51/-24)
lockscreen/LockScreenShield.h (+9/-3)
lockscreen/LockScreenShieldFactory.cpp (+7/-2)
lockscreen/LockScreenShieldFactory.h (+12/-2)
lockscreen/UserPromptView.cpp (+95/-17)
lockscreen/UserPromptView.h (+5/-4)
plugins/unityshell/src/unityshell.cpp (+1/-1)
plugins/unityshell/src/unityshell.h (+2/-2)
tests/test_lockscreen_controller.cpp (+9/-2)
tests/test_previews_music_payment.cpp (+1/-0)
tests/test_text_input.cpp (+1/-0)
unity-shared/IconTexture.cpp (+1/-1)
unity-shared/SearchBar.cpp (+12/-8)
unity-shared/SearchBar.h (+9/-9)
unity-shared/SearchBarSpinner.h (+0/-2)
unity-shared/SpreadFilter.cpp (+3/-1)
unity-shared/TextInput.cpp (+115/-73)
unity-shared/TextInput.h (+14/-19)

api

Superseded for merging into lp://qastaging/unity

Unity Team: Pending requested 2014-12-08

Diff: 3326 lines (+2717/-60) (has conflicts)

23 files modified

AUTHORS (+7/-0)
CMakeLists.txt (+5/-0)
ChangeLog (+2055/-0)
UnityCore/GnomeSessionManager.cpp (+16/-6)
dash/FilterBasicButton.cpp (+20/-0)
dash/previews/ActionButton.cpp (+16/-0)
dash/previews/Track.cpp (+16/-6)
debian/changelog (+211/-26)
debian/control (+1/-1)
hud/HudButton.cpp (+22/-9)
launcher/ApplicationLauncherIcon.cpp (+16/-0)
launcher/SwitcherView.cpp (+24/-0)
lockscreen/LockScreenController.cpp (+8/-0)
lockscreen/LockScreenController.h (+4/-0)
lockscreen/LockScreenShield.cpp (+35/-0)
lockscreen/UserPromptView.cpp (+4/-0)
po/unity.pot (+70/-3)
services/panel-service.c (+27/-0)
unity-shared/SearchBar.cpp (+7/-0)
unity-shared/TextInput.cpp (+102/-0)
unity-shared/TextInput.h (+25/-0)
unity-shared/TextureCache.cpp (+22/-9)
unity-shared/UnitySettings.cpp (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3807. By Stephen M. Webb on 2014-12-08

Lockscreen: scale the UI elements based on current monitor scaling
(lp: #1292218)

3806. By Stephen M. Webb on 2014-12-08

Share lockscreen password between screens (lp: #1308540)

3805. By Marco Trevisan (Treviño) on 2014-10-29

Preparing for unity 7.2.4

3804. By PS Jenkins bot on 2014-08-26

Releasing 7.2.3+14.04.20140826-0ubuntu1

3803. By Christopher Townsend on 2014-08-26

Release Unity 7.2.3.

3802. By Stephen M. Webb on 2014-08-26

Prepare fixes for upstream micro-release 7.2.3. Fixes: 1283415, 1292391, 1306211, 1312107, 1320051, 1320071, 1324114, 1339629, 1340171, 1340394, 1340477, 1340992, 1340996, 1342208, 1342731, 1347735

3801. By Marco Trevisan (Treviño) on 2014-08-05

* SECURITY UPDATE: more screen locking fixes (LP: #1349128)
  - debian/patches/lp1349128.patch: flush after ungrabbing the keyboard
    in unity-shared/PluginAdapter.cpp, add GrabScreen() function that
    retries to lockscreen/LockScreenController.cpp,
    lockscreen/LockScreenShield.cpp, lockscreen/LockScreenShield.h.

3800. By PS Jenkins bot on 2014-07-14

Releasing 7.2.2+14.04.20140714-0ubuntu1

3799. By Christopher Townsend on 2014-07-14

Release Unity 7.2.2.
Approved by: Stephen M. Webb

3798. By Christopher Townsend on 2014-07-14

Prepare for upstream micro-release 7.2.2 that includes fixes for the following bugs:
Bug #607796: Launcher, Window management - Dragging and holding a selection over an entry in the Launcher should spread out windows belonging to that application
Bug #727902: Launcher icon highlighting should not switch off as soon the cursor moves after the app spread appears.
Bug #741869: Unity/compiz intercepts Super and Alt keypresses from grabbed windows like VMs.
Bug #754580: Cannot move tabs between multiple Firefox or Chromium windows while using Unity unless windows are both unmaximized, unminimized, and visible.
Bug #839728: Launcher - dragging a item on top of a launcher tile that is a valid drop receptacle in the Launcher should cause that launcher tile to glow
Bug #924840: Keyboard shortcuts overlay text too long
Bug #1281058: [UIFe] The system shutdowns when multiple accounts are open
Bug #1283775: Launcher: icon pips are not always updated properly
Bug #1304882: [Regression] Launcher doesn't reappear fully after hiding from DND
Bug #1305586: Lock screen is unusable when some windows have a keyboard/mouse grab
Bug #1307738: Lockscreen caps lock icon drawn under text entry, should be a white icon.
Bug #1308288: Lockscreen warning icon has no tooltip
Bug #1308323: Shutdown/reboot/login/logout dialogs not scaled after toggling UI scale Edit
Bug #1308911: Clipboard contents are accessible within lockscreen
Bug #1309739: Unity launcher icon edge illumination is offset
Bug #1310200: Indicators disappear at the panel (clementine, dropbox, skype etc)
Bug #1313280: Fullscreen window set to "Always on Top" in single-monitor will hide the lockscreen
Bug #1316005: Panel shadow appears over full screen applications w/ locally integrated menus enabled
Bug #1317348: Switcher (Alt-Tab) does not respect monitor-defined scaling factor
Bug #1317356: Shortcut hint does not respect monitor scaling factor
Bug #1317869: Keyboard shortcuts overlay does not show up when workspaces are enabled at 1366x768
Bug #1320438: Unity launcher auto hide fails on screen unlock using "Super+L"
Bug #1321043: [regression] lock screen bypass with touchpad Fixes: 607796, 727902, 741869, 754580, 839728, 924840, 1281058, 1283775, 1304882, 1305586, 1307738, 1308288, 1308323, 1308911, 1309739, 1310200, 1313280, 1316005, 1317348, 1317356, 1317869, 1320438, 1321043
Approved by: Marco Trevisan (Treviño)