84db289957
Merge branch 'develop' into add-flag-to-chat
2014-12-23 10:07:42 -06:00
0dfa770fe4
update winter 2013 to winter 2014 to satisfy new naming conventions
2014-12-22 21:13:59 -08:00
42cb93c673
Add variables for medium-length date display
2014-12-22 22:23:11 -05:00
d34b116732
update formatting for gear style guidelines
2014-12-23 06:43:05 +10:00
d6354007f1
update formatting for gear style guidelines
2014-12-23 06:42:10 +10:00
9d7bf26988
update formatting for gear style guidelines
2014-12-23 06:38:21 +10:00
36a552b4a3
update formatting for gear style guidelines
2014-12-23 06:34:57 +10:00
e30ff2eebb
create style guide for gear/equipment descriptions based on ShilohT's suggestions in https://github.com/HabitRPG/habitrpg-shared/pull/372
2014-12-23 06:28:34 +10:00
c4143c7805
added variable for date display and checking line ending issue
2014-12-22 15:19:53 -05:00
4c785e8459
fix(flag-chat): correct url for tavern flags
2014-12-22 21:09:27 +01:00
6f410f59ce
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into add-flag-to-chat
2014-12-22 13:28:01 -06:00
37b9e5012a
Added links to user modals
2014-12-22 13:22:42 -06:00
d079ebbee9
chore(i18n): update locales
2014-12-22 20:09:45 +01: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
be62f4bb7f
Merge pull request #403 from SabreCat/Bailey
...
Promo art
2014-12-21 15:47:36 -06:00
eb0d19fa29
chore(grunt): grunt full
2014-12-21 15:45:13 -06:00
833ff90a59
chore(news): Wonderland Bailey 1
2014-12-21 15:41:32 -06:00
0ec9e5b1e1
feat(news): Promo images
2014-12-21 15:40:07 -06:00
ef02e059c7
chore(grunt): grunt full
2014-12-21 15:24:55 -06:00
5979aa3b9a
Merge pull request #4394 from SabreCat/hair
...
Wintery Hair Colors for Wonderland 2015
2014-12-21 15:17:47 -06:00
649e207769
Merge pull request #402 from SabreCat/winter2015/hair
...
Wintery Hair Colors for Wonderland 2015
2014-12-21 15:16:10 -06:00
1ff25dfd5b
Merge pull request #401 from SabreCat/winter2015/gear
...
Winter Wonderland 2015 Gear
2014-12-21 15:09:51 -06:00
784850f934
Merge pull request #400 from SabreCat/winter2015/npcs
...
Winter 2015 NPCs
2014-12-21 15:08:46 -06:00
bb89a10356
feat(event): Wintery Hair Colors
2014-12-21 13:58:47 -06:00
d0a97fb20f
feat(event): Wintery Hair Colors
...
Also removes an accidental duplication of a prior hair resource.
2014-12-21 13:55:23 -06:00
e62cb74ad0
fix(event): head, not helm
2014-12-21 12:43:44 -06:00
8ec9f79188
feat(event): Winter Wonderland 2015 gear
2014-12-21 12:37:37 -06:00
8d645bcafd
chore(grunt): grunt full
...
Also flips Ian NPC to standard spritesmith instead of animated GIF.
2014-12-21 10:57:02 -06:00
c8aadf296e
feat(event): Winter NPCs
2014-12-21 10:44:08 -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
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
Blade Barringer