Commit Graph

14146 Commits

Author SHA1 Message Date
Blade Barringer bce4f55df5 chore: Fix score test to not be so flaky 2016-08-09 08:58:36 -05:00
Matteo Pagliazzi 6dfa93dab2 correct pusher inactivity timeout 2016-08-08 00:08:54 +02:00
Matteo Pagliazzi 8ffc93f9c5 3.29.1 v3.29.1 2016-08-07 22:24:39 +02:00
Matteo Pagliazzi 3efd900a3f correctly check for Pusher being enabled 2016-08-07 22:23:00 +02:00
Matteo Pagliazzi ff4a3adf7e feat(pusher): disconnect after 30m of inactivity 2016-08-07 22:20:45 +02:00
Husman 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
Sabe Jones ae533652c3 3.29.0 v3.29.0 2016-08-05 19:29:45 +00:00
Sabe Jones 77c276fefe feat(analytics): Facebook "Pixel" (#7871) 2016-08-05 13:40:25 -05:00
Blade Barringer 05eacc32ba Merge branch 'develop' into Hus274-7793 2016-08-05 12:55:00 -05:00
Blade Barringer 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
Travis 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
Blade Barringer 093c5a72df Merge branch 'develop' into Ozzystrasza-tavern_default_prize 2016-08-05 12:22:41 -05:00
Blade Barringer 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
Blade Barringer 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
Philip Karpiak 2788d64a2b Fix #7778 - update missing image in static/features (#7874) 2016-08-05 11:58:21 -05:00
Philip Karpiak 3429f88f5b Fix #7869 - highlight current audio theme in dropdown 2016-08-04 18:53:21 -04:00
Philip Karpiak bea4bf80e9 Fix #6708 - guild message maximizes width in Firefox 2016-08-04 18:02:55 -04:00
Matteo Pagliazzi ae5b66e248 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2016-08-04 20:00:19 +02:00
Matteo Pagliazzi 110a9d52fa Merge branch 'TheHollidayInn-facebook-login-add-newuser-flag' into develop 2016-08-04 19:59:59 +02:00
Matteo Pagliazzi 725ed22704 added apidoc info about data.newUser in login response 2016-08-04 19:59:48 +02:00
Matteo Pagliazzi 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
Matteo Pagliazzi 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
Sabe Jones d097868cad 3.28.0 v3.28.0 2016-08-03 20:40:18 +00:00
Sabe Jones 3a48022878 chore(news): announce audio theme 2016-08-03 20:37:43 +00:00
Sabe Jones b25ab8ca75 chore(sprites): compile 2016-08-03 20:27:49 +00:00
Sabe Jones 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
Matteo Pagliazzi 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
Keith Holliday 2a76f0c8cf Added lint ignore comment 2016-08-02 14:29:15 -05:00
Oziris 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
Ozzystrasza 063995d5e4 Test prize amount before changing to 1 2016-08-01 20:26:43 -03:00
Sabe Jones d37ee98c6d 3.27.0 v3.27.0 2016-08-01 23:12:21 +00:00
Sabe Jones 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
Matteo Pagliazzi 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
Sabe Jones 2a3e3fb9d3 fix(gear): buy false takeThis gear (#7855) 2016-08-01 15:16:34 -05:00
Oziris 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
Sabe Jones a8226b2363 3.26.0 v3.26.0 2016-08-01 00:20:13 +00:00
Sabe Jones 7ad313918a fix(news): missing date line 2016-07-31 19:00:57 -05:00
Sabe Jones 6ce917a0f3 feat(content): Naming Day 2016 (#7853) 2016-07-31 18:56:20 -05:00
Sabe Jones e021212481 Naming Day and Take This migrations (#7838)
* feat(migrations): Naming Day and Take This

* fix(migration): more goodies, better query

* fix(migration): query in wrong migration

* fix(migration): don't award goodies repeatedly

* fix(migrations): move logic to query

* fix(migrations): better field lookup

* fix(migrations): use timeouts
2016-07-31 18:55:57 -05:00
Husman 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
Travis 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
Sabe Jones 6e55be033b 3.25.3 v3.25.3 2016-07-30 01:26:44 +00:00
Sabe Jones 084e2e7470 fix(news): also announce iOS 2016-07-30 01:26:24 +00:00
Sabe Jones 98e74b42e0 3.25.2 v3.25.2 2016-07-29 23:39:26 +00:00
Sabe Jones e52f9bd786 Last Chance Bailey 2016/07 (#7842)
* chore(news): Last Chance Bailey

* fix(news): rearrange announcements
2016-07-29 18:18:15 -05:00
Ryan Castner 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
Keith Holliday e6dd8cc03a Added tests for Facebook auth 2016-07-27 14:27:21 -05:00
Blade Barringer 795ea8ba80 Merge pull request #7835 from crookedneighbor/sanity_tests
chore(tests): Add sanity test for proper babel routes
2016-07-26 22:25:15 -05:00
Blade Barringer c7d08a6811 chore(tests): Add sanity test for proper babel routes 2016-07-26 21:56:51 -05:00
Sabe Jones 1ed7e21542 3.25.1 v3.25.1 2016-07-26 22:35:28 +00:00