SabreCat
2e3dd27414
chore(sprites): compile
2017-07-19 18:25:14 +00:00
SabreCat
3af756a90d
feat(cards): Good Luck card and achievement
2017-07-19 18:24:10 +00:00
jerellmendoodoo
a9195f0d96
Fixed release pets mounts ( #8545 )
...
* Fixed release pets/mounts achievements when fully earned and added unit tests for these changes
* Fixed release pets/mounts achievements to award only when fully earned and added unit tests for these changes, also fixed linting issues
* Updated variable assignments to make more readable
* Revised releaseBoth/Pets/Mounts to include null or undefined checks, also updated unit tests
* fixed integration tests
2017-07-18 13:34:54 -07:00
Oscar Rendón
ab777f7006
Restrict users from getting back from death ( #8808 )
...
* Add test to prevent death users recovering health
* Add check for buying potions with zero health
* Validate hp <= 0 to take boss damage into account
2017-07-18 13:26:10 -07:00
Grayson Gilmore
d918bc9f56
Add tests to increase coverage on /website/server/controllers/api-v3/auth.js ( #8809 )
...
* Add tests covering branches in _handleGroupInvitation
* Remove .only from latest test
2017-07-18 13:21:34 -07:00
Sabe Jones
4a89ca3e11
Merge branch 'develop' into fix-leave-challenges
2017-07-18 20:14:47 +00:00
joe-salomon
cdbbf93b74
Weekly/Monthly Habit reset counters resetting early - fixes #8570 ( #8749 )
...
* For habit reset logic, changed day check calculation to use user’s timezone instead of server time.
Added unit tests to check following cases:
- Weekly habit reset: Server tz is Sunday, User tz is Monday
- Weekly habit reset: Server tz is Monday, User tz is Sunday
- Monthly habit reset: Server tz is 1st of month, User tz is 2nd of month
- Monthly habit reset: Server tz is end of prev month, User tz is 1st of month
* use moment().zone() instead of utcOffset()
* typo
* Fixed check for daysMissed, added logic for CDS
Added test for CDS, fixed previous tests
2017-07-18 12:53:39 -07:00
Keith Holliday
d822843bbf
[WIP] New client userpages ( #8868 )
...
* Added background page
* Added stats
* Added achievements
* Added profile
2017-07-17 22:18:17 -06:00
negue
ea3ed26f42
Stable minor fixes ( #8861 )
...
* fix dialog text + close after hatching
* Update newClient.json
2017-07-18 01:04:34 +02:00
Pavel Pletenev
0da1144635
Make responce codes uniform ( #8865 )
...
* Fix 201 responce wrong documentation
* Fix 201 in challenges
* Fix 201 in groups.js
* Fix 201 in tags.js
* Fix 201 in webhooks.js
2017-07-17 14:28:25 -07:00
Alys
5f3539da19
make Bailey correctly explain about Aquatic Friends achievement badge ( #8853 )
...
* make Bailey correctly explain about Aquatic Friends achievement badge
It's this error again: https://github.com/HabitRPG/habitica/issues/8658
From katzalina in the Report a Bug guild:
"not a priority: Re:Bailey's news 07/05/ it says: both you and you
friend get the aquatic friends badge - I splashed a party member
and did not get the badge (didn't expect to either, until reviewing
the news). Am I experiencing a bug or has there been a systematic
change and the news text doesn't reflect it, yet? Thanks"
* the incorrect message was in an earlier Bailey as well
2017-07-17 14:16:31 -07:00
Sabe Jones
e4d006e5cd
3.103.0
2017-07-16 16:25:07 +00:00
Sabe Jones
801b53857f
fix(payments): short circuit for non-gift txns ( #8881 )
2017-07-16 09:24:17 -07:00
Keith Holliday
f8571ec5d5
Moved notifications to be read after yesterdailies ( #8872 )
...
* Moved notifications to be read after yesterdailies
* Prevent when user needs cron
* Updated tests
2017-07-16 09:24:09 -07:00
Matteo Pagliazzi
78ba596504
Groups can prevent members from getting gems ( #8870 )
...
* add possibility for group to block members from getting gems
* fixes
* fix tests
* adds some tests
* unit tests
* finish unit tests
* remove old code
2017-07-16 09:23:57 -07:00
Sabe Jones
fe9521a63f
3.102.3
2017-07-14 12:11:08 +00:00
Sabe Jones
c4348d8e47
Merge branch 'release' into develop
2017-07-13 22:29:35 +00:00
Sabe Jones
9b0ee6a726
3.102.2
2017-07-13 22:29:03 +00:00
Sabe Jones
c23fad3077
chore(i18n): update locales
2017-07-13 22:28:23 +00:00
Sabe Jones
6850a1fcb4
chore(news): Blog Bailey
2017-07-13 22:23:35 +00:00
Keith Holliday
bc477455bb
Tasks cron ryamodal fixes ( #8871 )
...
* Changed assumption of timezone location
* Added checks for RYA and moved cron check
* Fixed modal scope issue
2017-07-13 15:11:27 -07:00
Sabe Jones
88c56c9877
Merge branch 'release' into develop
2017-07-12 20:42:23 +00:00
Sabe Jones
4cd272f99c
3.102.1
2017-07-12 20:41:58 +00:00
Sabe Jones
0292501387
chore(i18n): update locales
2017-07-12 20:40:13 +00:00
Keith Holliday
28b56256d2
Added catch for cron error ( #8864 )
...
* Added catch for cron error
* Updated logger usage
2017-07-12 13:35:08 -07:00
Sabe Jones
a4ee3aaa7e
Merge branch 'release' into develop
2017-07-11 21:48:18 +00:00
Sabe Jones
7a2432a1a0
3.102.0
2017-07-11 21:42:06 +00:00
Sabe Jones
0bf515d0f9
chore(i18n): update locales
2017-07-11 21:40:44 +00:00
SabreCat
cbed198f02
chore(sprites): compile
2017-07-11 21:32:53 +00:00
SabreCat
90d77cee81
feat(content): Orca Pets and Splashy Pals
2017-07-11 21:31:26 +00:00
SabreCat
3668a9d3ac
fix(sprites): correct canvases
...
Also adds sprites for Trapper Santa collection quest.
2017-07-11 21:29:48 +00:00
Keith Holliday
052c653cd3
Added initial inbox ( #8852 )
...
* Added initial inbox
* Minor styles
* Added more styles, selected conversations, sending messages
* Added translations and colors
2017-07-10 21:09:31 -06:00
Keith Holliday
3aa7b4b631
Fixed or logic break ( #8857 )
2017-07-10 21:08:35 -06:00
Sabe Jones
045378b820
Merge branch 'release' into develop
2017-07-10 20:20:24 +00:00
Sabe Jones
a256b6df03
3.101.2
2017-07-10 20:07:46 +00:00
Keith Holliday
92fdc13adf
Added assumption that the date passed is in the users timezone ( #8859 )
2017-07-10 13:07:14 -07:00
negue
dd29c60d87
[WIP] drag/drop fixes ( #8851 )
...
* Stable: Highlight pet on dragging food / add drag* events
* Stable: hatch dialog instead of popover / .btn-flat / update bootstrap-vie
* Layout: change sidebar width to fixed 236px - removed .col-2/.col-10
* Stable: Drag&Drop Food Image + Text - refactor directive to use custom event names
* Stable: fixes
* Stable: click to select food + attached food info box
* fix lint issues
* Drag&Drop&Click: Potions on Eggs - fix click on item + attached infobox-position in click mode
2017-07-10 10:07:23 +02:00
Sabe Jones
78fd79931e
Merge branch 'release' into develop
2017-07-08 01:49:25 +00:00
Sabe Jones
5055a57ae9
3.101.1
2017-07-08 01:48:50 +00:00
Keith Holliday
3fa0b72ffe
Added assumption when no time is supplied ( #8855 )
...
* Added assumption when no time is supplied
* Changed format of date
* Set now options when date is specified
2017-07-07 18:46:54 -07:00
Keith Holliday
b3f9fd09c6
Check for app loading instead of daily count ( #8856 )
2017-07-07 12:35:26 -07:00
Keith Holliday
30437e158e
Added check to prevent double cron ( #8854 )
...
* Added check to prevent double cron
* Added then and fix style issues
2017-07-07 11:14:36 -07:00
Keith Holliday
19ba1290f6
Added new web profile for checkout ( #8699 )
...
* Added new web profile for checkout
* Fixed es6 syntax
* Fixed config path
2017-07-06 15:16:54 -07:00
Grayson Gilmore
c509c8e04f
Test /api/v3/tasks/unlink-all and unlink-one ( #8810 )
...
* Add tests for POST /tasks/unlink-all/:challengeId
* Add test for keep=keep-all query
* Cleanup
* Setup
* Cleanup
* Add tests for unlink-one
2017-07-06 14:25:31 -07:00
Todd Medema
00d4393024
reduce top margins on task filter bar to reduce dead space below 'add multiple' link / make UI more space efficient ( #8806 )
2017-07-06 14:13:35 -07:00
yugensoft
c502b1997b
Updated new-groups / group-plans static page #8674 ( #8729 )
...
* dummy
* Renamed internationalized strings to more meaningful names
* moved the new group creation state out to its own URL, so it can also be linked to by the static/plans page
* Added redirect-through-login functionality from the static/plans page new-group button
This includes a static non-modal login page (similar to how other sites have both a login page and login modal)
The login body has been abstracted out from its modal-specific view into mixins to accomplish this
* deleted bak files added by mistake
* deleted scripts added by mistake
* changed static/plans Create Group button text
* Added form link (https://github.com/HabitRPG/habitica/issues/8674#issuecomment-303518039 )
Removed changes to non-EN locale files (https://github.com/HabitRPG/habitica/pull/8729#issuecomment-303555211 )
* reverted key name changes as per https://github.com/HabitRPG/habitica/pull/8729#issuecomment-304515534
* changed $rootScope to $scope
https://github.com/HabitRPG/habitica/pull/8729#discussion_r120695874
2017-07-06 14:08:02 -07:00
madpink
4435862ff2
Updating User API Doc (part 4) ( #8792 )
...
* Updating User API Doc (part 4)
* Fixed trailing space
2017-07-06 13:48:00 -07:00
Keith Holliday
e901850a6f
continuation of PR #8161 Display error notification when attempting to purchase invalid amount of gems - fixes #8145 ( #8688 )
...
* Translation string for error notification
* Use function instead of a link for paypal
* Inject notification service, function to check the amount of gems to purchase, function to handle payments with paypal
* Throw error if amount of gems is zero or negative
* Add condition to raise error if amount is negative
* Added gem errors for gifts 0 or less
* Fixed linting and broken test
* Fixed test syntax
* Added back needed strings
* Fixed group locales
2017-07-06 13:43:43 -07:00
LlamaLad
48bbc22fb4
Dailies new subheading and summary change ( #8799 )
...
* Dailies new subheading and summary change
* summary change
2017-07-06 13:31:13 -07:00
Alys
c1e5d8b573
add missing string for mountNowOwned error message ( #8843 )
2017-07-06 13:23:20 -07:00
