Commit graph

1708 commits

Author SHA1 Message Date
Shane Lister
5fc9fdb418 Merge pull request #6 from lefnire/develop
Update my develop copy
2013-03-26 08:00:59 -07:00
Tyler Renelle
124409bfc5 Merge pull request #715 from switz/translations
@lefnire => i18n support... aka Translations!
2013-03-25 18:42:53 -07:00
Tyler Renelle
f7937ffb1b add forum link to footer 2013-03-25 17:43:34 -07:00
Tyler Renelle
01f2bfeab7 remove FAQ page, redirect to http://community.habitrpg.com/faq-page 2013-03-25 17:41:25 -07:00
Zachary Kain
19dd153e31 Merge pull request #726 from zakkain/develop
fix 697 remove level from top of herobox
2013-03-25 13:03:55 -07:00
Zachary Kain
0f49ec3ebc fix 697 remove level from top of herobox 2013-03-25 16:03:13 -04:00
Tyler Renelle
258086e4e8 Merge pull request #723 from zakkain/develop
checkbox shenanigans fix.
2013-03-25 08:05:43 -07:00
Zachary Kain
b038b74534 checkbox shenanigans fix. 2013-03-25 10:05:44 -04:00
Daniel Saewitz
8107200105 i18n implemented 2013-03-23 16:03:12 -04:00
Tyler Renelle
52d419a823 add min-width fix to hero-stats being squishd on smalls screens.
@zakkain feel free to change, just wanted a quick-fix
2013-03-23 10:07:26 -06:00
Tyler Renelle
cdcf7aa3b2 temp fix to undo being hidden 2013-03-23 08:22:05 -06:00
Tyler Renelle
43d89599ca add habitrpg-github to extensions (thanks @ruddfawcett!) 2013-03-23 08:15:39 -06:00
Tyler Renelle
e7fe8f40a7 move backer mount into backer/ 2013-03-22 23:41:22 -06:00
Tyler Renelle
7ab4abad60 adding in as much currently-designed, unused pixel art that I could find into public/img/unprocessed 2013-03-22 23:39:33 -06:00
Tyler Renelle
ccb6f9bd32 fix bootstrap-tour element bind with new herobox system 2013-03-22 19:11:29 -06:00
Tyler Renelle
381bd6e9ec Merge pull request #707 from switz/api-4
@lefnire => Array API
2013-03-22 13:59:49 -07:00
Tyler Renelle
2a89ba62c8 Merge pull request #706 from switz/api-3
Mark todos and dailies as completed via api
2013-03-22 13:59:39 -07:00
Daniel Saewitz
7591846937 Remove req.task 2013-03-22 16:57:34 -04:00
Daniel Saewitz
355dde07f4 Array to /user/tasks 2013-03-22 16:52:33 -04:00
Daniel Saewitz
b56bc6b1d9 Mark todos and dailies as completed via api 2013-03-22 16:01:40 -04:00
Tyler Renelle
c876fe5b65 move test2 to test/test2 2013-03-22 13:40:38 -06:00
Tyler Renelle
c48b90dd99 Merge pull request #699 from yangit/develop
Develop
2013-03-22 12:37:51 -07:00
Yangit
4a1623c139 Test if EXP affected by clicking the "habits-up" button. 2013-03-22 12:10:14 +08: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
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
Yangit
5b67c0fa49 model returns full user object 2013-03-22 00:36:14 +08: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
Yangit
656b0891ed async model get 2013-03-21 18:28:40 +08:00
Yangit
3434b4d224 empty test files 2013-03-21 18:01:07 +08: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