search

ncss-2014-group-3 / word-by-word

Group 3's word at a time social network
7 stars 4 forks source link

Voting changes #45

Closed nhardy closed 10 years ago

nhardy commented 10 years ago

Including previous commits (other pull request(s))

Mause commented 10 years ago

The only thing with these is that you're including the commits from the past PRs; a little difficult to correct, admittedly :(

nhardy commented 10 years ago

Admittedly, yeah.

nhardy commented 10 years ago

Once the first is merged however, it should detect that there are less changes, am I right?

Mause commented 10 years ago

yup

Mause commented 10 years ago

(in theory)

nhardy commented 10 years ago

Haven't pushed these live yet though, as there's a lot changed and hopefully this way we don't deploy a fatal bug.

nhardy commented 10 years ago

Looks like it works now with that last commit.

nhardy commented 10 years ago

My bad then! Haha.

nhardy commented 10 years ago

Appears to work fine. I think I'll merge it, unless there are any objections from @plausibility?

sysr-q commented 10 years ago

I had a quick squizzle over the diffs earlier, I didn't see anything super worrying, so unless things break it's :+1: here. Not that you haven't already :shipit:'d