Re: [Framework-Team] how to resolve this merge conflict? (PLIP 9310)

Maybe shouldn't have done that. Eric Steele wrote: On Oct 12, 2009, at 7:01 PM, Kees Hink wrote: Merging the branch for PLIP 9310 into the 4.0 branch for CMFPlone, i ran into a conflict i wasn't able to resolve: http://pastie.org/652138 The bottom line is, 'svn resolve --accept working'

[PLIP-Advisories] Re: [Plone] #9309: Better search for East Asian (multi-byte) languages.

#9309: Better search for East Asian (multi-byte) languages. -+-- Reporter: terapyon |Owner: terapyon Type: PLIP | Status: assigned Priority: minor|

[PLIP-Advisories] Re: [Plone] #9310: User registration process more flexible

#9310: User registration process more flexible -+-- Reporter: dokter |Owner: dokter Type: PLIP | Status: assigned Priority: minor|Milestone: 4.0 Component: Unknown |

[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support

#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: assigned Priority: major |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #9310: User registration process more flexible

#9310: User registration process more flexible -+-- Reporter: dokter |Owner: dokter Type: PLIP | Status: closed Priority: minor|Milestone: 4.0 Component: Unknown | Resolution:

[PLIP-Advisories] Re: [Plone] #8805: Do not ship with NuPlone anymore

#8805: Do not ship with NuPlone anymore ---+ Reporter: hannosch |Owner: esteele Type: PLIP | Status: assigned Priority: minor |Milestone: 4.0 Component:

[PLIP-Advisories] Re: [Plone] #8808: Require Python 2.5 or 2.6, Zope 2.12, and CMF 2.2 for Plone 4.0

#8808: Require Python 2.5 or 2.6, Zope 2.12, and CMF 2.2 for Plone 4.0 +--- Reporter: hannosch|Owner: davisagli Type: PLIP| Status: closed Priority: major |

[PLIP-Advisories] Re: [Plone] #8802: Move our upgrade / migration infrastructure to GenericSetup

#8802: Move our upgrade / migration infrastructure to GenericSetup ---+ Reporter: hannosch |Owner: davisagli Type: PLIP | Status: closed Priority: minor |

[PLIP-Advisories] Re: [Plone] #8801: Move action icon support into actions, deprecate CMFActionIcons

#8801: Move action icon support into actions, deprecate CMFActionIcons +--- Reporter: hannosch|Owner: davisagli Type: PLIP| Status: closed Priority: minor |

[PLIP-Advisories] Re: [Plone] #9300: Well formed, valid XHTML

#9300: Well formed, valid XHTML --+- Reporter: benglynn |Owner: benglynn Type: PLIP | Status: assigned Priority: minor |Milestone: 4.0 Component: Unknown | Resolution:

[PLIP-Advisories] Re: [Plone] #9316: Unify folder implementations

#9316: Unify folder implementations +--- Reporter: smcmahon|Owner: witsch Type: PLIP| Status: closed Priority: n/a |Milestone: 4.0 Component: Infrastructure |

[PLIP-Advisories] Re: [Plone] #9309: Better search for East Asian (multi-byte) languages.

#9309: Better search for East Asian (multi-byte) languages. -+-- Reporter: terapyon |Owner: terapyon Type: PLIP | Status: assigned Priority: minor|

[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support

#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: assigned Priority: major |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support

#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: assigned Priority: major |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support

#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: closed Priority: major |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost

#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost

#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost

#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost

#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost

#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: assigned Priority: n/a |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #7822: Make standard file content types use ZODB BLOB support

#7822: Make standard file content types use ZODB BLOB support +--- Reporter: limi|Owner: witsch Type: PLIP| Status: closed Priority: major |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #8814: Replace SecureMailHost with a standard Zope mailhost

#8814: Replace SecureMailHost with a standard Zope mailhost +--- Reporter: hannosch|Owner: alecm Type: PLIP| Status: closed Priority: n/a |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #9186: Set Image IDs from Title field

#9186: Set Image IDs from Title field +--- Reporter: erikrose|Owner: erikrose Type: PLIP| Status: closed Priority: minor |Milestone: 4.0 Component: Archetypes |