- Committer: Tarmac
- Date: 2013-05-15 21:04:22 UTC
- mfrom: (3139.3.2 libunity-7.0-breakage)
- Revision ID: tarmac-20130515210422-k4msqcmekh3aqb89
Resolve conflicts in merging updated autopilot tests.
Approved by Pawel Stolowski, PS Jenkins bot.
Approved by Pawel Stolowski, PS Jenkins bot.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
pch
|
2998.2.1 | 11 years ago | Jussi Pakkanen | Added precompiled header support and enabled it fo |
|
||
ApplicationPreview.cpp |
2419.4.17 | 11 years ago | Nick Dedekind | Merged with lp:~mhr3/unity/update-core-preview-api | 3.2 KB |
|
|
|
ApplicationPreview.h |
2419.4.17 | 11 years ago | Nick Dedekind | Merged with lp:~mhr3/unity/update-core-preview-api | 1.4 KB |
|
|
|
AppmenuIndicator.cpp |
2919.2.2 | 11 years ago | Marco Trevisan (Treviño) | UnityCore, Tests and Panel: update against the new | 1 KB |
|
|
|
AppmenuIndicator.h |
2919.2.2 | 11 years ago | Marco Trevisan (Treviño) | UnityCore, Tests and Panel: update against the new | 1.1 KB |
|
|
|
Categories.cpp |
3074 | 11 years ago | Nick Dedekind | Added type constructor to categoris. | 1.6 KB |
|
|
|
Categories.h |
3074 | 11 years ago | Nick Dedekind | Added type constructor to categoris. | 1.3 KB |
|
|
|
Category.cpp |
3009 | 11 years ago | Nick Dedekind | 100 scopes work | 2 KB |
|
|
|
Category.h |
3009 | 11 years ago | Nick Dedekind | 100 scopes work | 1.4 KB |
|
|
|
CheckOptionFilter.cpp |
3082.1.4 | 11 years ago | Nick Dedekind | Filter bar all button removal | 3.7 KB |
|
|
|
CheckOptionFilter.h |
3082.1.4 | 11 years ago | Nick Dedekind | Filter bar all button removal | 1.5 KB |
|
|
|
CMakeLists.txt |
2791.18.8 | 11 years ago | Manuel de la Pena | Merged generic-payment-preview into error-preview. | 3.8 KB |
|
|
|
DBusIndicators.cpp |
2919.2.3 | 11 years ago | Marco Trevisan (Treviño) | DBusIndicators: use .empty() method | 12.9 KB |
|
|
|
DBusIndicators.h |
2919.2.2 | 11 years ago | Marco Trevisan (Treviño) | UnityCore, Tests and Panel: update against the new | 1.6 KB |
|
|
|
DesktopUtilities.cpp |
2878.1.1 | 11 years ago | Michael Terry | move debian/ packaging inline | 4.4 KB |
|
|
|
DesktopUtilities.h |
2529.14.30 | 11 years ago | Marco Trevisan (Treviño) | DesktopUtilities: add GetDesktopPathById method to | 1.4 KB |
|
|
|
Filter.cpp |
3082.1.3 | 11 years ago | Nick Dedekind | Advanced home scope filters | 5.7 KB |
|
|
|
Filter.h |
3016 | 11 years ago | Nick Dedekind | Connected up client filter updates to scope backen | 2.8 KB |
|
|
|
Filters.cpp |
3082.1.5 | 11 years ago | Nick Dedekind | Fixed State merge row handling | 5.5 KB |
|
|
|
Filters.h |
3082.1.3 | 11 years ago | Nick Dedekind | Advanced home scope filters | 2.2 KB |
|
|
|
GenericPreview.cpp |
2419.4.17 | 11 years ago | Nick Dedekind | Merged with lp:~mhr3/unity/update-core-preview-api | 1 KB |
|
|
|
GenericPreview.h |
2419.4.17 | 11 years ago | Nick Dedekind | Merged with lp:~mhr3/unity/update-core-preview-api | 1.1 KB |
|
|
|
GLibDBusProxy.cpp |
3008.189.31 | 11 years ago | Marco Trevisan (Treviño) | GLibDBusProxy: whitespace cleanup | 18.3 KB |
|
|
|
GLibDBusProxy.h |
3008.189.22 | 11 years ago | Marco Trevisan (Treviño) | GDBusProxy: Add support for property changes callb | 2.9 KB |
|
|
|
GLibDBusServer.cpp |
3008.189.24 | 11 years ago | Marco Trevisan (Treviño) | GLibDBusServer: use glib::String to ensure destruc | 21.4 KB |
|
|
|
GLibDBusServer.h |
3008.133.22 | 11 years ago | Marco Trevisan (Treviño) | GLibDBusServer: adding unnamed server support | 3.4 KB |
|
|
|
GLibSignal-inl.h |
55.14.1 | 11 years ago | Łukasz 'sil2100' Zemczak | * New upstream release. - Software Center add to | 1.8 KB |
|
|
|
GLibSignal.cpp |
2567.1.3 | 11 years ago | Marco Trevisan (Treviño) | GLibSignal: SignalManager, remove an object when u | 3.2 KB |
|
|
|
GLibSignal.h |
2567.1.3 | 11 years ago | Marco Trevisan (Treviño) | GLibSignal: SignalManager, remove an object when u | 2.8 KB |
|
|
|
GLibSource.cpp |
2653.2.4 | 11 years ago | Nick Dedekind | glib::Source Callback function args passed by cons | 7.2 KB |
|
|
|
GLibSource.h |
2653.2.4 | 11 years ago | Nick Dedekind | glib::Source Callback function args passed by cons | 7.1 KB |
|
|
|
GLibWrapper-inl.h |
2470.9.1 | 11 years ago | Michal Hruby | Added Object::IsType method | 2.2 KB |
|
|
|
GLibWrapper.cpp |
3100.1.1 | 11 years ago | Nick Dedekind | Merge with trunk | 3.2 KB |
|
|
|
GLibWrapper.h |
3100.1.1 | 11 years ago | Nick Dedekind | Merge with trunk | 3.7 KB |
|
|
|
GnomeSessionManager.cpp |
3008.181.7 | 11 years ago | Martin Pitt | Provide logind → ConsoleKit fallback for Logout as | 15.3 KB |
|
|
|
GnomeSessionManager.h |
3008.146.29 | 11 years ago | Marco Trevisan (Treviño) | GnomeManager: add TestMode support It will use a | 1.4 KB |
|
|
|
GnomeSessionManagerImpl.h |
3008.181.4 | 11 years ago | Martin Pitt | Rework logind → ConsoleKit/upower fallback Stop l | 2.1 KB |
|
|
|
GSettingsScopes.cpp |
3021 | 11 years ago | Nick Dedekind | Review fixes. Scopes now initialized with ScopeDat | 4 KB |
|
|
|
GSettingsScopes.h |
3021 | 11 years ago | Nick Dedekind | Review fixes. Scopes now initialized with ScopeDat | 1.3 KB |
|
|
|
Hud.cpp |
2866.1.1 | 11 years ago | Tim Penhey | Use the new logging declarations to avoid static i | 6.7 KB |
|
|
|
Hud.h |
2052.1.1 | 12 years ago | Gord Allott | resolves a 2d build issue | 2.9 KB |
|
|
|
Indicator.cpp |
2919.2.2 | 11 years ago | Marco Trevisan (Treviño) | UnityCore, Tests and Panel: update against the new | 3.6 KB |
|
|
|
Indicator.h |
2919.2.2 | 11 years ago | Marco Trevisan (Treviño) | UnityCore, Tests and Panel: update against the new | 2.2 KB |
|
|
|
IndicatorEntry.cpp |
2919.2.2 | 11 years ago | Marco Trevisan (Treviño) | UnityCore, Tests and Panel: update against the new | 4.9 KB |
|
|
|
IndicatorEntry.h |
2919.2.2 | 11 years ago | Marco Trevisan (Treviño) | UnityCore, Tests and Panel: update against the new | 3.4 KB |
|
|
|
Indicators.cpp |
2399.1.23 | 11 years ago | Daniel van Vugt | Rebase on latest lp:unity | 4.8 KB |
|
|
|
Indicators.h |
2919.2.2 | 11 years ago | Marco Trevisan (Treviño) | UnityCore, Tests and Panel: update against the new | 3.1 KB |
|
|
|
MiscUtils.h |
3028 | 11 years ago | Nick Dedekind | Implemented re-opening of channel on reconnection. | 3.8 KB |
|
|
|
Model-inl.h |
3082.1.3 | 11 years ago | Nick Dedekind | Advanced home scope filters | 6.9 KB |
|
|
|
Model.h |
3082.1.3 | 11 years ago | Nick Dedekind | Advanced home scope filters | 3.1 KB |
|
|
|
ModelIterator-inl.h |
3116.1.1 | 11 years ago | Nick Dedekind | Merged with trunk. | 3.4 KB |
|
|
|
ModelIterator.h |
3116.1.1 | 11 years ago | Nick Dedekind | Merged with trunk. | 3 KB |
|
|
|
ModelRowAdaptor-inl.h |
2950.2.3 | 11 years ago | Nick Dedekind | Better testability of dee model rows. | 1 KB |
|
|
|
ModelRowAdaptor.cpp |
3030 | 11 years ago | Nick Dedekind | New libunity scope API. | 2.6 KB |
|
|
|
ModelRowAdaptor.h |
3082.1.3 | 11 years ago | Nick Dedekind | Advanced home scope filters | 2.7 KB |
|
|
|
MoviePreview.cpp |
2419.4.17 | 11 years ago | Nick Dedekind | Merged with lp:~mhr3/unity/update-core-preview-api | 2.2 KB |
|
|
|
MoviePreview.h |
2419.4.17 | 11 years ago | Nick Dedekind | Merged with lp:~mhr3/unity/update-core-preview-api | 1.3 KB |
|
|
|
MultiRangeFilter.cpp |
3082.1.4 | 11 years ago | Nick Dedekind | Filter bar all button removal | 5.3 KB |
|
|
|
MultiRangeFilter.h |
3082.1.4 | 11 years ago | Nick Dedekind | Filter bar all button removal | 1.6 KB |
|
|
|
MusicPreview.cpp |
3093.1.1 | 11 years ago | Nick Dedekind | Updated music preview for serialised track model. | 1.9 KB |
|
|
|
MusicPreview.h |
3065 | 11 years ago | Nick Dedekind | removed old preview code | 1.2 KB |
|
|
|
PaymentPreview.cpp |
2791.18.11 | 11 years ago | Manuel de la Pena | Made changes according to review. | 3.5 KB |
|
|
|
PaymentPreview.h |
2791.18.7 | 11 years ago | Manuel de la Pena | Merged generic-payment-preview into error-preview. | 1.6 KB |
|
|
|
Preview.cpp |
3100.2.3 | 11 years ago | Nick Dedekind | Added unit test for activation-uri preview action | 8 KB |
|
|
|
Preview.h |
3100.2.1 | 11 years ago | Nick Dedekind | support preview action activation-uri hint | 4.1 KB |
|
|
|
PreviewPlayer.cpp |
3068 | 11 years ago | Nick Dedekind | Fixed play/pause/resume. Added player logging. | 4.5 KB |
|
|
|
PreviewPlayer.h |
3064 | 11 years ago | Nick Dedekind | Added preview player to music preview. | 2 KB |
|
|
|
RadioOptionFilter.cpp |
3082.1.4 | 11 years ago | Nick Dedekind | Filter bar all button removal | 4 KB |
|
|
|
RadioOptionFilter.h |
3082.1.4 | 11 years ago | Nick Dedekind | Filter bar all button removal | 1.5 KB |
|
|
|
RatingsFilter.cpp |
3082.1.4 | 11 years ago | Nick Dedekind | Filter bar all button removal | 2.6 KB |
|
|
|
RatingsFilter.h |
3082.1.4 | 11 years ago | Nick Dedekind | Filter bar all button removal | 1.2 KB |
|
|
|
Result.cpp |
3058 | 11 years ago | Nick Dedekind | fixed code review comments | 6.3 KB |
|
|
|
Result.h |
3030 | 11 years ago | Nick Dedekind | New libunity scope API. | 2.9 KB |
|
|
|
Results.cpp |
3009 | 11 years ago | Nick Dedekind | 100 scopes work | 1.7 KB |
|
|
|
Results.h |
3082.1.3 | 11 years ago | Nick Dedekind | Advanced home scope filters | 1.4 KB |
|
|
|
Scope.cpp |
3126.2.3 | 11 years ago | Andrea Azzarone | Remove doubled code. | 10 KB |
|
|
|
Scope.h |
3100.2.1 | 11 years ago | Nick Dedekind | support preview action activation-uri hint | 3.7 KB |
|
|
|
ScopeData.cpp |
3091.5.1 | 11 years ago | Nick Dedekind | Check null pointer string | 2.7 KB |
|
|
|
ScopeData.h |
3047 | 11 years ago | Nick Dedekind | Fixes for unit tests | 1.6 KB |
|
|
|
ScopeProxy.cpp |
3129.2.1 | 11 years ago | Nick Dedekind | Fixed filter update | 28.8 KB |
|
|
|
ScopeProxy.h |
3069 | 11 years ago | Nick Dedekind | Removed UpdatePreviewProperty | 1.5 KB |
|
|
|
ScopeProxyInterface.h |
3078.1.2 | 11 years ago | Nick Dedekind | Fixed issue with search bar finishing spin with an | 2.9 KB |
|
|
|
Scopes.cpp |
3047 | 11 years ago | Nick Dedekind | Fixes for unit tests | 6.9 KB |
|
|
|
Scopes.h |
3031 | 11 years ago | Nick Dedekind | Fixed writable view_type | 2.8 KB |
|
|
|
SessionManager.h |
3008.146.22 | 11 years ago | Marco Trevisan (Treviño) | SessionManager: correctly unown a name and correct | 1.8 KB |
|
|
|
SocialPreview.cpp |
2635.3.38 | 11 years ago | Ken VanDine | cleaned up some comments | 2.8 KB |
|
|
|
SocialPreview.h |
2635.3.38 | 11 years ago | Ken VanDine | cleaned up some comments | 1.8 KB |
|
|
|
Track.cpp |
3067 | 11 years ago | Nick Dedekind | Added track index | 1.7 KB |
|
|
|
Track.h |
3067 | 11 years ago | Nick Dedekind | Added track index | 1.6 KB |
|
|
|
Tracks.cpp |
3107.1.1 | 11 years ago | Nick Dedekind | Autopilot fixes. build 20 | 1.5 KB |
|
|
|
Tracks.h |
2414.1.9 | 11 years ago | Michal Hruby | Implement MusicPreview | 1.2 KB |
|
|
|
unity-core.pc.cmake |
2931.1.1 | 11 years ago | Ricardo Salveti de Araujo | unity-core.pc: should depend on nux-4.0 instead of | 356 bytes |
|
|
|
Variant.cpp |
3112.1.1 | 11 years ago | Nick Dedekind | merge with trunk. | 9.5 KB |
|
|
|
Variant.h |
3057 | 11 years ago | Nick Dedekind | 64bit fixes for vairant builder. | 2.4 KB |
|
|