Merge lp://staging/~julien-spautz/cable/clean-up into lp://staging/cable
Proposed by
Julien Spautz
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 64 | ||||||||||||||||||||
Proposed branch: | lp://staging/~julien-spautz/cable/clean-up | ||||||||||||||||||||
Merge into: | lp://staging/cable | ||||||||||||||||||||
Diff against target: |
4226 lines (+2750/-1267) (has conflicts) 25 files modified
CMakeLists.txt (+26/-4) data/org.pantheon.cable.gschema.xml (+11/-19) po/cable.pot (+57/-75) src/Cable.vala (+85/-248) src/Config.vala.cmake (+7/-7) src/Dialogs/JoinChannel.vala (+97/-0) src/Dialogs/ManageIdentity.vala (+117/-0) src/Dialogs/ManageNetwork.vala (+116/-0) src/Dialogs/Preferences.vala (+214/-0) src/Global.vala (+0/-18) src/Services/Client.vala (+278/-0) src/Services/Identity.vala (+123/-0) src/Services/Network.vala (+103/-0) src/Services/Settings.vala (+146/-0) src/Settings.vala (+0/-23) src/Utils.vala (+69/-0) src/Widgets/Channel.vala (+109/-55) src/Widgets/Room.vala (+276/-63) src/Widgets/Server.vala (+380/-229) src/Widgets/ServerList.vala (+103/-76) src/Widgets/SettingsDialog.vala (+0/-65) src/Widgets/StatusBar.vala (+49/-0) src/Widgets/Welcome.vala (+112/-0) src/Window.vala (+272/-0) src/doodleIRC.vala (+0/-385) Text conflict in src/Widgets/Room.vala |
||||||||||||||||||||
To merge this branch: | bzr merge lp://staging/~julien-spautz/cable/clean-up | ||||||||||||||||||||
Related bugs: |
|
||||||||||||||||||||
Related blueprints: |
GUI Specification
(Essential)
Use Sushi's backend
(High)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Auroral Xylon (community) | Needs Fixing | ||
Julián Unrrein (community) | Needs Fixing | ||
Eduard Gotwig (community) | Needs Fixing | ||
Review via email: mp+168703@code.staging.launchpad.net |
Description of the change
Just testing for conflicts, please don't merge.
To post a comment you must log in.
This is now almost ready for merging. There are still a few regressiong left because of the switch to maki as backend daemon, which I'll try to fix asap so we can continue enhancing cable and implementing new features.