2bb1e5cf7f
Merge branch 'confirm-delete' into develop
2014-12-26 21:04:48 -06:00
695c463b40
Added confirmation dialog before deleting message
2014-12-26 21:04:22 -06:00
72d4bf2bf5
Merge pull request #4423 from andyzinsser/fix-no-food-text-color
...
Add muted class when no food is in inventory
2014-12-26 20:47:15 -06:00
db6f52e4b5
Add muted class when no food is in inventory
2014-12-26 18:31:21 -08:00
af7e68259d
Merge pull request #4404 from sbreiler/develop
...
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-27 12:29:04 +10:00
ffbd3c703a
Merge pull request #4411 from crookedneighbor/seasonal-shop-indication-if-purchased
...
Added trasnparent class to seasonal items already owned
2014-12-26 16:35:53 -06:00
f5a0bd6903
Added trasnparent class to seasonal items already owned
2014-12-25 21:32:07 -06:00
a1eb4bfa5b
Merge pull request #4408 from SabreCat/seasonal
...
Winter Wonderland 2015 Cont'd
2014-12-25 17:47:50 -06:00
1b4843ff58
fix(event): Better quest text placement
2014-12-25 17:42:09 -06:00
f4c582eb24
fix(event): quest syntax
2014-12-25 17:40:49 -06:00
597793e3ca
feat(event): Quests and Bailey
2014-12-25 17:36:16 -06:00
6d4d9451a5
feat(event): Mystery migration
2014-12-25 17:09:06 -06:00
1c90886548
fix(event): Better shop flow
2014-12-25 15:52:26 -06:00
0e28f04c90
feat(event): Implement Seasonal Shop
2014-12-25 14:33:11 -06:00
a8459c2f96
Changing button to a element fixed the delete on enter problem
2014-12-24 11:17:05 -06:00
0339bdf43f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-12-24 09:02:20 -06:00
fdcc22bde9
Closes #4361
2014-12-24 09:02:03 -06:00
118ba88d3d
fix(tasks): improve UI consistency and layout
...
* Match UI elements with rest of site
* Tidy up layout
2014-12-24 09:53:41 +00:00
8cf3cd66cc
fix(avatar): prevent avatar from obscuring name
...
Increase z-index of avatar-name so that avatar image doesn’t obscure it
when riding a mount
2014-12-24 09:53:40 +00:00
e1eaefa943
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-24 00:14:08 +01:00
635ebf626b
fix(flag-email): correctly format date
2014-12-23 18:54:56 +01:00
c55ebf5c07
Merge pull request #4402 from HabitRPG/add-flag-to-chat
...
Add flag to chat
2014-12-23 18:36:23 +01:00
8e0358f7c7
Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat
2014-12-23 10:08:01 -06:00
84db289957
Merge branch 'develop' into add-flag-to-chat
2014-12-23 10:07:42 -06:00
4c785e8459
fix(flag-chat): correct url for tavern flags
2014-12-22 21:09:27 +01:00
37b9e5012a
Added links to user modals
2014-12-22 13:22:42 -06:00
2d4c5e7b98
feat(flag-chat): fetch author and add some group variables
2014-12-22 20:02:22 +01:00
7aff280a71
feat(flag-chat): add some variables
2014-12-22 19:56:11 +01:00
652ce10e22
feat(flag-chat): start implemnting email
2014-12-22 19:48:03 +01:00
07fbcbcb08
Revert "fix(phantom): downgrade to node 0.10.22 due to CERT error, see"
...
This reverts commit dc18569e78
2014-12-21 20:53:03 -06:00
883d472b94
Merge pull request #4395 from SabreCat/Bailey
...
Wonderland Bailey 1
2014-12-21 15:47:51 -06:00
833ff90a59
chore(news): Wonderland Bailey 1
2014-12-21 15:41:32 -06:00
5979aa3b9a
Merge pull request #4394 from SabreCat/hair
...
Wintery Hair Colors for Wonderland 2015
2014-12-21 15:17:47 -06:00
bb89a10356
feat(event): Wintery Hair Colors
2014-12-21 13:58:47 -06:00
492260d74a
refactor(coupons): coupons cleanup using async.auto
2014-12-20 17:58:00 -07:00
b2bbfdfe09
Merge pull request #4392 from crookedneighbor/fix-moment-in-tests
...
Updated moment calls to use number, period to fix the depreciation error
2014-12-20 17:15:19 +01:00
8b3c6f94bf
fix(loggly): send more infos about cron errors
2014-12-20 16:20:40 +01:00
95951a4706
Updated moment calls to use number, period to fix the deprecation error
2014-12-19 19:41:22 -06:00
739d8885a3
fix(emails): remove unused variable
2014-12-19 19:59:12 +01:00
7c0b25d58a
pass base_url to emails as variable
2014-12-19 19:46:05 +01:00
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
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
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
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
Blade Barringer