Add Learning section to live #164

Merged
merged 7 commits into from Mar 11, 2013

Projects

None yet

4 participants

@ryanpitts
Collaborator

No description provided.

@sinker
Collaborator
sinker commented Mar 11, 2013

WHOOOOOOOOOOOO

On Sun, Mar 10, 2013 at 11:08 PM, Ryan Pitts notifications@github.comwrote:


You can merge this Pull Request by running

git pull https://github.com/mozilla/source development

Or view, comment on, or merge it at:

#164
Commit Summary

  • add all features for Learning section
  • warning for users in RSS feeds on dev
  • Merge pull request #156 from ryanpitts/learning
  • only show 'more' header if there are actually more articles in list
    :/
  • Merge pull request #160 from ryanpitts/learning
  • revisions for Learning section
  • Merge pull request #163 from ryanpitts/learning

File Changes

  • M source/articles/admin.pyhttps://github.com/mozilla/source/pull/164/files#diff-0(1)
  • M source/articles/models.pyhttps://github.com/mozilla/source/pull/164/files#diff-1(86)
  • A source/articles/static/articles/js/jquery.localScroll.min.jshttps://github.com/mozilla/source/pull/164/files#diff-2(7)
  • A source/articles/static/articles/js/jquery.scrollTo.min.jshttps://github.com/mozilla/source/pull/164/files#diff-3(7)
  • A
    source/articles/templates/articles/_article_list_section_overline.htmlhttps://github.com/mozilla/source/pull/164/files#diff-4(1)
  • M source/articles/templates/articles/_base_articles.htmlhttps://github.com/mozilla/source/pull/164/files#diff-5(8)
  • M source/articles/templates/articles/article_detail.htmlhttps://github.com/mozilla/source/pull/164/files#diff-6(36)
  • M source/articles/templates/articles/article_list.htmlhttps://github.com/mozilla/source/pull/164/files#diff-7(2)
  • A source/articles/templates/articles/article_list_learning.htmlhttps://github.com/mozilla/source/pull/164/files#diff-8(63)
  • M source/articles/urls.pyhttps://github.com/mozilla/source/pull/164/files#diff-9(8)
  • M source/articles/views.pyhttps://github.com/mozilla/source/pull/164/files#diff-10(128)
  • M source/base/feeds.pyhttps://github.com/mozilla/source/pull/164/files#diff-11(18)
  • M source/base/static/base/css/app.csshttps://github.com/mozilla/source/pull/164/files#diff-12(201)
  • M source/base/templates/base.htmlhttps://github.com/mozilla/source/pull/164/files#diff-13(5)
  • M source/base/urls.pyhttps://github.com/mozilla/source/pull/164/files#diff-14(14)

Patch Links:

@rossbruniges
Member

Don't forget to scrunch-up the commits!!

On Monday, March 11, 2013, sinker wrote:

WHOOOOOOOOOOOO

On Sun, Mar 10, 2013 at 11:08 PM, Ryan Pitts <notifications@github.com<javascript:_e({}, 'cvml', 'notifications@github.com');>

wrote:


You can merge this Pull Request by running

git pull https://github.com/mozilla/source development

Or view, comment on, or merge it at:

#164
Commit Summary

  • add all features for Learning section
  • warning for users in RSS feeds on dev
  • Merge pull request #156 from ryanpitts/learning
  • only show 'more' header if there are actually more articles in list
    :/
  • Merge pull request #160 from ryanpitts/learning
  • revisions for Learning section
  • Merge pull request #163 from ryanpitts/learning

File Changes

Patch Links:


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/source/pull/164#issuecomment-14696980
.

@kissane
kissane commented Mar 11, 2013

When does this get merged? Do we need to wait on anything?

On Mon, Mar 11, 2013 at 2:07 AM, Ross Bruniges notifications@github.comwrote:

Don't forget to scrunch-up the commits!!

On Monday, March 11, 2013, sinker wrote:

WHOOOOOOOOOOOO

On Sun, Mar 10, 2013 at 11:08 PM, Ryan Pitts <notifications@github.com<javascript:_e({},
'cvml', 'notifications@github.com');>

wrote:


You can merge this Pull Request by running

git pull https://github.com/mozilla/source development

Or view, comment on, or merge it at:

