Re: [Framework-Team] Possible problems with plip merging

2009-10-12 Thread Andreas Zeidler
On Oct 10, 2009, at 11:02 AM, Hanno Schlichting wrote: The easiest thing to do right now is to do as Maurits advices and don't rely on Subversion to tell you what needs to be merged. btw, i think you're only gonna need that the first time around, i.e. when subversion hasn't set up the accordi

[PLIP-Advisories] Re: [Plone] #9263: GenericSetup syntax for importing Sharing page roles

2009-10-12 Thread plip-advisories
#9263: GenericSetup syntax for importing Sharing page roles +--- Reporter: optilude|Owner: optilude Type: PLIP| Status: closed Priority: major |Milestone: 4.0

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

2009-10-12 Thread Kees Hink
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' doesn't resolve that last conflict. Does anyone know how to avoid this? esteele suggested merging change

[PLIP-Advisories] Re: [Plone] #9264: Merge backport patches from plone.app.dexterity into Plone

2009-10-12 Thread plip-advisories
#9264: Merge backport patches from plone.app.dexterity into Plone +--- Reporter: optilude|Owner: optilude Type: PLIP| Status: closed Priority: major |Milestone: 4.0

[PLIP-Advisories] Re: [Plone] #9259: Group dashboards

2009-10-12 Thread plip-advisories
#9259: Group dashboards +--- Reporter: optilude|Owner: optilude Type: PLIP| Status: closed Priority: major |Milestone: 4.0 Component: Infrastructure | Reso

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

2009-10-12 Thread Eric Steele
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' doesn't resolve that last conflict. Does anyone know

[PLIP-Advisories] Re: [Plone] #9321: Reimplement the search form with an eye on usability

2009-10-12 Thread plip-advisories
#9321: Reimplement the search form with an eye on usability -+-- Reporter: csenger |Owner: csenger Type: PLIP | Status: closed Priority: minor|Milestone: 4.0 Component: Unknown |

[PLIP-Advisories] Re: [Plone] #9272: Exposing and editing Dublin Core properties

2009-10-12 Thread plip-advisories
#9272: Exposing and editing Dublin Core properties ---+ Reporter: jaroel |Owner: jaroel Type: PLIP | Status: closed Priority: minor |Milestone: 4.0 Component: Templa

[PLIP-Advisories] Re: [Plone] #9272: Exposing and editing Dublin Core properties

2009-10-12 Thread plip-advisories
#9272: Exposing and editing Dublin Core properties ---+ Reporter: jaroel |Owner: jaroel Type: PLIP | Status: closed Priority: minor |Milestone: 4.0 Component: Templa

[PLIP-Advisories] Re: [Plone] #9272: Exposing and editing Dublin Core properties

2009-10-12 Thread plip-advisories
#9272: Exposing and editing Dublin Core properties ---+ Reporter: jaroel |Owner: jaroel Type: PLIP | Status: closed Priority: minor |Milestone: 4.0 Component: Templa

[PLIP-Advisories] Re: [Plone] #9272: Exposing and editing Dublin Core properties

2009-10-12 Thread plip-advisories
#9272: Exposing and editing Dublin Core properties ---+ Reporter: jaroel |Owner: jaroel Type: PLIP | Status: closed Priority: minor |Milestone: 4.0 Component: Templa

[PLIP-Advisories] Re: [Plone] #9285: Show blocked portlets in management interface

2009-10-12 Thread plip-advisories
#9285: Show blocked portlets in management interface ---+ Reporter: igbun |Owner: igbun Type: PLIP | Status: assigned Priority: minor |Milestone: 4.0 Component:

[PLIP-Advisories] Re: [Plone] #9285: Show blocked portlets in management interface

2009-10-12 Thread plip-advisories
#9285: Show blocked portlets in management interface ---+ Reporter: igbun |Owner: igbun Type: PLIP | Status: closed Priority: minor |Milestone: 4.0 Component: Temp

[PLIP-Advisories] Re: [Plone] #9286: Allow to show/hide portlets

2009-10-12 Thread plip-advisories
#9286: Allow to show/hide portlets +--- Reporter: igbun |Owner: igbun Type: PLIP| Status: assigned Priority: minor |Milestone: 4.0 Component: Infrastructur

[PLIP-Advisories] Re: [Plone] #9286: Allow to show/hide portlets

2009-10-12 Thread plip-advisories
#9286: Allow to show/hide portlets +--- Reporter: igbun |Owner: igbun Type: PLIP| Status: closed Priority: minor |Milestone: 4.0 Component: Infrastructure |

[PLIP-Advisories] Re: [Plone] #9250: Add jQuery Tools to base install

2009-10-12 Thread plip-advisories
#9250: Add jQuery Tools to base install +--- Reporter: limi|Owner: smcmahon Type: PLIP| Status: closed Priority: minor |Milestone: 4.0 Component: Javascript | Reso

[PLIP-Advisories] Re: [Plone] #9256: Expand variable substitution in mailing action of plone.app.contentrules

2009-10-12 Thread plip-advisories
#9256: Expand variable substitution in mailing action of plone.app.contentrules ---+ Reporter: smcmahon |Owner: smcmahon Type: PLIP | Status: closed Priority: minor |Mile

[PLIP-Advisories] Re: [Plone] #9315: New theme for Plone 4

2009-10-12 Thread plip-advisories
#9315: New theme for Plone 4 ---+ Reporter: limi |Owner: limi Type: PLIP | Status: closed Priority: n/a|Milestone: 4.0 Component: Templates/CSS | Resolutio