Commit graph

3334 commits

Author SHA1 Message Date
Sabe Jones
ff53552fd3 chore(news): Bailey 20160916
And compile in Beffymaroo promo sprite
2016-09-17 03:33:02 +00:00
Blade Barringer
d782ed5d20 chore: compile sprites 2016-09-16 21:03:28 -05:00
Sabe Jones
8b83d8d4e9 fix(sprites): use correct URL in CSS 2016-09-16 22:54:52 +00:00
AccioBooks
5d18640215 Pluralization (#8027) 2016-09-16 16:14:23 -05:00
Sabe Jones
bde6b7d6ce chore(contact): revert community manager links (#8028) 2016-09-16 16:09:57 -05:00
Blade Barringer
5393c3b6c0 chore(i18n): update locales 2016-09-16 15:49:15 -05:00
Blade Barringer
84136882d3 fix: Add back in missing translation string
closes #8026
2016-09-16 15:40:34 -05:00
Sabe Jones
86c9bddc09 Handle social auth in A/B testing (#8024)
* fix(AB-testing): handle social auth

* refactor(AB-testing): move to pre save hooks
2016-09-16 19:13:21 +02:00
Blade Barringer
81b7eeeb71 Common reorg (#8025)
* Re-organize common folder

* fix: Correct paths in tests

* fix: move new content to proper folder

* chore: Move audio folder to assets

* Move sprites to sprites assets directory

* Move css sprites to assets directory

* Split out readmes for common code and sprites

* Move images to assets directory

* Move destinatin of shared browserified file

* remove unused file

* move compiled js to client-old

* Fix karma tests

* fix: Correct paths for sprites
2016-09-16 17:18:07 +02:00
Matteo Pagliazzi
d971e673af fix typo 2016-09-16 15:28:57 +02:00
Matteo Pagliazzi
603226a084 make sure Pusher cannot get stuck 2016-09-16 15:12:32 +02:00
Matteo Pagliazzi
a38f524d62 sync user n party chat system message 2016-09-16 14:36:38 +02:00
Matteo Pagliazzi
3b0e6e138a better handling of pusher connection with logging 2016-09-16 13:09:59 +02:00
Blade Barringer
9c0998c29a refactor(client): extract find pet logic into function 2016-09-15 22:02:11 -05:00
Oziris Moreira
4ad50b9d30 Fix Magic Mount Spacing (#8015)
* fix magic mount spacing

* simplify functions

* function hasAPetOfPotion

* var premiumPotion
2016-09-15 22:01:31 -05:00
Matteo Pagliazzi
0d1b5aad7e rtc fixes: do not show notification if message was sent by current user from different computer or mobile, put back message syncing on posting for guilds and tavern 2016-09-14 23:19:32 +02:00
Blade Barringer
1484f8afe3 fix: only report webhook error if there is an error 2016-09-14 12:51:50 -05:00
Matteo Pagliazzi
33bcb40077 rename client-new to client and add README 2016-09-14 16:43:11 +02:00
Matteo Pagliazzi
6bddef6878 add new client folder and expose it at /new-app when not in production 2016-09-14 16:34:55 +02:00
Matteo Pagliazzi
4b48b7a5f6 rename website/client to website/client-old 2016-09-14 15:06:32 +02:00
Blade Barringer
555ddbbe4c fix: allow todo due date to be edited 2016-09-14 07:43:35 -05:00
Matteo Pagliazzi
50ea1f5b08 RTC: add modal for desktop notifications (#8007)
* add initial modal for desktop notifications

* add missing files

* vertically center modal and use callback on safari

* fix(modal): update wording
2016-09-13 16:08:54 -05:00
Sabe Jones
52d8667fdb feat(content): Pet Quest 201909 2016-09-13 20:01:53 +00:00
cincospenguinos
f5f8f8c246 Players able to flag their own messages - Fixes #8005 (#8006)
* Players able to flag their own messages

* Modify test case to match the new behavior

* Remove a comment and a locales message
2016-09-13 12:23:11 -05:00
Blade Barringer
cbefc13e25 Revert "Revert "fixes task edit cancellation commit (#7931)""
This reverts commit 2da9876e42.
2016-09-13 11:52:47 -05:00
Sabe Jones
2da9876e42 Revert "fixes task edit cancellation commit (#7931)"
This reverts commit bbf15e1756.
2016-09-13 16:32:52 +00:00
Travis
282822def6 Don't show items in the seasonal shop that can't be purchased (#7859)
* making an api chnage so the seasonal shop will only return items that the user has never owned instead of all items the user doesn't currently own

* fixing commit so shop doesn't show already owned items

* recommenting out seasonal shop message as it's currently closed
2016-09-13 08:15:11 -05:00
Sabe Jones
f20a7b851f feat(analytics): AB testing
User model update for AB tests, and the first AB test to start Sept 12

closes #7984
2016-09-12 22:13:25 -05:00
Kaitlin Hipkin
6f2767edd3 Separate stats and achievs pages (#7804)
* separate stats and achievs tabs, move 'enable class system' button to stats

* move stats layout stuff from profile.jade to stats.jade

* shuffle stats page into more columns

* separate stats and achievs in expandable navbar submenus

* add multiple options for stats.jade: col1, col2, all; fixes weirdly crowded members modal

* make stats and achievs strings consistent

* remove mobile checks in profile.jade

* fix merge issue
2016-09-12 22:04:47 -05:00
Kaitlin Hipkin
c126aa532c cron does not count days with all-grey dailies as perfect (#7983) 2016-09-12 21:30:35 -05:00
Travis
bbf15e1756 fixes task edit cancellation commit (#7931)
* fixes the commit that shows actual task values when task edit is canceled.

This reverts commit 3d64f2b849.

* removing _edit references from fields of a task that can't change and are always set

* removing _edit from task.type as type cannot change while editing.

* Addressing comments by blade
2016-09-12 21:23:23 -05:00
Blade Barringer
3f03aab4ee fix: clean up duplicate translation keys 2016-09-12 21:04:05 -05:00
Blade Barringer
78d5f8c4f5 fix(api): prevent users from signing up with habitica or habitrpg emails
fixes #7633
closes #7659
2016-09-12 20:41:44 -05:00
Blade Barringer
0150b355cb fix: move attachMiddlwares function so mongoose models have tx strings 2016-09-12 20:40:12 -05:00
Blade Barringer
d31dc6d9a9 fix: Update notifications lib to make it testable
closes #7770
closes #7782
2016-09-12 16:59:52 -05:00
Blade Barringer
9d537d93d8 fix(client): Copy inbox messages to tasks
fixes #7017
closes #6994
2016-09-12 08:01:50 -05:00
Blade Barringer
379b318202 fix(client): Allow bulk task adding in challenges
closes #6781
fixes #6723
2016-09-11 21:59:18 -05:00
Matteo Pagliazzi
71f2f49a28 Merge pull request #7972 from HabitRPG/paglias/realtime-chat-v1
Real Time Chat v1 (parties only)
2016-09-11 12:59:02 +02:00
Travis
b73cf2e272 Adding tests to prove expected behavior around force starting a quest (#7848)
* starting

* adding tests to prove the expected behavior occurs around force starting a quest. part of #7653

* fixing up tests and adding functionality to remove user from quest if they are not in the questing party

* adding code to handle when the user is deleted and added a test around that situation

* fixing up comments
2016-09-10 23:10:37 -05:00
Blade Barringer
ed4039c08c refactor(api): Use forEach instead of a for loop 2016-09-10 23:03:42 -05:00
Alyssa Batula
923b6c495e Collection quest progress reports "found no [item names]" fixes #7816 (#7883)
* Updated collection quest tests for no found items.

Single-item quests state [user] found no [items]. instead of [user] found nothing. If a
quest has two items, the chat message is [user] found no [item1] and no [item2].

* Collection quest messages changed from [user] found nothing to [user] found no [item]

* Tests for no collection quest items found changed to [user] found 0 [item1], 0 [item2]

* Changed chat messages for no found collection quest items to [user] found 0 [item1], 0 [item2]

* Sort items alphabetically in multi-item quests so that it always returns the same string

* Formatting updates to conform to test specifications (for collection quest progress reports with no items found

* Simplified handling of items not found: any items not found are added to the list of found items with quantity 0 for reporting in the group chat. This also causes all items to appear, in the list, even if only one type is found in a multi-item quest.

* Test the group chat message when no items are found in multi-item quests. Test succes no longer depends on the order items are listed.
2016-09-10 23:03:28 -05:00
Blade Barringer
b8878df6bd fix(client): Apply sleep prevention to some avatar generation calls 2016-09-10 22:41:20 -05:00
Alyssa Batula
aac38dda91 Avatar's eyes can be set to open or closed in modals while in the Inn fixes #6282 (#7988)
* Avatar model can be set to have eyes open, eyes shut, or left to default by specifying the sleep parameter in generatedAvatar to be false, true, or null (respectively).

* Explicitly check true and false and switched to using triple equals for equality comparisons for avatar sleep setting.
2016-09-10 22:41:00 -05:00
Blade Barringer
3d53781bd3 Fix content name error (#7995)
* fix: correct translation strings for pet/mount names

* chore: expose potion and egg key, not object in pet content api

* fix: Update feed route to use potion and egg objects

* refactor: Update feed route to use petInfo

* Use pet/mount text method for name

* correct feed route
2016-09-10 22:05:25 -05:00
Blade Barringer
f496a6b0c7 feat: Lower cost of orb of rebirth
closes #7917
fixes #7944
2016-09-09 21:08:42 -05:00
Oziris
0dfb1f150f Provide better invitation messaging
closes #7794
fixes #7789
2016-09-09 20:37:05 -05:00
Matteo Pagliazzi
2d6223377f chat: better behavior for menu notification 2016-09-09 21:34:24 +02:00
Matteo Pagliazzi
60f7a1dbd9 add small timeout before asking for notification permission 2016-09-09 21:26:40 +02:00
Matteo Pagliazzi
f6c765b7b5 better notifications icon 2016-09-09 21:03:47 +02:00
Matteo Pagliazzi
e2b03ec9cf Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-09 20:13:21 +02:00