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
d6553c763d
pfenwick went and changed his github username to pjf
2013-03-23 00:56:56 +11:00
da270edf35
Merge branch 'develop'
2013-03-21 16:50:36 -06:00
3d679ba94e
fix to "anonymous" username
2013-03-21 16:50:27 -06:00
3365cf3e32
Merge branch 'develop'
2013-03-21 16:36:33 -06:00
199006d692
move todos-charts up top
2013-03-21 16:36:24 -06:00
548fb101e1
Merge branch 'develop'
2013-03-21 16:31:33 -06:00
b286b95153
add charts back in, temporary style
2013-03-21 16:31:23 -06:00
4c09d432bf
Merge branch 'develop'
2013-03-21 15:06:55 -06:00
6c14e0c325
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-21 13:15:41 -06:00
e5f00bd2dc
update changelog
2013-03-21 13:09:39 -06:00
02c7b81a4c
Merge pull request #693 from zakkain/ui-tweaks
...
remove duplicate user name from party popover
2013-03-21 11:56:58 -07:00
dd0b041565
remove duplicate user name from party popover
2013-03-21 14:55:35 -04:00
4770af02a9
Merge pull request #692 from zakkain/ui-tweaks
...
MAD BUG FIXES YO
2013-03-21 11:50:28 -07:00
0ddac82f1d
MAD BUG FIXES YO
2013-03-21 14:49:07 -04:00
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
ae9546180c
Merge branch 'develop'
...
Conflicts:
styles/app/index.styl
2013-03-21 11:27:42 -06:00
7c77126129
try some protocol-agnostics to fix homepage css
2013-03-21 11:23:46 -06:00
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
fa94bef0f6
new input class names on restore function
2013-03-21 13:03:03 -04:00
be305f918e
Merge branch 'develop'
...
Conflicts:
src/server/api.coffee
views/static/head.html
views/static/privacy.html
views/static/terms.html
2013-03-21 10:35:00 -06:00
86f560f69b
layer "new stuff" below "offline" error
2013-03-21 10:32:34 -06:00
7529601dcc
add general "new stuff" notification, linking to changelog
2013-03-21 10:31:23 -06:00
f032502368
add headers to changelog
2013-03-21 10:17:39 -06:00
8aeecd2746
add to changelog
2013-03-21 10:17:00 -06:00
6b3dff2053
Merge pull request #690 from switz/api-2
...
@lefnire => Add alternate scoreTask + fix broken specs
2013-03-21 09:09:22 -07:00
4d3db53bef
Remove extra newline
2013-03-21 11:56:06 -04:00
9280e9d851
Add WebService::HabitRPG to list of extensions.
2013-03-21 08:08:59 -06:00
b1531ee75c
Merge pull request #688 from pfenwick/webservice_habitrpg
...
Add WebService::HabitRPG to list of extensions.
2013-03-21 07:06:02 -07:00
25c6748f98
Add WebService::HabitRPG to list of extensions.
2013-03-22 00:31:19 +11:00
f86aa0316b
fix #679 line height issue
2013-03-20 22:32:01 -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
8f012e8e78
copyright 2013
2013-03-20 09:36:29 -06:00
dcb0f7e111
remove hashed_password & salt from /user
2013-03-19 18:33:29 -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
1d93793616
fix customization modal cutting off herobox
2013-03-19 01:02:59 -04:00
42754bd2a7
Merge pull request #4 from lefnire/develop
...
Develop
2013-03-18 21:56:48 -07:00
fc01b44a5a
by popular demand, we're dropping the crosshatched square and going blank
2013-03-19 00:11:37 -04:00
30b3b527a5
fix no name showing up if not logged in
2013-03-19 00:09:06 -04:00
915c86d8ba
implement avatar variable system with data attributes and css. LIKE A BOSS
2013-03-19 00:04:24 -04:00
9255644108
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-18 21:51:54 -06:00
507a0fc3c9
MASSIVE HEADER CHANGES OH SHIT
2013-03-18 23:42:03 -04:00
411c614408
fix the 1px gap
2013-03-18 19:33:30 -04:00
f453eb9833
cut old menu. Next up, avatars then MODALS
2013-03-18 18:31:26 -04:00
4061aaf825
include header.styl, minor tweaks to the button styles, housekeeping
2013-03-18 18:30:25 -04:00
8284693d0f
rebuilt header boiiii. Tested FF, Safari, Chrome
2013-03-18 18:29:53 -04:00
Daniel Saewitz