Re: Planning a freeze on website changes to merge new designs

2021-01-19 Thread Agnieszka Sell
Hey Brian and Robert, Will you be available tomorrow at 8 am PT to join Beam website review? After the usual update we could discuss how we should approach the merges. I sent you an invitation to the meeting. In case it doesn't work for you, Jakub and I are available for a call on Thursday at 9

Re: Planning a freeze on website changes to merge new designs

2021-01-14 Thread Jakub Sadowski
'You could add the shortcode files on master (modified so they work with the current website) in addition to the content changes.' If I understand correctly you mean modifying shortcodes so they work no with new styles, icons and javascript files but the ones from master branch? On Thu, Jan 14,

Re: Planning a freeze on website changes to merge new designs

2021-01-13 Thread Robert Bradshaw
OK, so the current status is that changes are being reviewed and merged into a separate website-revamp branch. There are several reasons we could want to do this (e.g. could the changes not be made incrementally, or was there a strong desire to launch the new site "all at once"), but at some point

Re: Planning a freeze on website changes to merge new designs

2021-01-13 Thread Brian Hulette
On Wed, Jan 13, 2021 at 9:09 AM Jakub Sadowski wrote: > Hi guys, > unfortunately option 1 is not really possible, because most of the new > content files are importing shortcodes files so if we merge only content > without layouts, these pages won't compile. > You could add the shortcode files

Re: Planning a freeze on website changes to merge new designs

2021-01-13 Thread Jakub Sadowski
Hi guys, unfortunately option 1 is not really possible, because most of the new content files are importing shortcodes files so if we merge only content without layouts, these pages won't compile. The only reasonable option is to freeze the website and merge it then. My proposition is to merge it

Re: Planning a freeze on website changes to merge new designs

2021-01-12 Thread Brian Hulette
On Mon, Jan 11, 2021 at 11:00 AM Robert Bradshaw wrote: > On Mon, Jan 11, 2021 at 10:38 AM Brian Hulette > wrote: > >> I spoke with Gris and Agnieszka about this on Friday. I should probably >> fill in the background a bit. >> >> The strategy we've adopted ro review the new designs so far is

Re: Planning a freeze on website changes to merge new designs

2021-01-11 Thread Robert Bradshaw
On Mon, Jan 11, 2021 at 10:38 AM Brian Hulette wrote: > I spoke with Gris and Agnieszka about this on Friday. I should probably > fill in the background a bit. > > The strategy we've adopted ro review the new designs so far is pretty > similar to what Robert proposed, except rather than having a

Re: Planning a freeze on website changes to merge new designs

2021-01-11 Thread Brian Hulette
I spoke with Gris and Agnieszka about this on Friday. I should probably fill in the background a bit. The strategy we've adopted ro review the new designs so far is pretty similar to what Robert proposed, except rather than having a separate directory and merging PRs to the master branch, they've

Re: Planning a freeze on website changes to merge new designs

2021-01-11 Thread Robert Bradshaw
A site-wide freeze during which there was a huge, rushed code dump was not the most effective way to manage or review the large website changes last time, and I don't think it would be a good idea to attempt that again. Instead, can we create a parallel directory/site in our repo, incrementally

Planning a freeze on website changes to merge new designs

2021-01-10 Thread Griselda Cuevas
Hi folks, As you know we've been working on a revamp for the website, and we're getting ready to commit the work we've done. In order to minimize the risk of losing changes other contributors make during this period, we'd like to plan a freeze so we can work on making the revamp commits. A freeze