Commit Graph

550 Commits

Author SHA1 Message Date
Tyler Renelle 6fd9bfbab4 pets: use pet.name for unique identifier, not pet.text. general cleanup 2013-03-22 22:17:25 -06:00
Tyler Renelle c170cd269f move some more pet html into pets.html 2013-03-22 19:37:48 -06:00
Tyler Renelle 5043c46b5a move some pet html around 2013-03-22 19:21:35 -06:00
Tyler Renelle ccb6f9bd32 fix bootstrap-tour element bind with new herobox system 2013-03-22 19:11:29 -06:00
Tyler Renelle a862e21e8e Merge branch 'develop' into pets 2013-03-22 19:06:48 -06:00
Tyler Renelle 3d679ba94e fix to "anonymous" username 2013-03-21 16:50:27 -06:00
Tyler Renelle 199006d692 move todos-charts up top 2013-03-21 16:36:24 -06:00
Tyler Renelle b286b95153 add charts back in, temporary style 2013-03-21 16:31:23 -06:00
Tyler Renelle a1a85241d5 add "hatching powder" (as temporary pet food), clean up some dialogs,
fix eggs using their actual animal sprites
2013-03-21 14:56:25 -06:00
Tyler Renelle 3ce2686662 Merge branch 'develop' into switz-inventory
Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
2013-03-21 13:51:38 -06:00
Zachary Kain dd0b041565 remove duplicate user name from party popover 2013-03-21 14:55:35 -04:00
Tyler Renelle fa89b20dd5 Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks

Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank

Conflicts:
	styles/app/tasks.styl
2013-03-21 12:36:05 -06:00
Tyler Renelle d737bd0714 remove a ton of public/vendor git submodules, using CDN instead. The
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
2013-03-21 11:11:15 -06:00
Zachary Kain fa94bef0f6 new input class names on restore function 2013-03-21 13:03:03 -04:00
Tyler Renelle 7529601dcc add general "new stuff" notification, linking to changelog 2013-03-21 10:31:23 -06:00
Tyler Renelle 272eda64c6 copyright 2013 2013-03-20 09:36:50 -06:00
Zachary Kain 1d93793616 fix customization modal cutting off herobox 2013-03-19 01:02:59 -04:00
Zachary Kain 30b3b527a5 fix no name showing up if not logged in 2013-03-19 00:09:06 -04:00
Zachary Kain 915c86d8ba implement avatar variable system with data attributes and css. LIKE A BOSS 2013-03-19 00:04:24 -04:00
Tyler Renelle 9255644108 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-18 21:51:54 -06:00
Zachary Kain 507a0fc3c9 MASSIVE HEADER CHANGES OH SHIT 2013-03-18 23:42:03 -04:00
Zachary Kain 411c614408 fix the 1px gap 2013-03-18 19:33:30 -04:00
Zachary Kain f453eb9833 cut old menu. Next up, avatars then MODALS 2013-03-18 18:31:26 -04:00
Zachary Kain 8284693d0f rebuilt header boiiii. Tested FF, Safari, Chrome 2013-03-18 18:29:53 -04:00
Zachary Kain e18c53f97f middle of wrasslin the new header 2013-03-18 16:48:47 -04:00
Tyler Renelle 70dcd0b886 move rewards column into rewards rewards.html 2013-03-18 16:47:03 -04:00
Zachary Kain 13673c3ec7 flattenize header, change to <header>, even margins 2013-03-18 16:46:58 -04:00
Tyler Renelle 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
Tyler Renelle 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
Zachary Kain 97294b793f robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold 2013-03-18 14:37:14 -04:00
Zachary Kain 6d2df1ccc9 fix price input bug 2013-03-18 14:37:03 -04:00
Zachary Kain eceae48b2b robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold 2013-03-18 14:28:00 -04:00
Zachary Kain 932783484a fix price input bug 2013-03-18 14:02:30 -04:00
Tyler Renelle 16bb4879e3 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-17 22:10:04 -04:00
Tyler Renelle 903745f7c9 pass in whole task object to taskClasses 2013-03-17 21:50:02 -04:00
Tyler Renelle 2f3d0fa86a start adding undo functionality 2013-03-17 21:30:24 -04:00
Rudd Fawcett f8be873241 Added "btn" class to "Show Header" 2013-03-17 15:25:23 -03:00
Tyler Renelle 2276867f6c use cloudflare cdn for bootstrap too 2013-03-17 09:45:57 -04:00
Tyler Renelle 2be827f484 Merge branch 'cdn-scripts' into develop 2013-03-17 09:33:19 -04:00
Tyler Renelle 6182a474c7 remoe bootstrap import from .styl, start pulling in from
CDN (500.html, static, & dynamic pages)
2013-03-17 09:33:14 -04:00
Tyler Renelle 63cda4c5c7 clegsome static-page cleanup 2013-03-16 23:35:20 -04:00
Tyler Renelle 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
Tyler Renelle 00db85dff6 protocol agnostic ads 2013-03-16 19:48:15 -04:00
Daniel Saewitz 78bc27439a Remove trailing spaces 2013-03-16 19:36:07 -04:00
Tyler Renelle 9f7b653a25 Merge branch 'develop' into ads
Conflicts:
	views/app/tasks.html
2013-03-16 19:27:29 -04:00
Tyler Renelle 9501e67661 add missing namespaces for rewards & tasks for consistency & organization 2013-03-16 19:22:53 -04:00
Tyler Renelle 9c0a640f9f add ads back in 2013-03-16 19:18:17 -04:00
Daniel Saewitz 7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Tyler Renelle 081c5c656f another strange derby truthy issue 2013-03-16 16:02:15 -04:00
Daniel Saewitz 099008d557 whitespace 2013-03-16 15:36:56 -04:00