Philip How
0dbf2257d7
New Algorithms + fixes
2013-03-06 17:02:08 +00:00
Tyler Renelle
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
Daniel Saewitz
5a1343a3b7
Set maxHealth to 50
2013-03-06 09:11:14 -05:00
Daniel Saewitz
ef7d705059
Add to next level to user stats on API
2013-03-06 08:45:51 -05:00
Zachary Kain
8008b71ecd
make everything a bit bigger, better on mobile
2013-03-06 02:16:51 -05:00
Zachary Kain
5ac7403241
add scrollbars
2013-03-06 01:58:07 -05:00
Zachary Kain
81a527e5d6
android mobile bugfixes
2013-03-06 01:29:13 -05:00
Zachary Kain
f0462d022f
style Todo tabs, misc stuff
2013-03-06 01:15:45 -05:00
Zachary Kain
456580e352
gut & re-style Task Options, only Rewards tasks & options left to go through
2013-03-06 00:50:39 -05:00
Zachary Kain
84e07a0317
better a11y than display:none
2013-03-06 00:50:39 -05:00
Zachary Kain
174c7a8b9f
tweaks, most notably DISABLE CHART BUTAN
2013-03-06 00:50:39 -05:00
Zachary Kain
fd216719c3
allow task text to word-wrap and be padded from element edge
2013-03-06 00:50:39 -05:00
Zachary Kain
ce19fed852
remove responsive from bootstrap includes. Rolling our own!
2013-03-06 00:50:38 -05:00
Tyler Renelle
27ce1b050b
try x-requested-with for CORS
2013-03-05 23:05:59 -05:00
Tyler Renelle
bffe0a520e
Merge branch 'develop' into zakkain-ui-tweaks
2013-03-05 21:41:19 -05:00
Tyler Renelle
b6564828ce
use different rewards selector for items-unlocked popover, wasn't getting it
2013-03-05 21:41:01 -05:00
Tyler Renelle
44714bcc5b
comment out webkit-devtools-agent - only for my pesronal use, really
2013-03-05 20:35:13 -05:00
Zachary Kain
a002932210
re-add Lato webfont
2013-03-05 20:29:20 -05:00
Tyler Renelle
7e304afc54
upgrade bootstrap
2013-03-05 20:23:31 -05:00
Zachary Kain
16bba9461c
add the bootstrap update
2013-03-05 20:21:17 -05:00
Tyler Renelle
4f6a78c0ae
add help popover to difficulty
2013-03-05 20:12:09 -05:00
Tyler Renelle
4bb0207564
rename priority multiplier to "Difficulty" -> easy, medium,
...
hard (people keep getting confused) and putting it back into
"advanced" section
2013-03-05 20:12:05 -05:00
Tyler Renelle
48dc49e1c4
re-enstate double-rewards bug fix
2013-03-05 20:10:03 -05:00
Tyler Renelle
3f33261792
proper derby tabbing
2013-03-05 20:08:31 -05:00
Tyler Renelle
67c42f5e1a
Merge branch 'develop' into zakkain-ui-tweaks
...
Conflicts:
styles/app/tasks.styl
views/app/tasks.html
2013-03-05 20:04:37 -05:00
Zachary Kain
fbc4345d05
further refactoring of tasks code. Last commit before merge in the revert
2013-03-05 19:47:08 -05:00
Tyler Renelle
4f7cdc38e9
add help popover to difficulty
2013-03-05 18:58:15 -05:00
Tyler Renelle
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
Tyler Renelle
df220b43df
Merge branch 'develop'
2013-03-05 17:05:32 -05:00
Tyler Renelle
41b1ca9f73
typo
2013-03-05 17:05:05 -05:00
Tyler Renelle
b0b591dc96
Merge branch 'develop'
2013-03-05 17:04:31 -05:00
Tyler Renelle
6a280c57ea
re-applying #553 fix
2013-03-05 17:04:22 -05:00
Tyler Renelle
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
Tyler Renelle
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
Tyler Renelle
1cd3299388
strange fix for #553 , also #539 take note
2013-03-05 16:16:08 -05:00
Tyler Renelle
9a60ed5269
some html cleanup
2013-03-05 16:06:56 -05:00
Tyler Renelle
bb82bcc62a
namespacing for tasks & rewards too
2013-03-05 15:52:47 -05:00
Tyler Renelle
8132dbfe05
<task:> tabbing borked
2013-03-05 15:23:16 -05:00
Zachary Kain
5fb3ba67f6
circle icon for uncompleted tasks, and rollin with square edges for now
2013-03-05 15:13:59 -05:00
Zachary Kain
1a308da495
better responsive breakpoints, more robust custom grid
2013-03-05 15:01:52 -05:00
Tyler Renelle
26a26b5344
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-05 14:23:00 -05:00
Zachary Kain
efe1c9267e
WIP: new 'Task Actions' UI (buttons, checkboxes, etc)
2013-03-05 14:16:10 -05:00
Tyler Renelle
4ca62b9f28
put splash middleware back in
2013-03-05 14:09:56 -05:00
Tyler Renelle
6bfe1d076e
CORS middleware
2013-03-05 14:09:53 -05:00
Tyler Renelle
57b497f1bd
put splash middleware back in
2013-03-05 14:09:39 -05:00
Tyler Renelle
26a8917862
tour fix
2013-03-05 14:02:57 -05:00
Tyler Renelle
22c5acc303
tour fix
2013-03-05 14:02:46 -05:00
Tyler Renelle
1f94085875
CORS middleware
2013-03-05 13:12:09 -05:00
aaron4
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
aaron4
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