Re: Merging branch 'responsive' into master.

On Sun, Aug 25, 2013 at 8:38 PM, Sherif Ramadan <theanomaly.is@gmail.com>wrote: > On Sun, Aug 25, 2013 at 10:18 PM, Levi Morrison <levim@php.net> wrote: > >> Hello list, >> >> I have been busier than I had expected to be when I committed to finishing >> a few things on the responsive branch. I haven't finished them done and >> the >> branch really needs merged back into master asap, so I'm dropping them. I >> know there will be some merge conflicts, which is why I haven't done >> merged >> it back into master already. Unfortunately I'll be busy for a few more >> weeks, so I don't really have the time to work through it right now. If >> someone is willing to do this for me that would be great. If not I'll do >> it >> in a couple weeks when I have time again, but we really need to merge it >> in >> as soon as we can. I should have already done it; I apologize. >> > > I'd be happy to take a look and see what merge conflicts exist and try to > resolve them. Does merging into master have any side effects on the > production side that I should be aware of? If so, what should I look out > for to avoid any screw ups there? I know the current behavior to beta is > handled via cookies at the moment. Is the goal to eradicate that and turn > beta on permanently with this merge? > The goal of this merge is not to eliminate the _beta calls and cookies and such. This one is a UI overhaul with lots of improvements with some regressions (notably auto-complete in search). As far as I know there shouldn't be any side-effects for master for this merge.