Commit graph

4991 commits

Author SHA1 Message Date
Tyler Renelle
2bffa643a9 feat(mystery): mystery items 062014 2014-06-24 16:45:47 -06:00
wc8
94ec31c750 reverts to danielText
Had intended to submit Tavern message as a pull request, not directly edit, will resubmit later.
2014-06-21 21:22:56 -04:00
wc8
339dad2165 Update tavern.jade
changes popover content for daniel, adds message & links for https://github.com/HabitRPG/habitrpg/issues/3627 but this only my second pull request so it likely need to be reviewed before it is pulled. I basically followed the Pets links for Matt's messages.

#232 is needed before this one to add the danielTavern strings content.
2014-06-21 15:29:18 -04:00
Tyler Renelle
1a7530d6e4 Merge pull request #3636 from vIiRuS/fixApiDoc
Fix api documentation
2014-06-21 13:19:43 -06:00
Tyler Renelle
0dfefb72c9 Merge pull request #3635 from vIiRuS/newStuff
create new static view for news
2014-06-21 12:06:34 -06:00
Phillip Thelen
c6d24853f0 Fix api documentation
correctly display swagger-ui and change old api documentation
2014-06-21 19:31:52 +02:00
Phillip Thelen
8175f01f23 create new static view for news 2014-06-21 18:38:30 +02:00
Tyler Renelle
3a29ae437c perf(chat): {{::bindonce}} test on chat to see if that improves, #3486 2014-06-20 21:00:39 -06:00
Tyler Renelle
040f922d95 chore(bailey): summer update + new gear, npcs, etc 2014-06-20 15:09:14 -06:00
Tyler Renelle
81ab40f89f summer 2014-06-19 23:15:24 -06:00
deilann
c78fa3c514 Merge pull request #3629 from robeden/develop
Cap food-try max width to 15em
2014-06-19 15:03:30 -07:00
Rob Eden
3e04ec9215 Cap food-try max width to 15em
Fix for https://github.com/HabitRPG/habitrpg/issues/3628, which caps the max-width in .food-tray to 15em.
2014-06-19 16:17:43 -05:00
Tyler Renelle
6fdec4a146 refactor(stats): iterate stats via jade instead of angular. needed for some mobile stuff 2014-06-17 16:30:13 -06:00
Tyler Renelle
8d31376165 fix(mongo): tmp fix to #3607 until
https://github.com/LearnBoost/mongoose/issues/1920 fixed
2014-06-16 17:45:42 -06:00
Tyler Renelle
b2ebc93cac Merge pull request #3613 from negue/fix_margins
fix avatar and background margin
2014-06-16 17:36:40 -06:00
Matteo Pagliazzi
7e11d970a8 fix(i18n): use string 2014-06-16 21:55:31 +02:00
Matteo Pagliazzi
57e1013ada fix(i18n): stable 2014-06-16 21:52:25 +02:00
Tyler Renelle
3136b4cc2c feat(debug): debug buttons for NODE_ENV==test too 2014-06-16 13:25:51 -06:00
negue
e76d9f8d83 fix avatar and background margin 2014-06-15 19:12:38 +02:00
deilann
7ec679d11a Merge pull request #3609 from yafinee/chart
#1623 - charts: readable (vertical) labels on horizontal axis
2014-06-15 01:58:35 -07:00
vagrant
0d73330ab6 #1623 - charts: readable (vertical) labels on horizontal axis 2014-06-15 08:50:03 +00:00
Tyler Renelle
ce5d83d5a1 Merge pull request #3605 from yafinee/etheral_surge
#3534 - Rewards: Broken layout when the text is too long.
2014-06-14 18:03:33 -06:00
Yafinee
c5d9fe4e1d #3534 - Rewards: Broken layout when the text is too long. 2014-06-14 14:31:12 +02:00
Tyler Renelle
8cab2951e5 fix(backgrounds): fix name visibility, perf++ :not(.hasBackground) => .notBackground 2014-06-12 12:48:40 -06:00
Tyler Renelle
99fb9b0959 fix(backgrounds): 15G confirm dialog, fixes #3595 2014-06-12 12:37:57 -06:00
Tyler Renelle
b5bf54a815 chore(subscribers): some busted transaction migration code 2014-06-12 12:32:20 -06:00
Tyler Renelle
8d49a4d032 perf(pets): render food as bindonce (angular 1.3), see #3558 2014-06-11 15:58:46 -06:00
Tyler Renelle
eb5d47f604 chore(angular): upgrade to angular 1.3.0-beta.11 2014-06-11 15:58:07 -06:00
Tyler Renelle
19c0a6b9b0 fix(responseInterceptor): update response interceptor to use latest angular API (prep for 1.3) 2014-06-11 15:25:25 -06:00
Tyler Renelle
cb7324ccdb refactor(pets): render pets server-side 2014-06-11 14:17:47 -06:00
Tyler Renelle
df1867ef4d refactor(pets): render mounts server-side for better perf 2014-06-11 13:58:51 -06:00
Tyler Renelle
81b7eed8ca chore(npm): upgrade mongoose 2014-06-11 12:37:58 -06:00
Tyler Renelle
2aacf63308 feat(backgrounds): bailey 2014-06-10 18:52:13 -06:00
Tyler Renelle
e3aeaab641 feat(backgrounds): i18n for backgrounds 2014-06-10 18:32:21 -06:00
Tyler Renelle
da4f51f049 feat(backgrounds): use nested backgrounds as {set:{bg1,bg2,bg3}} for
easier "purchase set". Refactor twoGem()
2014-06-10 17:05:44 -06:00
Tyler Renelle
c6232c2d1a feat(backgrounds): add backgrounds feature 2014-06-10 16:38:29 -06:00
Tyler Renelle
831f971193 fix(backers): give missing backer mount to $70+, sorry everyone :( :(
fixes #3544
2014-06-10 15:25:59 -06:00
deilann
b00bb26b03 Merge pull request #3584 from Gaelan/patch-1
Well, this was embarrassing.
2014-06-09 23:15:36 -07:00
Gaelan
8bd9f3d348 Fix stats.jade.
I broke it in a previous PR.
2014-06-09 22:51:28 -07:00
Sabe Jones
7bd421f10c Merge pull request #3582 from Gaelan/just_call_it_perception
Stop using abbreviated names of attributes in UI.
2014-06-09 22:09:58 -05:00
Bob Example
33a3958a2c Stop using abbreviated names of attributes in UI. 2014-06-09 17:29:51 -07:00
Tyler Renelle
f85d6b2978 feat(quests): add octopus quest 2014-06-09 14:33:08 -06:00
Tyler Renelle
b7cf71773a fix(quests): refunding scrolls. add .exec() to User.update() without callback 2014-06-08 18:28:04 -06:00
Tyler Renelle
efc9a6e715 fix(pets): if !Content.hatchingPotions[x], use string passed for
displayname. Fixes #3575
2014-06-08 11:11:34 -06:00
Tyler Renelle
ce2f0b1ba7 Merge pull request #3577 from vIiRuS/patch-1
Only refund quest scroll to leader if quest was active
2014-06-08 10:42:20 -06:00
Phillip Thelen
3aa8c885cf remove callback from user update
This way it continues to evaluate and also execute the group update.
2014-06-08 18:37:43 +02:00
Tyler Renelle
f46749824f Merge pull request #3524 from OverloadUT/ui-fix-disable-submit-during-edit
Hide task control buttons during editing
2014-06-08 10:13:42 -06:00
Tyler Renelle
34e0859d8b Merge pull request #3560 from denis-sokolov/cleanup-jsonjs
chore(migrations): cleanup unused json library, added in 999669a2, not removed in cbe23f638a
2014-06-08 10:07:20 -06:00
Phillip Thelen
e01ff99610 Only refund quest scroll to leader if quest was active
otherwise quest leader gets more quest scrolls than they had to begin with.
2014-06-08 16:08:14 +02:00
Matteo Pagliazzi
74d206ab74 fix(i18n): use strings 2014-06-07 14:26:58 +02:00