14 Commits

Author SHA1 Message Date
Florian Sundermann
ca4ad51d93 fixed some more codingstyle issues 2013-03-07 13:32:03 +01:00
Florian Sundermann
0824334d5f Merge branch 'upstream' into redeem_dlg
Conflicts:
	code/redeeming.js
2013-03-07 08:35:44 +01:00
Florian Sundermann
1623c3fa9a fixed indetion 2013-03-07 08:31:25 +01:00
Stefan Breunig
b30ac36ffa fix style nits 2013-03-06 00:02:28 +01:00
Morgan Jones
a448912500 Fix display of HTTP error messages for code redemption 2013-03-05 16:15:46 -06:00
Florian Sundermann
967578f7ea fixed codingstyle and removed coda font 2013-03-05 13:35:09 +01:00
Florian Sundermann
90ca848690 fixed indention 2013-03-05 08:56:46 +01:00
Florian Sundermann
f167cd83ea changed "redeemed" to "accepted" 2013-03-05 08:55:15 +01:00
Florian Sundermann
ba730111c4 Changed AP / XM Message to "+ 100 XM" 2013-03-05 08:52:56 +01:00
Florian Sundermann
0afc26af4a new redeem dialog content 2013-03-05 08:52:46 +01:00
Morgan Jones
3c1c596a6a * Add detailed error messages for redemption errors (including rate-limiting, which happens sometimes).
* Reverse XMPs and resonators in redemption display
2013-03-04 15:55:01 -06:00
Stefan Breunig
6bf3de0607 fix #252 by updating the wording 2013-02-21 20:15:29 +01:00
Morgan Jones
211b039be6 Parse items, AP, and XM response for passcodes, displaying information about the passcode's rewards. 2013-02-07 18:50:39 -06:00
Stefan Breunig
a07ee0cc3d so others may contribute 2013-02-01 13:11:14 +01:00