4d3db53bef
Remove extra newline
2013-03-21 11:56:06 -04:00
81b14cfac6
Add alternate scoreTask
2013-03-20 16:52:32 -04:00
272eda64c6
copyright 2013
2013-03-20 09:36:50 -06:00
b69ae59d39
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-19 18:33:08 -06:00
5580fd6802
remove hashed_password & salt from /user
2013-03-19 18:32:18 -06:00
db7a60be65
Merge pull request #676 from Shaners/develop
...
Mount sprite sheet, mount CSS, revised pet egg CSS.
2013-03-18 23:26:06 -07:00
63f0a9f3a4
Mount Sprite Sheet, Mount CSS, Revised Pet Egg CSS
...
Here is a copy of the mount sprite sheet, mount CSS, and a revised pet
egg CSS. CSS now matches the player CSS structure. Removed individual
mount images as they'd no longer be needed.
2013-03-18 22:19:20 -07:00
42754bd2a7
Merge pull request #4 from lefnire/develop
...
Develop
2013-03-18 21:56:48 -07:00
9255644108
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-18 21:51:54 -06:00
70dcd0b886
move rewards column into rewards rewards.html
2013-03-18 16:47:03 -04:00
a4cfd9d19c
wrap avatars with <span>. #each requires an element, so #if / #unless
...
blocks nested immediately inside cause issues if they return false,
see https://github.com/codeparty/derby/issues/215
2013-03-18 15:46:35 -04:00
49db610602
fix to "editing profile" bug. move {#with _user.preferences as :p}
...
into minimum allowable depth in HTML hierachy at which it's required.
Still trying to put my finger on it, but I'm getting close
2013-03-18 15:43:02 -04:00
3d581358ec
fix text showing behind button b/c of opacity bug
2013-03-18 14:37:24 -04:00
97294b793f
robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold
2013-03-18 14:37:14 -04:00
6d2df1ccc9
fix price input bug
2013-03-18 14:37:03 -04:00
5799a155af
set timeout interval on undo (disappear after 10s)
2013-03-17 23:16:05 -04:00
16bb4879e3
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-17 22:10:04 -04:00
de1eca084e
bugfix to "can't delete task"
2013-03-17 22:09:33 -04:00
07a3a3c3b6
fix to reward issue in undo
2013-03-17 22:02:06 -04:00
903745f7c9
pass in whole task object to taskClasses
2013-03-17 21:50:02 -04:00
10e9d3eb40
fixed undo on checkboxed items
2013-03-17 21:43:03 -04:00
2f3d0fa86a
start adding undo functionality
2013-03-17 21:30:24 -04:00
b576290ee6
Merge pull request #671 from ruddfawcett/develop
...
Added "btn" class to "Show Header"
2013-03-17 13:33:52 -07:00
f8be873241
Added "btn" class to "Show Header"
2013-03-17 15:25:23 -03:00
3df22d72d9
privacy & terms page titles
2013-03-17 09:47:02 -04:00
2276867f6c
use cloudflare cdn for bootstrap too
2013-03-17 09:45:57 -04:00
2be827f484
Merge branch 'cdn-scripts' into develop
2013-03-17 09:33:19 -04:00
6182a474c7
remoe bootstrap import from .styl, start pulling in from
...
CDN (500.html, static, & dynamic pages)
2013-03-17 09:33:14 -04:00
0bcea534ae
better "reroll" comment
2013-03-17 09:13:25 -04:00
0c1151b123
don't add bootstrap css files in when instantiating derby-ui-boostrap,
...
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
49dedf8f2f
add responsive to static pages
2013-03-17 00:29:32 -04:00
63cda4c5c7
clegsome static-page cleanup
2013-03-16 23:35:20 -04:00
ee9e6064b2
add a ton of static page, beef up the footer, make this website look
...
official! @zakkain, I hope I didn't break anything!
2013-03-16 23:03:59 -04:00
b1fe9b64a9
Merge branch 'develop' into static-pages
2013-03-16 20:29:22 -04:00
dbc3906eb3
possible fix to dom losing functions after model.resetDom()
2013-03-16 20:02:01 -04:00
9501e67661
add missing namespaces for rewards & tasks for consistency & organization
2013-03-16 19:22:53 -04:00
903479af5a
add view functions and(), or(), notEqual()
2013-03-16 19:10:40 -04:00
081c5c656f
another strange derby truthy issue
2013-03-16 16:02:15 -04:00
14a892043a
add some api comments (just so i can visually separate the functions
...
for now)
2013-03-16 11:50:02 -04:00
48cbe7c383
Merge branch 'master' into develop
...
Conflicts:
views/app/settings.html
2013-03-15 18:40:21 -04:00
545e5fc2a4
allow manually unlocking party system
2013-03-15 18:39:39 -04:00
14babdbf24
remove snark
2013-03-15 18:26:56 -04:00
4ec94e4ed8
remove snark
2013-03-15 18:26:40 -04:00
368748b67a
add delete account functionality (*sigh*, y'all asked for it)
2013-03-15 17:59:15 -04:00
7a7c96ca57
add change for mutlipel subdomain GA tracking
2013-03-15 17:59:10 -04:00
6c61c0f7db
add delete account functionality (*sigh*, y'all asked for it)
2013-03-15 17:58:37 -04:00
566f1aa230
add change for mutlipel subdomain GA tracking
2013-03-15 17:47:42 -04:00
37901ef4f4
move settings and API into tabs
2013-03-15 17:31:07 -04:00
281502499b
add toggle header to settings dialog
2013-03-15 17:31:03 -04:00
325d906708
begin adding toggle-header
2013-03-15 17:30:59 -04:00
Daniel Saewitz