f69a566178
Merge branch 'develop' into api-v3
2016-04-30 16:49:44 +02:00
1787342951
chore(news): Last Chance Bailey 201604
2016-04-29 22:16:36 +00:00
2aa3a3175f
Merge branch 'develop' into kelsin-develop
2016-04-27 19:11:56 -05:00
bf7ce46ea4
chore(news): Be-Wilder conclusion
2016-04-27 04:16:35 +00:00
d96b13ed43
chore(news): Floral Potions Bailey
2016-04-25 21:20:21 +00:00
974896ce7b
feat(events): April Mystery and Floral Potions ( #7107 )
...
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
2016-04-25 14:17:31 -05:00
6197fcea3b
Merge branch 'develop' into api-v3
2016-04-24 15:08:13 +02:00
8355dbe63f
chore(news): Bewildered Bailey
2016-04-23 04:00:30 +00:00
2d87cb0d87
Merge branch 'develop' into api-v3
2016-04-22 17:43:48 +02:00
867146dc19
fix(xss): Update site to use remarkable instead of marked
...
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
2016-04-21 13:23:53 -05:00
f44dbbbd71
Merge branch 'develop' into api-v3
2016-04-19 12:16:22 +02:00
ed49a377e1
add community guidelines info to profile editing ( #7086 )
...
* add community guidelines info to profile editing
* Update profile.jade
2016-04-19 10:15:21 +10:00
f1788080da
Add list of Featured third-party Apps ( #7046 )
...
* add list of featured third-party apps
* Add comma
* add descriptions
* add description to other
* add table
* add description to other
Conflicts:
common/locales/en/settings.json
website/views/options/settings.jade
* Update settings.json
* Sort extensions by name
2016-04-19 08:21:07 +10:00
c2b8cad886
v3: fix v3 proxied ops in v2, logout
2016-04-16 19:56:33 +02:00
881cf0292d
chore(news): mobile and Beguilement Bailey
2016-04-15 18:46:02 +00:00
c608ac9ecc
fix(news): Erratum
2016-04-15 11:53:58 -05:00
1a64886f7d
Merge branch 'develop' into api-v3
2016-04-15 08:04:46 -05:00
ffb3ed0aa4
chore(news): annouce Android update
2016-04-14 23:48:45 +00:00
13edca4588
chore(news): add skill icon announcement
2016-04-13 21:25:31 +00:00
925881b2a0
misc fixes and enable dev endpoints for easier live testing
2016-04-13 22:55:39 +02:00
7bb6f968b4
feat(content): Pet Quest 2016-04 ( #7071 )
...
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
2016-04-13 12:15:38 -05:00
a29dd1a1c7
fix(build) temporarily use habitrpg-shared from habitica.com in v3 client
2016-04-12 09:46:01 +02:00
ecb9e09ad8
fix: Add missing sprite class for skills icon in rewards column
...
closes #4276
closes #6950
2016-04-11 08:00:42 -05:00
b4eb386047
chore: Change spells file name to skills
2016-04-11 08:00:10 -05:00
8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
b7d801a603
fix(news): typo
2016-04-08 16:17:51 -05:00
7118e68cf0
chore(news): Beguilement Strike Bailey
2016-04-08 19:06:09 +00:00
74dace9b5a
chore: Re-enable New Relic
...
closes #7011
2016-04-05 20:08:31 -05:00
1f6eef0082
Sabrecat/armoire 201604
...
* WIP(content): add sprites
* feat(content): Armoire and Backgrounds 2016-04
2016-04-05 15:30:01 -05:00
c5f17b4011
Merge branch 'develop' into api-v3
2016-04-01 11:50:41 +02:00
3281894d83
chore(news): World Boss Bailey
2016-03-31 19:54:13 -04:00
a07aed331c
fix(world-boss): add chat message, Bailey handling, animation
2016-03-31 19:38:43 -04:00
f51653b7a5
WIP(world-boss): partial build
2016-03-31 17:29:21 -04:00
3089658cc7
Merge branch 'develop' into api-v3
2016-03-30 23:40:00 +02:00
4fa8c6dfbd
chore(news): Bailey 2016-03-30
2016-03-30 15:39:12 -04:00
a9d227b490
Merge branch 'develop' into wheelchair
2016-03-28 21:12:52 -05:00
d89d1e50dd
Merge branch 'develop' into api-v3
2016-03-25 15:58:04 +01:00
cd6adf2421
fix: correct wheelchair spelling
2016-03-24 21:31:20 -05:00
c88f2ce580
refactor: Use resized version of wheelchair for selection
2016-03-24 07:57:57 -05:00
0f9cf57613
feat: Add wheelchair to avatar customization
2016-03-24 07:57:13 -05:00
17b02f2867
fix(news): missing promo
2016-03-23 15:47:22 -04:00
ba1cc67654
chore(news): fill out remaining Bailey
2016-03-23 15:36:24 -04:00
f7027b5cf3
feat(event): subscriber items 2016-03
2016-03-23 15:36:24 -04:00
86516b5e20
Update presskit
2016-03-22 08:41:02 -05:00
0bde9e2df2
Merge branch 'develop' into api-v3
2016-03-21 23:03:28 +01:00
8447259016
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
...
Spring Fling 2016
2016-03-18 16:08:46 -05:00
b5f91a657f
feat(event): Spring Fling complete
2016-03-18 16:56:16 -04:00
10a8476aaf
WIP(event): Spring Fling cont'd
2016-03-17 13:10:05 -04:00
4effa79e17
WIP(event): Spring Fling partial
2016-03-17 13:04:12 -04:00
ced0b44b2f
fix: Remove name from sortable inventory
2016-03-17 08:47:56 -05:00
Matteo Pagliazzi