Remember last user

[sahoahfoa]

Added the ability for the client to remember the last user via cookies per #32.

[mo-g]

Good intention, bad pull request!

You've pulled in all the changes from ribbons, which is a pretty big overreach on the PR. Can you rebase 40e7ca7 against aelveborn's master and push -f this branch? It's ok to pull in other commits from Ribbons if they're required for your patch to work, but otherwise...

[sahoahfoa]

This is against aelveborn's master. I've submitted this to the dev branch as the readme states to do.

[mo-g]

Yes, but you're trying to commit your change, AND every change that was ever written by Ribbons. Only commit 40e7ca7 should be in this PR. You're attempting to merge 35 commits, you should be attempting to merge 1! :)

[sahoahfoa]

Should I be submitting this PR to the master branch then? or rebase to the dev branch?

[mo-g]

Submitting to dev is fine, but you need to change your local copy to remove all the other commits - with something like git rebase -i aelveborn/dev' ( whereaelveborn/dev` is whatever the dev branch is in you local git structure - I think it's 'upstream' in mine ) and deleting every line except for your own commits.

Here's a handy guide on git rebase. :)

[mo-g]

Or to try and illustrate what I mean...

~~@ribbons First hack of moving backend from Python to C++ 6c0dea6 @ribbons Find devices correctly dc66853 @ribbons Wrap xwii* calls in classes and use unique_ptr c247d32 @ribbons Simplify main loop and partly implement disconnect 695e45d @ribbons Remove setup.py as we aren't using Python any more 00f1828 @ribbons Implement Bluetooth disconnect using BlueZ 93b048f @ribbons Handle disconnections we haven't caused 4c13b47 @ribbons Remove 'address' configuration option d767bdd @ribbons Remove the xwiibind script as this no-longer works b57ae68 @ribbons Stop wii-scale using a CPU core when connected a33daa8 @ribbons Clear the totals vector correctly between runs 2dccdc6 @ribbons Prevent single param ctors being used implicitly 58939e9 @ribbons Add cppcheck to build to catch obvious mistakes ea9fcc6 @ribbons Make calibration work in the backend again 503b75f @ribbons Make the frontend start the backend again b3a9313 @ribbons Add a udev rule file for non-root board access 699ecaa @ribbons Update README with changes for new C++ backend e5aade7 @ribbons Make skipping values at the start of weigh dynamic ba1bdba @ribbons Bump grunt-contrib-imagemin version to 1.0.0 9ac4874 @ribbons Show failure to connect to board in front-end 3547695 @ribbons Fix compilation under NixOS 7862dc1 @ribbons Correctly initialise giomm library before use eefa57d @ribbons Fix disconnect under Debian Jessie and derivatives b7ac16a @ribbons Write DBus error details found during path search b9cba31 @ribbons Fix wrong variable name in UDevDevice::GetAttrVal 52f94cd @ribbons Work around Bluetooth address missing from sysfs 5e2f9f0 @ribbons Pass strings around backend as const references f0778bd @ribbons Fix backend crash when pressing 'Disconnect' twice af91f71 @ribbons Fix compilation under Arch Linux 8432fc7 @aelveborn Merge pull request #17 from ribbons/cpp-back-end 2f66cf3 @ribbons Correct logic for building graph of weights 80c79a2 @aelveborn Merge pull request #29 from ribbons/02-graph-most-recent 09defc7 @ribbons Make weighing process twice as fast 67db030 @aelveborn Merge pull request #30 from ribbons/01-double-weighing-speed 266c292~~ Scott Howard Use a cookie to remember last user 40e7ca7

This is the list of all the commits in the PR you've raised. You need to get rid of all the commits that I've crossed out, before this can be merged. :)

[mo-g]

Ok, I take it alllll back. I'm an idiot!

I've just realised that dev is just waaaay behind master. So, ignore the readme and make the PR against master. All your troubles will go away. :)

[aelveborn]

Yeah, ignore the dev instructions. I've updated them now.