be37e88dc3
Corrected example for send gift to be correct
2014-12-19 11:06:09 -06:00
d358236f42
Corrected example for show private message so it would result in a valid
...
call
2014-12-19 11:06:09 -06:00
a078636416
Fixed get members so it can be used on static/api page
2014-12-19 11:06:09 -06:00
18288ed016
Merge pull request #4390 from thehindenburg/seasonShop
...
change link in gala page to gala wiki. Closes #4390
Got @thehindenburg 's `uuid` from a previous PR: `5a07a8f6-100c-447f-9272-d5796326fc93`. Would someone log this contribution?
2014-12-19 10:03:49 -06:00
1675bb26b2
change link in gala page to gala wiki
2014-12-19 07:47:28 -08:00
9406b3cf70
Removed unnecessary console.log
2014-12-18 22:36:52 -06:00
eeff8a80d6
Brought in groups.json from original branch
2014-12-18 22:01:52 -06:00
be831d864a
Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
src/controllers/groups.js
views/options/social/chat-message.jade
2014-12-18 21:58:06 -06:00
7f10049b37
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
views/options/social/chat-message.jade
2014-12-18 21:55:50 -06:00
486d8a9bbf
chore(i18n): update locales
2014-12-18 22:56:34 +01:00
1fe3664731
ran grunt to compile coffeescript
2014-12-18 14:01:31 -06:00
e1d44cc54f
HabitRPG/habitrpg#3260 Buttonless habit full width
...
When the user has neither a plus nor a minus button on
one of their habits, the habit’s title will now span the entire
width of the task div instead of having a gap to the left.
2014-12-18 14:01:31 -06:00
7db273c0be
Merge pull request #3773 from benlind/buttonless_habits_full_space
...
Fixes #3260 : Buttonless habits full width
2014-12-18 13:52:01 -06:00
4f5e813fcf
Merge pull request #396 from jamesleonis/develop
...
Incorrect grammar in Vice 2 quest notes
2014-12-18 19:48:46 +10:00
c308f6cf9f
Incorrect grammar in Vice 2 quest notes
...
"makes it's way to Mt. Habitica" to "makes its way to Mt. Habitica"
2014-12-18 01:01:18 -08:00
dc18569e78
fix(phantom): downgrade to node 0.10.22 due to CERT error, see
...
https://github.com/Medium/phantomjs/issues/262 (cc @sabrecat)
2014-12-17 22:16:41 -07:00
30e5e2096a
grunt full
2014-12-17 21:53:27 -07:00
09ba5384f8
Merge pull request #395 from SabreCat/seasonal
...
fix(seasonal): Leslie link
2014-12-17 18:38:32 -06:00
c7da56cc00
Merge pull request #4387 from SabreCat/seasonal
...
fix(seasonal): Leslie link
2014-12-17 18:38:16 -06:00
8ff0a4a4a4
fix(seasonal): Leslie link
2014-12-17 18:27:37 -06:00
6e77392e7a
fix(seasonal): Leslie link
2014-12-17 18:26:52 -06:00
cbfd043b2c
Merge pull request #394 from SabreCat/seasonal
...
Seasonal Shop Basics
2014-12-16 21:52:28 -06:00
eadedd5897
Merge pull request #4383 from SabreCat/seasonal
...
Seasonal Shop Basics
2014-12-16 21:51:02 -06:00
dbe608bc3a
fix(news): correct link and awkward image
2014-12-16 20:24:04 -06:00
58957118c0
chore(news): Bailey for Seasonal Shop
2014-12-16 20:18:55 -06:00
d91d9e1eb3
refactor(facebook): use async.auto to collect multiple vars, cleaner
...
than waterfall
2014-12-16 16:30:51 -07:00
2822ce233f
fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231
2014-12-16 14:17:38 -07:00
059f719461
Merge pull request #231 from wc8/patch-1
...
innText update of groups.json to call username
2014-12-16 14:16:26 -07:00
709fb2b706
Revert "refactor(iap): use env var for google IAP". orders are being
...
left in "Chargeable - Delivered" for some reason.
This reverts commit 43961a5ab9
2014-12-16 13:07:01 -07:00
43961a5ab9
refactor(iap): use env var for google IAP, intead of key file. See
...
https://github.com/voltrue2/in-app-purchase/commit/cb31043281dc1221c61efb2dfbd13687761bceca
cc @negue
2014-12-16 11:44:58 -07:00
d56eb1eeeb
Added last guild link, corrected hall links
2014-12-14 20:10:42 -06:00
63c2248b38
Corrected guild links
2014-12-14 20:07:46 -06:00
9cdbca8c2b
Reverted routing for groups back
2014-12-14 20:05:01 -06:00
d1b1a866ac
Fixed when routing. Closes #4371
2014-12-14 19:01:52 -06:00
071ac02ec2
chore(git): Resolve merge conflict
2014-12-14 14:55:37 -06:00
a9fa8ed038
Merge pull request #4382 from SabreCat/timetravel
...
Translate TT in menu
2014-12-14 14:34:43 -06:00
19930226c7
chore(grunt): grunt
2014-12-14 14:24:37 -06:00
9f46e14cd6
fix(seasonal): missing bang
2014-12-14 14:18:57 -06:00
867f50b514
fix(seasonal): Add menu item
2014-12-14 14:12:20 -06:00
8cd1ea48db
fix(I18N): Remove more hardcoded text
2014-12-14 14:10:39 -06:00
6dcbd329a5
fix(seasonal): Typo in string resource
2014-12-14 14:05:43 -06:00
7988dfcf82
fix(seasonal): Corrections for Shop
...
Fix Jade indenting, add state control, add menu option
2014-12-14 14:01:25 -06:00
29f693cd24
fix(I18N): Remove hardcoded text
2014-12-14 13:55:40 -06:00
506c396baf
fix(I18N): Translate TT in menu
2014-12-14 13:53:00 -06:00
a98a685971
feat(seasonal): Seasonal Shop
...
Initial commit of frontend for Seasonal Shop feature.
2014-12-14 13:37:32 -06:00
c7ee171ee4
feat(seasonal): Seasonal shop
...
Initial commit of resources for the Seasonal Shop feature.
2014-12-14 13:33:10 -06:00
ab7c1996b2
Merge pull request #4381 from SabreCat/timetravel
...
Make Time Travel translatable
2014-12-14 13:28:03 -06:00
0352adfd47
Merge pull request #393 from SabreCat/timetravel
...
Translate Time Travelers
2014-12-14 13:27:48 -06:00
35b02cfdd8
fix(I18N): Make Time Travel translatable
2014-12-14 12:59:45 -06:00
8d042745be
fix(I18N): Translate Time Travelers
2014-12-14 12:57:36 -06:00
Blade Barringer