05bd0fdd52
semi-colons
2013-03-07 13:16:47 -05:00
63c00a7261
add @MrConcepts normalization migration for busted busted values, and
...
in preparation for another big algorithm upgrade
2013-03-07 12:53:45 -05:00
d5b3d89a73
Rename user.stats.tnl to user.stats.toNextLevel
2013-03-06 23:50:19 -05:00
c9822efbf8
Fix broken tnl test
2013-03-06 23:50:16 -05:00
ac419e7813
add default numbers for restore tool if one isn't provided: #594
2013-03-06 23:50:06 -05:00
5b0dd6f797
Merge pull request #607 from switz/api-alg
...
@lefnire => Fix broken tnl test
2013-03-06 19:00:18 -08:00
7cb291c4de
Rename user.stats.tnl to user.stats.toNextLevel
2013-03-06 20:39:48 -05:00
5141aeda78
Fix broken tnl test
2013-03-06 19:59:19 -05:00
75aadf6eb1
add default numbers for restore tool if one isn't provided: #594
2013-03-06 13:32:10 -05:00
db805b6388
Merge pull request #592 from aaron4/patch-1
...
Added space after each line of text (privacy.html)
2013-03-06 10:11:01 -08:00
467cbfba64
Merge pull request #593 from aaron4/patch-2
...
Added space after each line of text (terms.html)
2013-03-06 10:09:42 -08:00
1ecebe4cbb
Merge branch 'master' into origin-develop
2013-03-06 12:48:48 -05:00
f602f69893
Merge pull request #604 from MrConcept/algos
...
New Algorithms + fixes
2013-03-06 09:46:14 -08:00
0dbf2257d7
New Algorithms + fixes
2013-03-06 17:02:08 +00:00
722b5c7640
Merge pull request #601 from switz/api-alg
...
Add 'To next level' to user stats on API
2013-03-06 07:19:22 -08:00
5a1343a3b7
Set maxHealth to 50
2013-03-06 09:11:14 -05:00
ef7d705059
Add to next level to user stats on API
2013-03-06 08:45:51 -05:00
27ce1b050b
try x-requested-with for CORS
2013-03-05 23:05:59 -05:00
b6564828ce
use different rewards selector for items-unlocked popover, wasn't getting it
2013-03-05 21:41:01 -05:00
4f7cdc38e9
add help popover to difficulty
2013-03-05 18:58:15 -05:00
9c14b29a3d
rename priority multiplier to "Difficulty" -> easy, medium,
...
hard (people keep getting confused) and putting it back into
"advanced" section
2013-03-05 18:07:22 -05:00
df220b43df
Merge branch 'develop'
2013-03-05 17:05:32 -05:00
41b1ca9f73
typo
2013-03-05 17:05:05 -05:00
b0b591dc96
Merge branch 'develop'
2013-03-05 17:04:31 -05:00
6a280c57ea
re-applying #553 fix
2013-03-05 17:04:22 -05:00
a8c09110f7
reverting redisign commits. @zakkain some issues here ill follow up with you on - if i forget, "add" button in responsive layout, item store issues
2013-03-05 17:02:22 -05:00
16b9ea3b58
reverting my #553 & html cleanup fixes, merge conflicts from redesign - gotta go through and do these again
2013-03-05 17:00:44 -05:00
1cd3299388
strange fix for #553 , also #539 take note
2013-03-05 16:16:08 -05:00
9a60ed5269
some html cleanup
2013-03-05 16:06:56 -05:00
bb82bcc62a
namespacing for tasks & rewards too
2013-03-05 15:52:47 -05:00
8132dbfe05
<task:> tabbing borked
2013-03-05 15:23:16 -05:00
26a26b5344
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-05 14:23:00 -05:00
4ca62b9f28
put splash middleware back in
2013-03-05 14:09:56 -05:00
6bfe1d076e
CORS middleware
2013-03-05 14:09:53 -05:00
57b497f1bd
put splash middleware back in
2013-03-05 14:09:39 -05:00
26a8917862
tour fix
2013-03-05 14:02:57 -05:00
22c5acc303
tour fix
2013-03-05 14:02:46 -05:00
1f94085875
CORS middleware
2013-03-05 13:12:09 -05:00
9ad67fa169
Added space after each line of text
...
Same for this one. Added space to each line of text if line of text is following.
Also changed "Terms Of Use" to "Terms of Use".
2013-03-05 10:42:40 -06:00
2cf267ccf5
added space after each line of text
...
With previous privacy.html, there was not a space after each line of text (if line of text following). This caused words to be combined together.
Fixed issue by adding a space after each line of text.
2013-03-05 10:26:08 -06:00
db71cca404
Merge pull request #591 from MrConcept/notifications
...
Iterative Levelling
2013-03-05 05:23:45 -08:00
7e402c5688
iterative levelling
2013-03-05 13:17:46 +00:00
8e7c93aa0b
iterative levelling
2013-03-05 13:11:13 +00:00
ce09d72708
cap deltas
2013-03-05 06:59:56 -05:00
8814ff62b3
Merge pull request #588 from MrConcept/notifications
...
Properly Cap Deltas
2013-03-05 03:56:06 -08:00
d616579e4e
cap deltas
2013-03-05 09:51:42 +00:00
ba1a8dabc8
add in Lato as main font, lots of minor layout tweaks. Continue refactoring tasks html
2013-03-04 20:36:11 -05:00
b7d46b1e20
start new task column css, add classes
2013-03-04 19:42:48 -05:00
01971fba1e
improve vertical centering of task checkbox and text
2013-03-04 19:11:37 -05:00
41fc027150
add npm-debug.log to gitignore because DANG
2013-03-04 17:31:33 -05:00
Tyler Renelle