name other user when reporting an edit conflict+discussion

Signed in to two accounts in two browsers and tried saving edits to the same card. Second saver got:

So, the naming works. Couple of other issues though:

1 - Clicking Submit a second time does nothing.

2 - Rather than "Please examine the changes, correct conflicts above, and re-save.", how about: "Please examine their changes below, include any of it you like above, and re-submit."

 --John Abbe.....Thu Dec 22 19:27:01 -0800 2011

changed to "Please examine below, resolve above, and re-submit."

  --Ethan McCutchen.....Sat Dec 24 14:40:45 -0800 2011

I had the second submit working before. I saw a potential error in the code and gave a quick stab at fixing it, but haven't tested. Currently deploying because I can't test soon.

  --Ethan McCutchen.....Sat Dec 24 14:52:06 -0800 2011

Nope, second click on Submit still fails. Nothing happens at all.

Gah, spacing on the name of the bug reporting site?

  --John Abbe.....Sat Dec 24 22:03:38 -0800 2011

oh, we don't have that site (formerly hoptoad, now airbrake) working with the cloudstore deployment yet. I haven't yet figured out how I want to do that, because it would use grasscommons authentication on servers gc doesn't own, which is very insecure. Will discuss w johannes

  --Ethan McCutchen.....Tue Dec 27 13:09:15 -0800 2011

but, fwiw, this is probably not a server error issue but a javascript issue, so it might not show up anyway.

  --Ethan McCutchen.....Tue Dec 27 13:09:59 -0800 2011

ok, about to submit a patch. I think what was happening was actually that the *third* time you clicked submit it would work, so I must have just been a little sloppier than you when testing.

Regardless, I spotted the issue and was able to get it working locally. will push soon.

  --Ethan McCutchen.....Tue Dec 27 15:01:58 -0800 2011

ok, ready for more testing :)

  --Ethan McCutchen.....Tue Dec 27 15:13:44 -0800 2011

Just re-tested this. Everything seems to be working for me. Cleaned up css and wording a bit. Closing.

  --Ethan McCutchen.....Fri Feb 03 10:31:23 -0800 2012