Commit graph

1681 commits

Author SHA1 Message Date
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
6c14e0c325 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-21 13:15:41 -06:00
Tyler Renelle
e5f00bd2dc update changelog 2013-03-21 13:09:39 -06:00
Zachary Kain
02c7b81a4c Merge pull request #693 from zakkain/ui-tweaks
remove duplicate user name from party popover
2013-03-21 11:56:58 -07:00
Zachary Kain
dd0b041565 remove duplicate user name from party popover 2013-03-21 14:55:35 -04:00
Zachary Kain
4770af02a9 Merge pull request #692 from zakkain/ui-tweaks
MAD BUG FIXES YO
2013-03-21 11:50:28 -07:00
Zachary Kain
0ddac82f1d MAD BUG FIXES YO 2013-03-21 14:49:07 -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
7c77126129 try some protocol-agnostics to fix homepage css 2013-03-21 11:23:46 -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
86f560f69b layer "new stuff" below "offline" error 2013-03-21 10:32:34 -06:00
Tyler Renelle
7529601dcc add general "new stuff" notification, linking to changelog 2013-03-21 10:31:23 -06:00
Tyler Renelle
f032502368 add headers to changelog 2013-03-21 10:17:39 -06:00
Tyler Renelle
8aeecd2746 add to changelog 2013-03-21 10:17:00 -06:00
Tyler Renelle
6b3dff2053 Merge pull request #690 from switz/api-2
@lefnire => Add alternate scoreTask + fix broken specs
2013-03-21 09:09:22 -07:00
Daniel Saewitz
4d3db53bef Remove extra newline 2013-03-21 11:56:06 -04:00
Paul Fenwick
9280e9d851 Add WebService::HabitRPG to list of extensions. 2013-03-21 08:08:59 -06:00
Zachary Kain
f86aa0316b fix #679 line height issue 2013-03-20 22:32:01 -04:00
Daniel Saewitz
81b14cfac6 Add alternate scoreTask 2013-03-20 16:52:32 -04:00
Tyler Renelle
272eda64c6 copyright 2013 2013-03-20 09:36:50 -06:00
Tyler Renelle
b69ae59d39 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-19 18:33:08 -06:00
Tyler Renelle
5580fd6802 remove hashed_password & salt from /user 2013-03-19 18:32:18 -06:00
Tyler Renelle
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
Shane Lister
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
Zachary Kain
1d93793616 fix customization modal cutting off herobox 2013-03-19 01:02:59 -04:00
Shane Lister
42754bd2a7 Merge pull request #4 from lefnire/develop
Develop
2013-03-18 21:56:48 -07:00
Zachary Kain
fc01b44a5a by popular demand, we're dropping the crosshatched square and going blank 2013-03-19 00:11:37 -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
4061aaf825 include header.styl, minor tweaks to the button styles, housekeeping 2013-03-18 18:30:25 -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
3d581358ec fix text showing behind button b/c of opacity bug 2013-03-18 14:37:24 -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
e67295651f didn't need that reset, probably will remove the whole thing once tested for shenanigans 2013-03-18 14:33:05 -04:00
Zachary Kain
ba16338bf9 fix text showing behind button b/c of opacity bug 2013-03-18 14:32:44 -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
68ca52f125 wah my beautiful designery fonts don't work in modals 2013-03-18 14:15:22 -04:00
Zachary Kain
932783484a fix price input bug 2013-03-18 14:02:30 -04:00