998c679e96
Merge branch 'api-v3' into api-v3-client
2016-05-11 16:01:54 +02:00
a947afa5c6
Merge branch 'develop' into api-v3
2016-05-11 14:36:58 +02:00
7f11e766c3
Sabrecat/glasses chairs ( #7182 )
...
* feat(customization): new chairs, eyeglass sprites
* feat(avatar): finish glasses implementation
* fix(test): include glasses in base equipment
2016-05-10 16:07:46 -05:00
632a1ebbf3
Fixed linting and some tests
2016-05-10 15:15:55 -05:00
a0939155c9
Updated login headers save. Added task service to user service. Sync user tasks
2016-05-10 15:15:55 -05:00
b037ddd14c
Ported User Serivce to client side and to api v3
2016-05-10 15:15:55 -05:00
e747bba669
Updated add and remove tests for challenges ( #7155 )
2016-05-08 18:35:38 +02:00
4c37417bd4
Updated task service to use api v3 ( #7136 )
...
* Updated task service to use api v3
* Add user.ops functions back
* Removed extra parameter
2016-05-08 16:52:43 +02:00
d5b3bbfaad
Sabrecat/armoire 201605 ( #7142 )
...
* feat(content): May BGs and Armoire
* chore(news): Bailey 20160503
2016-05-03 15:20:00 -05:00
78a8eea79a
Updated quest service to use new api-v3 ( #7126 )
...
* Updated quest service to use new api-v3
* Updated inviteToQuest function name. Used quest return rather than syncing party
2016-05-03 17:16:30 +02:00
166a37d53f
chore(event): end Spring Fling 2016
2016-05-02 01:36:03 +00:00
3437744f62
Merge branch 'api-v3' into api-v3-client
2016-04-30 16:51:15 +02:00
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
ea490c9a1f
Ported groups service to user new api v3 and ported dependent controllers ( #7108 )
...
* Ported groups service to user new api v3 and ported dependent controllers
* Remove and extra remove inviation code. Fixed group service caching and update group service tests
* Fixed test logic and added party cache support
* Added promise rejections and updated http interceptor
2016-04-25 23:11:23 +02: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
f2d5c921ed
Merge branch 'api-v3' into api-v3-client
2016-04-24 15:09:10 +02: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
4cda56e3eb
Merge branch 'api-v3' into api-v3-client
2016-04-23 03:08:37 +02: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
4138eab155
v3: undo changes to client that were necessary to test v2
2016-04-19 12:16:39 +02: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
Matteo Pagliazzi