Merge lp://staging/~yarkot/web2conf/badge_support into lp://staging/web2conf

This is what is up on us3.pycon.org;

There are a few more details that I like to see change which have not yet (i.e. - t2.search now seems to show headings - which messes up search for badges; I'll see if it's configurable, else change to take t2 from within web2conf/modules, and change t2 in there).

Also - details like email, text, etc. are not yet updated.

In modules/0.py, there is now a variable - DEV_TEST - which disables email verification and recaptcha checks (for development tests); set it to either True or False.

Regards,

Yarko

It refuses to merge. says you branch "has no common ancestor and no
merge base revision was specified" what should I do?

Massimo

On Jan 19, 2009, at 1:08 PM, yarko wrote:

> yarko has proposed merging lp:~yarkot1/web2conf/badge_support into
> lp:web2conf.
>
> Requested reviews:
> Massimo (mdipierro)
>
> This is what is up on us3.pycon.org;
>
> There are a few more details that I like to see change which have
> not yet (i.e. - t2.search now seems to show headings - which messes
> up search for badges; I'll see if it's configurable, else change to
> take t2 from within web2conf/modules, and change t2 in there).
>
> Also - details like email, text, etc. are not yet updated.
>
> In modules/0.py, there is now a variable - DEV_TEST - which disables
> email verification and recaptcha checks (for development tests);
> set it to either True or False.
>
> Regards,
>
> Yarko
> --
> https://code.launchpad.net/~yarkot1/web2conf/badge_support/+merge/2963
> You are requested to review the proposed merge of lp:~yarkot1/
> web2conf/badge_support into lp:web2conf.

try:
$ bzr merge --pull

Since what I have already has all that the trunk has (and is based on it)
this should work.

Let me know.

FYI - for pycon.org, I'm am putting back the old t2.itemize (pre-Iceberg) -
I'm just swapping which is commented; this will break "pagination" - but
Iceberg's version is too wide, doesn't seem to control which columns it
shows... so this is the fastest way for now.

Also - Carl's code does not work, because his libraries don't load on the
server... I'm sure he'll fix it, but in the meantime I have put all his
import calls inside of the functions that need them, and if something
specific is missing then I flash a message and return to the default/index
page - since the badge printing will only be done by admins, this should be
ok.

Regards,
Yarko

On Mon, Jan 19, 2009 at 9:42 PM, Massimo <email address hidden> wrote:

> It refuses to merge. says you branch "has no common ancestor and no
> merge base revision was specified" what should I do?
>
> Massimo
>
> On Jan 19, 2009, at 1:08 PM, yarko wrote:
>
> > yarko has proposed merging lp:~yarkot1/web2conf/badge_support into
> > lp:web2conf.
> >
> > Requested reviews:
> > Massimo (mdipierro)
> >
> > This is what is up on us3.pycon.org;
> >
> > There are a few more details that I like to see change which have
> > not yet (i.e. - t2.search now seems to show headings - which messes
> > up search for badges; I'll see if it's configurable, else change to
> > take t2 from within web2conf/modules, and change t2 in there).
> >
> > Also - details like email, text, etc. are not yet updated.
> >
> > In modules/0.py, there is now a variable - DEV_TEST - which disables
> > email verification and recaptcha checks (for development tests);
> > set it to either True or False.
> >
> > Regards,
> >
> > Yarko
> > --
> > https://code.launchpad.net/~yarkot1/web2conf/badge_support/+merge/2963
> > You are requested to review the proposed merge of lp:~yarkot1/
> > web2conf/badge_support into lp:web2conf.
>
> --
> https://code.launchpad.net/~yarkot1/web2conf/badge_support/+merge/2963
> You are subscribed to branch lp:~yarkot1/web2conf/badge_support.
>

web2conf mdipierro$ bzr merge --pull https://launchpad.net/~yarkot1/web2conf/badge_support
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.
web2conf mdipierro$

what is wrong?

Massimo

________________________________________
From: <email address hidden> [<email address hidden>] On Behalf Of yarko [<email address hidden>]
Sent: Monday, January 19, 2009 10:09 PM
To: DiPierro, Massimo
Subject: Re: [Merge] lp:~yarkot1/web2conf/badge_support into lp:web2conf

try:
$ bzr merge --pull

Since what I have already has all that the trunk has (and is based on it)
this should work.

Let me know.

FYI - for pycon.org, I'm am putting back the old t2.itemize (pre-Iceberg) -
I'm just swapping which is commented; this will break "pagination" - but
Iceberg's version is too wide, doesn't seem to control which columns it
shows... so this is the fastest way for now.

Also - Carl's code does not work, because his libraries don't load on the
server... I'm sure he'll fix it, but in the meantime I have put all his
import calls inside of the functions that need them, and if something
specific is missing then I flash a message and return to the default/index
page - since the badge printing will only be done by admins, this should be
ok.

Regards,
Yarko

On Mon, Jan 19, 2009 at 9:42 PM, Massimo <email address hidden> wrote:

> It refuses to merge. says you branch "has no common ancestor and no
> merge base revision was specified" what should I do?
>
> Massimo
>
> On Jan 19, 2009, at 1:08 PM, yarko wrote:
>
> > yarko has proposed merging lp:~yarkot1/web2conf/badge_support into
> > lp:web2conf.
> >
> > Requested reviews:
> > Massimo (mdipierro)
> >
> > This is what is up on us3.pycon.org;
> >
> > There are a few more details that I like to see change which have
> > not yet (i.e. - t2.search now seems to show headings - which messes
> > up search for badges; I'll see if it's configurable, else change to
> > take t2 from within web2conf/modules, and change t2 in there).
> >
> > Also - details like email, text, etc. are not yet updated.
> >
> > In modules/0.py, there is now a variable - DEV_TEST - which disables
> > email verification and recaptcha checks (for development tests);
> > set it to either True or False.
> >
> > Regards,
> >
> > Yarko
> > --
> > https://code.launchpad.net/~yarkot1/web2conf/badge_support/+merge/2963
> > You are requested to review the proposed merge of lp:~yarkot1/
> > web2conf/badge_support into lp:web2conf.
>
> --
> https://code.launchpad.net/~yarkot1/web2conf/badge_support/+merge/2963
> You are subscribed to branch lp:~yarkot1/web2conf/badge_support.
>

--
https://code.launchpad.net/~yarkot1/web2conf/badge_support/+merge/2963
You are requested to review the proposed merge of lp:~yarkot1/web2conf/badge_support into lp:web2conf.