Commit graph

1070 commits

Author SHA1 Message Date
Kevin Gisi
cfdcadb2bc Added redirects to habitica for non-API urls 2015-07-30 13:20:24 -04:00
Sabe Jones
b4e3efeab7 fix(news): Break before list
For readability
2015-07-29 14:17:32 -05:00
Sabe Jones
bbbae27631 chore(naming-day): Bailey and sprites 2015-07-29 14:12:04 -05:00
Sabe Jones
788fba08c2 Merge branch 'develop' into sabrecat/habitica-day 2015-07-29 14:00:58 -05:00
Blade Barringer
661e79d668 Use party variable 2015-07-28 21:27:15 -05:00
Blade Barringer
442c1f358b Use Groups.party() 2015-07-28 21:05:33 -05:00
Kevin Gisi
27b2d932ce Missed a baseUrl instance. 2015-07-28 19:40:26 -04:00
Kevin Gisi
3be5c2cb96 Allow x-habitica-lb: yes suffice to bypass SSL redirect 2015-07-28 19:12:52 -04:00
Sabe Jones
39a17d933d fix(achievements): Day copypasta 2015-07-28 16:26:46 -05:00
Sabe Jones
ceb9cf7817 WIP(event): Habitica Day 2015-07-28 16:20:08 -05:00
Sabe Jones
60d6a479de Merge pull request #5683 from HabitRPG/sabrecat/enable-drops-sooner
Enable pets at Level 3
2015-07-28 13:12:40 -07:00
Sabe Jones
ac9244af7c Merge pull request #5675 from HabitRPG/sabrecat/party-analytics
Party analytics properties
2015-07-28 13:12:25 -07:00
Sabe Jones
8492541636 fix(visuals): Armoire and Seasonal Shop
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
2015-07-28 13:35:17 -05:00
Sabe Jones
13ab60cafe feat(drops): Enable pets at Level 3 2015-07-28 13:28:45 -05:00
Sabe Jones
7c56f5e7f6 fix(analytics): Tweaks per code review 2015-07-28 13:26:39 -05:00
Sabe Jones
5d5f1d2b1b chore(legal): Update revision date 2015-07-27 16:58:16 -05:00
Sabe Jones
4f36ecb8d1 fix(legal): TOS and privacy tweaks
Also updates the front page daily users brag to account for the 25% growth since the introduction of the joinOthers string.
2015-07-27 15:26:31 -05:00
Sabe Jones
f6bbae3beb fix(analytics): Bad comparison
Corrects an error caught via test, where the check for intro tour completion would always fail. Also tweaks the updateUser behavior to save an explicit false if tour completion data is not found, including a test for that behavior.
2015-07-27 15:13:59 -05:00
Sabe Jones
e9ed561907 fix(analytics): Add missing ID update
Also make the order of partyID and partySize consistent across updateUser calls.
2015-07-27 14:34:31 -05:00
Sabe Jones
9d7a2a1c24 feat(analytics): Party properties
Adds tracking of the user's party ID and size as user-level analytics properties.
2015-07-27 14:25:11 -05:00
Blade Barringer
e72543641c Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed
Closes #5668
2015-07-25 23:22:35 -05:00
Blade Barringer
f31d1b4b1b Merge branch 'develop' into TheHollidayInn-tasks-select-with-keys-fix 2015-07-24 22:16:57 -05:00
Blade Barringer
f749d1a3cb Make todos selectable with vimium 2015-07-24 22:08:13 -05:00
Blade Barringer
6aae668b8c Rework gem adjustment so it actually makes sense 2015-07-24 17:30:47 -05:00
Blade Barringer
9e25c29e04 Correct maxPrize calculation 2015-07-24 17:30:47 -05:00
Blade Barringer
e37c60e0f2 Expand functions to make them readable 2015-07-24 17:30:45 -05:00
Blade Barringer
0b85dc3e27 Correct getChallenges name 2015-07-24 17:30:44 -05:00
Blade Barringer
61d0172567 Add mising semi colons and line breaks 2015-07-24 17:30:43 -05:00
Blade Barringer
a89b612bbe Impliment challenge controller changes in view 2015-07-24 17:30:42 -05:00
Blade Barringer
bac979ca4d Eliminate unused variable 2015-07-24 17:30:42 -05:00
Blade Barringer
2441f6363e Consolidate transition code 2015-07-24 17:30:42 -05:00
Blade Barringer
5cd42e85c7 bail out and alert user if prize is too high 2015-07-24 17:30:41 -05:00
Blade Barringer
7c4486e001 Use gem calc functions 2015-07-24 17:30:41 -05:00
Blade Barringer
c92678008b Write functions to check if user has balance for challenge creation 2015-07-24 17:30:41 -05:00
Blade Barringer
cb27c3dc44 Correct indentation and equality checks on shuldShowChallenge 2015-07-24 17:30:40 -05:00
Blade Barringer
eea01216d7 Move backToChallenges to private functions section 2015-07-24 17:30:40 -05:00
Blade Barringer
fb6a34c2ed Set default group to tavern if no default group is found 2015-07-24 17:30:40 -05:00
Blade Barringer
fe2fb6deba Remove out of context comment 2015-07-24 17:30:40 -05:00
Blade Barringer
f8e2e74336 Move getChallenges private method to bottom of file 2015-07-24 17:30:39 -05:00
TheHollidayInn
ef9dfac087 Create new function to check for enough gems, added @crookedneighbor 's tests, and added tests to check for enoughGems when user creates a habitrpg challenge 2015-07-24 17:30:37 -05:00
TheHollidayInn
53c21b07a3 Reset enough gems variable if user selects group other than habitrpg 2015-07-24 17:30:36 -05:00
TheHollidayInn
fce622ddc7 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-07-24 17:30:36 -05:00
Sabe Jones
d022a0eb67 Merge branch 'develop' into sabrecat/death-modal
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
2015-07-24 16:11:51 -05:00
Blade Barringer
fca6f91f13 Merge branch 'develop' into analytics-service-server-side 2015-07-24 15:19:31 -05:00
Sabe Jones
dc26e1680c Merge pull request #5661 from HabitRPG/sabrecat/mystery
July 2015 subscriber goodies
2015-07-24 12:29:07 -07:00
TheHollidayInn
966e90da4e Added height and width so Vimium can find the checkboxes 2015-07-23 21:20:18 -05:00
Sabe Jones
c8982b3513 fix(analytics): Track intro tour steps 1-2 2015-07-23 15:07:37 -05:00
Sabe Jones
d32d05e873 feat(mystery): July 2015 goodies
Also makes the mystery box opening notification translatable and adds item graphics to it.
2015-07-23 12:05:13 -05:00
Blade Barringer
8a363efc43 Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel 2015-07-22 17:59:50 -05:00
Blade Barringer
c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00