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
#9263: GenericSetup syntax for importing Sharing page roles
+---
Reporter: optilude|Owner: optilude
Type: PLIP| Status: closed
Priority: major |Milestone: 4.0
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
#9264: Merge backport patches from plone.app.dexterity into Plone
+---
Reporter: optilude|Owner: optilude
Type: PLIP| Status: closed
Priority: major |Milestone: 4.0
#9259: Group dashboards
+---
Reporter: optilude|Owner: optilude
Type: PLIP| Status: closed
Priority: major |Milestone: 4.0
Component: Infrastructure | Reso
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
#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 |
#9272: Exposing and editing Dublin Core properties
---+
Reporter: jaroel |Owner: jaroel
Type: PLIP | Status: closed
Priority: minor |Milestone: 4.0
Component: Templa
#9272: Exposing and editing Dublin Core properties
---+
Reporter: jaroel |Owner: jaroel
Type: PLIP | Status: closed
Priority: minor |Milestone: 4.0
Component: Templa
#9272: Exposing and editing Dublin Core properties
---+
Reporter: jaroel |Owner: jaroel
Type: PLIP | Status: closed
Priority: minor |Milestone: 4.0
Component: Templa
#9272: Exposing and editing Dublin Core properties
---+
Reporter: jaroel |Owner: jaroel
Type: PLIP | Status: closed
Priority: minor |Milestone: 4.0
Component: Templa
#9285: Show blocked portlets in management interface
---+
Reporter: igbun |Owner: igbun
Type: PLIP | Status: assigned
Priority: minor |Milestone: 4.0
Component:
#9285: Show blocked portlets in management interface
---+
Reporter: igbun |Owner: igbun
Type: PLIP | Status: closed
Priority: minor |Milestone: 4.0
Component: Temp
#9286: Allow to show/hide portlets
+---
Reporter: igbun |Owner: igbun
Type: PLIP| Status: assigned
Priority: minor |Milestone: 4.0
Component: Infrastructur
#9286: Allow to show/hide portlets
+---
Reporter: igbun |Owner: igbun
Type: PLIP| Status: closed
Priority: minor |Milestone: 4.0
Component: Infrastructure |
#9250: Add jQuery Tools to base install
+---
Reporter: limi|Owner: smcmahon
Type: PLIP| Status: closed
Priority: minor |Milestone: 4.0
Component: Javascript | Reso
#9256: Expand variable substitution in mailing action of plone.app.contentrules
---+
Reporter: smcmahon |Owner: smcmahon
Type: PLIP | Status: closed
Priority: minor |Mile
#9315: New theme for Plone 4
---+
Reporter: limi |Owner: limi
Type: PLIP | Status: closed
Priority: n/a|Milestone: 4.0
Component: Templates/CSS | Resolutio
18 matches
Mail list logo