55111a6ddc
New Party Loading Messages ( #7862 )
...
* add basic party loading message code; doesn't work yet
* fixup party loading messages, remove rpg-style messages
* move party-loading messages back into groups.json
* party-loading message logic returns a string instead of a number
2016-08-12 08:53:03 -05:00
7ccbcd7b33
add reorder task step to ios tutorial, mounts and inbox steps for both android and ios
2016-08-12 14:55:55 +02:00
679378331d
add client and OS info to amplitude events
...
closes #7865
2016-08-11 08:58:13 -05:00
e3c40aa142
fix(client): Prevent restore streak from showing up in challenge creation
2016-08-11 08:48:44 -05:00
725c3b36f3
feat: allowing modification of challenge tasks after challenge creation. fixes #7320
...
closes #7877
2016-08-11 08:48:39 -05:00
89822222fe
Merge pull request #7881 from Hus274/7716
...
fix: shows user correct challenge when showing won challenge modal
2016-08-11 08:07:16 -05:00
fed1eb8c21
fix(client): set state chagne to scroll to top
...
closes #7880
fixes #4326
2016-08-11 07:59:12 -05:00
858da4f9c9
Merge pull request #7890 from HabitRPG/sabrecat/prefs-undefined
...
Fix preferences typeError
2016-08-11 07:48:14 -05:00
cdeb498c0b
Align guild gems box with other page elements ( #7829 )
...
* Align guild gems box with other page elements
Fixes #7796 .
* Fix issues caused by aligning guild gems box
* Remove unnecessary comment
* Connect gem total box and plus/add gems button
When the add gems button is displayed, set border-radius on touching
corners between the two buttons to 0, so that they are displayed as a
unit rather than two separate buttons.
2016-08-11 07:45:21 -05:00
e7a820e28d
fix(editing): preferences typeError
2016-08-10 20:23:14 +00:00
a5b2e53914
fix(client): Add client redirect for coupon url
2016-08-10 12:12:56 -05:00
420cebd93b
fix: Correct purchase call to use purchaseType, not identifier
2016-08-10 08:58:01 -05:00
4df2b723fa
fix errors in apidocs for coupons/enter/:code and tasks/:taskId
2016-08-10 12:50:07 +10:00
72f1114d85
refactor(content): concatenate notes
2016-08-09 23:19:53 +00:00
051763bc49
Thunderstorm Hatching Potions ( #7885 )
...
* feat(premium): Thunderstorm Potions
* chore(news): Thunderstorm Bailey
* fix(test): allow addlNotes key
2016-08-09 17:37:39 -05:00
689a321a9b
enable pusher for all users
2016-08-09 20:05:04 +02:00
acc9e8ca7f
fix: shows user correct challenge when showing won challenge modal
2016-08-07 16:27:18 -07:00
6dfa93dab2
correct pusher inactivity timeout
2016-08-08 00:08:54 +02:00
3efd900a3f
correctly check for Pusher being enabled
2016-08-07 22:23:00 +02:00
ff4a3adf7e
feat(pusher): disconnect after 30m of inactivity
2016-08-07 22:20:45 +02:00
bba56b8c29
fix: remove guild or party when user looks it up if it does not exist
...
closes #7878
fixes #7724
2016-08-07 10:41:07 -05:00
77c276fefe
feat(analytics): Facebook "Pixel" ( #7871 )
2016-08-05 13:40:25 -05:00
05eacc32ba
Merge branch 'develop' into Hus274-7793
2016-08-05 12:55:00 -05:00
626b87eb79
Merge pull request #7849 from Hus274/7653-3
...
booting a member from party removes member from quest
2016-08-05 12:35:45 -05:00
d7c5d05f13
Clear invites from user when the request fails because the invite is invalid ( #7852 )
...
* making requests to accept or reject a request fail because the invite is invalid clear the invite from the user so it doesn't require admin intervention. part of #7653
* Adding await
2016-08-05 12:34:06 -05:00
093c5a72df
Merge branch 'develop' into Ozzystrasza-tavern_default_prize
2016-08-05 12:22:41 -05:00
ed0055e01b
Merge pull request #7872 from ESWAT/fix-guild-message-firefox
...
Fix #6708 - guild message maximizes width in Firefox
2016-08-05 12:00:57 -05:00
70ee091fa8
Merge pull request #7873 from ESWAT/fix-current-audio-theme
...
Fix #7869 - highlight current audio theme in dropdown
2016-08-05 11:59:34 -05:00
2788d64a2b
Fix #7778 - update missing image in static/features ( #7874 )
2016-08-05 11:58:21 -05:00
3429f88f5b
Fix #7869 - highlight current audio theme in dropdown
2016-08-04 18:53:21 -04:00
bea4bf80e9
Fix #6708 - guild message maximizes width in Firefox
2016-08-04 18:02:55 -04:00
ae5b66e248
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-08-04 20:00:19 +02:00
725ed22704
added apidoc info about data.newUser in login response
2016-08-04 19:59:48 +02:00
d1bd63289b
Merge branch 'facebook-login-add-newuser-flag' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-facebook-login-add-newuser-flag
2016-08-04 19:58:09 +02:00
d7ccf2bbe1
API: return computed stats for members routes ( #7870 )
...
* api: return computed stats for members responses
* add integration tests for computed stats
* add unit tests for computed stats
* clarify test name
* add missing query parameter to test case
* reset test database before running API tests for the Hall
2016-08-04 19:56:00 +02:00
3a48022878
chore(news): announce audio theme
2016-08-03 20:37:43 +00:00
29498976ee
feat(content): Armoire and BGs 201608 ( #7868 )
...
Plus: beta shops API fixes and front page user count update
2016-08-03 14:55:12 -05:00
fb939e0300
Migrate from GCM to FCM notifications ( #7860 )
...
* Fixed logging. Fixed lint issues. Temporarly removed GCM code
* Removed extra packages. Removed lingering gcm code
* Update message structure to send a data notification instead of a regular notification
* Removed excess code
* switch from fcm-push to node-gcm
2016-08-02 23:12:39 +02:00
4244c7519e
Add Dewin's new Theme ( #7795 )
...
* Add files via upload
* Add string for new theme
* Added 'dewinTheme'
* Added 'dewinTheme'
* Delete Boss Battles Background Music.mp3
* Delete Boss Battles Background Music.ogg
* Delete Settings Page Background Music.mp3
* Delete Settings Page Background Music.ogg
* Add audio files with correct names
* Delete Boss Battles_Background_Music.mp3
* Delete Boss Battles_Background_Music.ogg
* Add files via upload
2016-08-02 10:03:01 +10:00
063995d5e4
Test prize amount before changing to 1
2016-08-01 20:26:43 -03:00
9a338ef1de
End Summer Splash 2016 ( #7857 )
...
* chore(event): end Summer Splash 2016
* fix(event): disable Seasonal Shop buys
2016-08-01 17:47:46 -05:00
60f34dafb0
Deprecate API v2 (was Revert "Revert "Deprecate API v2"") ( #7802 )
...
* Revert "Revert "Deprecate API v2""
* fix path in shops controller
2016-08-01 22:36:10 +02:00
d51bd68201
Enable guild challenge prize to use guild bank gems ( #7840 )
...
* add leader property to getGroups
* Add test coverage
2016-08-01 14:31:31 -05:00
7ad313918a
fix(news): missing date line
2016-07-31 19:00:57 -05:00
6ce917a0f3
feat(content): Naming Day 2016 ( #7853 )
2016-07-31 18:56:20 -05:00
6859cf1f73
booting a member from party removes member from quest whether the quest is started or not. part of #7653
2016-07-30 09:44:21 -07:00
6804125068
voluntarily leaving a party removes the user from the quest the party is involved in ( #7845 )
...
* voluntarily leaving a party removes the user from the quest the party is involved in. part of #7653
* addressing pr comments, removing lodash dependency and unecessary comment
* using the existing update object instead of group.save to avoid duplicate behavior
* finalizing tests
2016-07-30 06:53:29 -05:00
084e2e7470
fix(news): also announce iOS
2016-07-30 01:26:24 +00:00
e52f9bd786
Last Chance Bailey 2016/07 ( #7842 )
...
* chore(news): Last Chance Bailey
* fix(news): rearrange announcements
2016-07-29 18:18:15 -05:00
7c579bf850
7837-Update API Docs ( #7839 )
...
* Updated API Docs for api-v3
* Updated API Docs for top-level
* Updates relating to @crookedneighbor comments
* Updated type and field of 'to' param.
2016-07-27 18:48:03 -05:00
Kaitlin Hipkin