Commit graph

499 commits

Author SHA1 Message Date
Tyler Renelle
307bcb8a38 Merge branch 'develop' 2013-03-25 14:20:01 -07:00
Zachary Kain
0f49ec3ebc fix 697 remove level from top of herobox 2013-03-25 16:03:13 -04:00
Zachary Kain
b038b74534 checkbox shenanigans fix. 2013-03-25 10:05:44 -04:00
Tyler Renelle
b013460809 Merge branch 'develop' 2013-03-23 08:44:09 -06:00
Tyler Renelle
43d89599ca add habitrpg-github to extensions (thanks @ruddfawcett!) 2013-03-23 08:15:39 -06:00
Tyler Renelle
a4d50125d9 Merge branch 'develop' 2013-03-22 19:11:42 -06:00
Tyler Renelle
ccb6f9bd32 fix bootstrap-tour element bind with new herobox system 2013-03-22 19:11:29 -06:00
Daniel Saewitz
ee2f8c0b6c Merge pull request #701 from pjf/webservice_habitrpg
pfenwick went and changed his github username to pjf
2013-03-22 10:44:36 -07:00
Paul Fenwick
d6553c763d pfenwick went and changed his github username to pjf 2013-03-23 00:56:56 +11: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
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
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
7529601dcc add general "new stuff" notification, linking to changelog 2013-03-21 10:31:23 -06:00
Paul Fenwick
9280e9d851 Add WebService::HabitRPG to list of extensions. 2013-03-21 08:08:59 -06:00
Paul Fenwick
25c6748f98 Add WebService::HabitRPG to list of extensions. 2013-03-22 00:31:19 +11:00
Tyler Renelle
272eda64c6 copyright 2013 2013-03-20 09:36:50 -06:00
Tyler Renelle
8f012e8e78 copyright 2013 2013-03-20 09:36:29 -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
3df22d72d9 privacy & terms page titles 2013-03-17 09:47:02 -04: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
2ca7c65abc 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

Conflicts:
	src/app/index.coffee
2013-03-17 09:16:31 -04:00
Tyler Renelle
83b29177bc add responsive to static pages 2013-03-17 09:15:56 -04:00
Tyler Renelle
76064be3d8 clegsome static-page cleanup 2013-03-17 09:15:50 -04:00