I want send another reminder about doing this merge. I know for a fact that the ThemeEditorAction.java in the 1.x branch has code that isn't in the ThemeEditorAction in the 2.x trunk.
-- Allen On Mon, 2005-11-14 at 14:18, Allen Gilliland wrote: > can we also do a full merge of the 1.3 branch into the 2.0. luckily i just > noticed that one of the final changes that i made in the 1.3 branch hasn't > actually been merged into 2.0. > > -- Allen > > > On Mon, 2005-11-14 at 10:10, Dave Johnson wrote: > > On Nov 14, 2005, at 12:42 PM, Allen Gilliland wrote: > > > > > This is a point of debate actually. > > > > I don't debate this one anymore. I agree with Allen and Matt that pages > > should have the tabs. > > > > > > > We can probably handle this one in Roller 2.1 since it would require a > > > reasonable amount of work to put all these pages back into the tab > > > structure. > > > > Yeah, I think it's too late to fix this for 2.1. > > > > - Dave > > > > > > > > > > -- Allen > > > > > > > > > On Sun, 2005-11-13 at 21:07, Matt Raible wrote: > > >> Is the menu (tabs) supposed to always show up for users. I noticed > > >> that it doesn't show up when editing categories, nor bookmarks. > > >> > > >> Matt > > >> > > >> On 11/13/05, Matt Raible <[EMAIL PROTECTED]> wrote: > > >>> When trying to upgrade from 1.3 to 2.0 using the > > >>> 130-to-200-migration.sql script, I got an error: > > >>> > > >>> ERROR 1091 (42000) at line 111: Can't DROP 'webpage_id_index'; check > > >>> that column/key exists > > >>> > > >>> Any ideas? > > >>> > > >>> Matt > > >>> > > >>> On 11/13/05, Matt Raible <[EMAIL PROTECTED]> wrote: > > >>>> I should mention my prod and test environments: > > >>>> > > >>>> Production on Linux: > > >>>> > > >>>> MySQL 3.23.56-Max-log with mysql-connector-java-3.1.10-bin.jar > > >>>> Tomcat 5.0.28 > > >>>> JDK 5 > > >>>> > > >>>> Testing on OS X: > > >>>> > > >>>> MySQL 5.0.15 with mysql-connector-java-3.1.7-bin.jar > > >>>> Tomcat 5.5.9 > > >>>> JDK 5 > > >>>> > > >>>> Matt > > >>>> > > >>>> On 11/13/05, Matt Raible <[EMAIL PROTECTED]> wrote: > > >>>>> I'm testing an upgrade of my site from 1.2 to 1.3, as well as 2.0 > > >>>>> tonight. I'm just finishing up the 1.3 upgrade and I've only found > > >>>>> one issue. > > >>>>> > > >>>>> On raibledesigns.com, if you scroll to the bottom of the page, > > >>>>> there > > >>>>> will be a link on the left side that allows you to navigate to the > > >>>>> previous entry. It seems like it's a bug in 1.2 that I can only > > >>>>> navigate to the single previous entry, rather than a list of > > >>>>> entries. > > >>>>> In 1.3, there is no link at all. Did this functionality get > > >>>>> removed > > >>>>> in 1.3? > > >>>>> > > >>>>> Also, comparing my raibledesigns.com blog to my jroller.com blog, I > > >>>>> noticed there are no navigation links to go to next/prev/main when > > >>>>> viewing a single entry. > > >>>>> > > >>>>> I was able to fix this by adding in "#showNextPreviousLinks()" to > > >>>>> my > > >>>>> theme. However, my main page is _sunsets and is not displayed as a > > >>>>> menu item - but it does show up as the name to navigate back to > > >>>>> from > > >>>>> the #showNextPreviousLinks() macro. > > >>>>> > > >>>>> On to 1.3 to 2.0, then 1.2 to 2.0. Should have the results in less > > >>>>> than an hour. > > >>>>> > > >>>>> Matt > > >>>>> > > >>>>> On 11/13/05, Dave Johnson <[EMAIL PROTECTED]> wrote: > > >>>>>> Thanks to our testers, over the weekend we've found and fixed > > >>>>>> these: > > >>>>>> > > >>>>>> * removed session-factory name argument from Hibernate > > >>>>>> configuration > > >>>>>> file > > >>>>>> * restored missing create-user page > > >>>>>> * restored missing weblog maintenance page > > >>>>>> * added cache flush to save of bookmarks > > >>>>>> * fixed array-index out of bounds problem when no default blogroll > > >>>>>> defined > > >>>>>> > > >>>>>> Are we ready for a new RC, or is there some other evil lurking? > > >>>>>> > > >>>>>> - Dave > > >>>>>> > > >>>>>> > > >>>>> > > >>>> > > >>> > > > > > >