#164
Commit Summary

  • add all features for Learning section
  • warning for users in RSS feeds on dev
  • Merge pull request #156 from ryanpitts/learning
  • only show 'more' header if there are actually more articles in list
    :/
  • Merge pull request #160 from ryanpitts/learning
  • revisions for Learning section
  • Merge pull request #163 from ryanpitts/learning

File Changes

source/articles/templates/articles/_article_list_section_overline.html<
https://github.com/mozilla/source/pull/164/files#diff-4>(1)

Patch Links:


Reply to this email directly or view it on GitHub<
https://github.com/mozilla/source/pull/164#issuecomment-14696980>
.


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/source/pull/164#issuecomment-14698883
.

@rossbruniges
Member

Waiting for:

  • confirmation that everyone is happy with dev (am guessing we are but confirmation appreciated)
  • @ryanpitts to wake up and scrunch his commits
  • me and @ryanpitts to deploy and confirm that things are working as expected
@sinker
Collaborator
sinker commented Mar 11, 2013

Yes, we stress tested this weekend. Very happy.
On Mar 11, 2013 8:53 AM, "Ross Bruniges" notifications@github.com wrote:

Waiting for:


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/source/pull/164#issuecomment-14714107
.

@kissane
kissane commented Mar 11, 2013

Gotcha. You can ignore my email then.

Thanks!

On Mon, Mar 11, 2013 at 9:53 AM, Ross Bruniges notifications@github.comwrote:

Waiting for:


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/source/pull/164#issuecomment-14714107
.

@kissane
kissane commented Mar 11, 2013

Oh, and yeah—we're all good on the Dev review. Completely ready to go.

On Mon, Mar 11, 2013 at 9:53 AM, Ross Bruniges notifications@github.comwrote:

Waiting for:


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/source/pull/164#issuecomment-14714107
.

@sinker
Collaborator
sinker commented Mar 11, 2013

We really need to wait for commit scrunching?
On Mar 11, 2013 8:59 AM, "kissane" notifications@github.com wrote:

Oh, and yeah—we're all good on the Dev review. Completely ready to go.

On Mon, Mar 11, 2013 at 9:53 AM, Ross Bruniges notifications@github.comwrote:

Waiting for:


Reply to this email directly or view it on GitHub<
https://github.com/mozilla/source/pull/164#issuecomment-14714107>
.


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/source/pull/164#issuecomment-14714367
.

@rossbruniges
Member

@sinker it's a less than 60 second job.

I'm waiting for @ryanpitts to be around anyways so won't hold the process up much, if at all - by the time I've jumped onto the VPN and the VM it'll likely be done.

@ryanpitts
Collaborator

Doing the school carpool thing, will be available shortly.

On Mon, Mar 11, 2013 at 8:11 AM, Ross Bruniges notifications@github.com
wrote:

@sinker it's a less than 60 second job.

I'm waiting for @ryanpitts to be around anyways so won't hold the process up much anyways.

Reply to this email directly or view it on GitHub:
#164 (comment)

@ryanpitts
Collaborator

Ross, if I squash my commits locally, won't I then need to open a new pull request to mozilla/development branch here, in order for that to be reflected in this pull request?

On Sun, Mar 10, 2013 at 11:07 PM, Ross Bruniges notifications@github.com
wrote:

Don't forget to scrunch-up the commits!!
On Monday, March 11, 2013, sinker wrote:

WHOOOOOOOOOOOO

On Sun, Mar 10, 2013 at 11:08 PM, Ryan Pitts <notifications@github.com<javascript:_e({}, 'cvml', 'notifications@github.com');>

wrote:


You can merge this Pull Request by running

git pull https://github.com/mozilla/source development

Or view, comment on, or merge it at:

#164
Commit Summary

  • add all features for Learning section
  • warning for users in RSS feeds on dev
  • Merge pull request #156 from ryanpitts/learning
  • only show 'more' header if there are actually more articles in list
    :/
  • Merge pull request #160 from ryanpitts/learning
  • revisions for Learning section
  • Merge pull request #163 from ryanpitts/learning

File Changes

Patch Links:


Reply to this email directly or view it on GitHubhttps://github.com/mozilla/source/pull/164#issuecomment-14696980
.


Reply to this email directly or view it on GitHub:
#164 (comment)

@rossbruniges
Member

AS we're merging up development to live - it's a little dirty but OK - we can avoid the scrunch up for this.

@rossbruniges
Member

OK - going to merge this in, it's good to go. scrunches NOT needed!

@rossbruniges rossbruniges merged commit c9db55a into master Mar 11, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment