Merge lp://staging/clicompanion into lp://staging/clicompanion/1.0

Proposed by Duane Hinnen
Status: Approved
Approved by: Duane Hinnen
Approved revision: 116
Proposed branch: lp://staging/clicompanion
Merge into: lp://staging/clicompanion/1.0
Diff against target: 5659 lines (+5448/-23) (has conflicts)
25 files modified
.bzrignore (+8/-0)
.clicompanion (+48/-23)
MANIFEST (+23/-0)
clicompanion (+66/-0)
clicompanion.1 (+61/-0)
clicompanionlib/__init__.py (+23/-0)
clicompanionlib/config.py (+353/-0)
clicompanionlib/helpers.py (+186/-0)
clicompanionlib/menus_buttons.py (+253/-0)
clicompanionlib/plugins.py (+249/-0)
clicompanionlib/preferences.py (+708/-0)
clicompanionlib/tabs.py (+598/-0)
clicompanionlib/utils.py (+269/-0)
clicompanionlib/view.py (+575/-0)
data/clicompanion.desktop (+7/-0)
data/clicompanion2.config.debian (+150/-0)
data/clicompanion2.config.ubuntu (+150/-0)
locale/clicompanion.pot (+155/-0)
plugins/CommandLineFU.py (+282/-0)
plugins/LaunchpadURL.py (+62/-0)
plugins/LocalCommandList.py (+808/-0)
plugins/StandardURLs.py (+91/-0)
plugins/__init__.py (+23/-0)
plugins/clfu.py (+243/-0)
setup.py (+57/-0)
Conflict adding file MANIFEST.  Moved existing file to MANIFEST.moved.
Conflict adding file clicompanion.  Moved existing file to clicompanion.moved.
Conflict adding file clicompanionlib.  Moved existing file to clicompanionlib.moved.
Conflict adding file data.  Moved existing file to data.moved.
Conflict adding file locale.  Moved existing file to locale.moved.
Conflict adding file setup.py.  Moved existing file to setup.py.moved.
To merge this branch: bzr merge lp://staging/clicompanion
Reviewer Review Type Date Requested Status
David Caro (community) Needs Information
Duane Hinnen Needs Resubmitting
Review via email: mp+80925@code.staging.launchpad.net

Description of the change

Update from trunk revision 83

To post a comment you must log in.
Revision history for this message
Duane Hinnen (duanedesign) wrote :

clicompanion 1.0 branch not ready for merge. Still has Debian branch, etc

review: Needs Resubmitting
Revision history for this message
stlsaint (stlsaint) wrote :

> clicompanion 1.0 branch not ready for merge. Still has Debian branch, etc

I say we delete the branch all together and start new series for 1.1

lp://staging/clicompanion updated
84. By bdfhjk

Added file for man to use

85. By bdfhjk

Changed version to 1.1

86. By bdfhjk

Actually change the version in setup.py

87. By bdfhjk

removed colors

88. By bdfhjk

Color removed

89. By Duane Hinnen

Edited two lines in MANIFEST file to reflect the actual filenames in the source tree

90. By Duane Hinnen

Edited data/clicompanion.desktop to use the correct name for the icon file (added .16 to end of the line)

91. By Duane Hinnen

fixed commands with errors in clicompanion2.config file

92. By Marek Bardoński

[MERGE] lp:~clicompanion-devs/clicompanion/fix-819038 solving lp:819038

93. By David Caro "<email address hidden>"

Merge from lp:~dcaro/clicompanion/fix-908240.

94. By David Caro "<email address hidden>"

Merged from lp:~dcaro/clicompanion/fix-908235

95. By David Caro "<email address hidden>"

Merged patch for bug lp:802298

96. By David Caro "<email address hidden>"

Merged with patch from bug report lp:802303

97. By David Caro "<email address hidden>"

added more index out of bound controls

98. By David Caro "<email address hidden>"

Merged from p:~dcaro/clicompanion/fix-909893, for bugs: lp:748888, lp:909893

99. By David Caro "<email address hidden>"

Merged from lp:~dcaro/clicompanion/fix-909545 to resolve bugs: lp:909545

Revision history for this message
David Caro (dcaro) wrote :

Not sure if this is applicable anymore. Should we just start from the trunk on the 1.0 series? The bug is fixed in the trunk version (and a lot of thing have changed, like command format and so).

review: Needs Information
lp://staging/clicompanion updated
100. By David Caro "<email address hidden>"

fixed a problem with the searches

101. By David Caro "<email address hidden>"

Merge from lp:~dcaro/clicompanion/fix-910355

102. By David Caro "<email address hidden>"

Merging from lp:~dcaro/clicompanion/fix-608608

103. By David Caro "<email address hidden>"

Merged from lp:~dcaro/clicompanion/fix-913436

104. By David Caro "<email address hidden>"

Merged from lp:~dcaro/clicompanion/fix-614789

105. By David Caro "<email address hidden>"

Merged from lp:~dcaro/clicompanion/fix-915606

106. By Duane Hinnen

merge from lp:~bdfhjk/clicompanion/fix-622063 fixes lp:622063

107. By Duane Hinnen

merge from lp:~dcaro/clicompanion/fix-623475 fixes lp:623475

108. By David Caro "<email address hidden>"

Merged from lp:~dcaro/clicompanion/fix-923535

109. By Marek Bardoński

Merged with lp:~benny/clicompanion/fix-for-946817

110. By Duane Hinnen

Merged from lp:~dcaro/clicompanion/fix-1035073.2 fixes lp:1035073

111. By Duane Hinnen

Merged from lp:~pablorubianes-uy/clicompanion/dev fixes mispelling in LocalCommandList.py

112. By stlsaint

Merge to fix lp:1043706

113. By Marek Bardoński

Added the cheatsheet revert option

114. By Marek Bardoński

Merged from lp:~bdfhjk/clicompanion/fix-627622

115. By Marek Bardoński

Merged from lp:~bdfhjk/clicompanion/fix-951637

116. By Marek Bardoński

Merged from lp:~bdfhjk/clicompanion/fix-1644957

Unmerged revisions

116. By Marek Bardoński

Merged from lp:~bdfhjk/clicompanion/fix-1644957

115. By Marek Bardoński

Merged from lp:~bdfhjk/clicompanion/fix-951637

114. By Marek Bardoński

Merged from lp:~bdfhjk/clicompanion/fix-627622

113. By Marek Bardoński

Added the cheatsheet revert option

112. By stlsaint

Merge to fix lp:1043706

111. By Duane Hinnen

Merged from lp:~pablorubianes-uy/clicompanion/dev fixes mispelling in LocalCommandList.py

110. By Duane Hinnen

Merged from lp:~dcaro/clicompanion/fix-1035073.2 fixes lp:1035073

109. By Marek Bardoński

Merged with lp:~benny/clicompanion/fix-for-946817

108. By David Caro "<email address hidden>"

Merged from lp:~dcaro/clicompanion/fix-923535

107. By Duane Hinnen

merge from lp:~dcaro/clicompanion/fix-623475 fixes lp:623475

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches