Universal Applets

Merge lp://qastaging/~universal-applets-extras-team/universal-applets/univesal-applets-extras into lp://qastaging/universal-applets

univesal-applets-extras
Merge into trunk

Proposed by Natan Yellin on 2008-12-16

Status:	Needs review
Proposed branch:	lp://qastaging/~universal-applets-extras-team/universal-applets/univesal-applets-extras
Merge into:	lp://qastaging/universal-applets
To merge this branch:	bzr merge lp://qastaging/~universal-applets-extras-team/universal-applets/univesal-applets-extras
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Universal Applets Core		2008-12-16	Pending
Review via email: mp+2376@code.qastaging.launchpad.net

Revision history for this message

Natan Yellin (aantny) wrote on 2008-12-16:

This isn't really a merge request, but it looks like this branch was created accidentally by a typo in "univesal-applets-extras".

@Tonny, it seems like some of the files for the WhatsOnTV screenlet are missing. Did you add the files with the command 'bzr add src/YourScreenletDir'?

Revision history for this message

Tonny Vildevall (tonny-vildevall) wrote on 2008-12-16:

Yes. As far i can remember I did so. However when checking in Olive the
files in that folder are marked removed and the files in subfolders are
marked added.

On Tue, 2008-12-16 at 17:25 +0000, Natan Yellin wrote:
> This isn't really a merge request, but it looks like this branch was created accidentally by a typo in "univesal-applets-extras".
>
> @Tonny, it seems like some of the files for the WhatsOnTV screenlet are missing. Did you add the files with the command 'bzr add src/YourScreenletDir'?

Revision history for this message

Natan Yellin (aantny) wrote on 2008-12-19:

That's strange.

Can you try branching a fresh copy of extras, re-adding the files, and then pushing the branch to the proper location.

Unmerged revisions

159. By Tonny Vildevall on 2008-11-19: Initial code from original developer JamesL
158. By Tonny Vildevall on 2008-11-19: Starting up the WhatsOnTV screelet with code from JamesL
157. By Can Berk Güder on 2008-11-18: NFS support, screenlet package file.
156. By ASDFASDF on 2008-11-16: Small fix in rendering Diskusage text
155. By Ketil Wendelbo Aanensen <email address hidden> on 2008-11-14: fix typo: workarround > workaround
154. By Ketil Wendelbo Aanensen <email address hidden> on 2008-11-12: YoutubeScreenlet.py: icon.png > icon.svg
153. By Ketil Wendelbo Aanensen <email address hidden> on 2008-11-12: readded icons for sidebars. still quickfix. replace as needed.
152. By Ketil Wendelbo Aanensen <email address hidden> on 2008-11-12: added icons for sidebars. quickfix. replace as needed.
151. By Ketil Wendelbo Aanensen <email address hidden> on 2008-11-12: Replaced YoutubeScreenlet icon. Needs copyright info. Replace again if you have a better one. Original Youtube logo is copyrighted
150. By Natan Yellin on 2008-11-03: Merged Flowblok's improvements to the Slideshow applet.