krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,903 Commits 63 Branches 1,225 Tags
284fa03223b4a4b740d7c454a3c90bc6c7397725
Commit Graph

85 Commits

Author SHA1 Message Date
Blade Barringer
284fa03223 Add platform, change itemName to itemKey 2015-07-12 10:03:41 -05:00
Blade Barringer
2f1d3400bc Added additional analytics info 2015-07-10 07:47:52 -05:00
Blade Barringer
52620bb69d Impliment analytics in user actions; remove mixpanel 2015-07-09 22:18:37 -05:00
Blade Barringer
73b2d816d1 Track cron with analytics service 2015-07-08 08:08:45 -05:00
Alys
2cd34b0f6e make api.shouldDo use the day being checked as the default date instead of today - fixes https://github.com/HabitRPG/habitrpg/issues/5521 2015-06-30 14:28:00 +10:00
Alys
d7a203ccc2 set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code 2015-06-27 20:06:04 +10:00
Alys
51fb278438 stop changing the task's actual Start Date, move related task Start Date code tothe same place, adjust comments 2015-06-25 12:19:27 +10:00
Alys
9b8b7af7d5 replace api.numDaysApart (not used elsewhere and new to the EveryXDays code) with moment#diff 2015-06-25 12:19:26 +10:00
Alys
e7e82a2aed keep startDate as a moment(), fix check for Start Date in future (ignore time, don't do incorrect CDS conversion), add comments 2015-06-25 12:19:26 +10:00
Alys
266055c0d4 rename 'day' variable to 'startOfDayWithCDSTime' (more verbose, sorry, but clearer) 2015-06-25 12:19:26 +10:00
Alys
99bc09fb25 move dayOfWeekNum to correct scope and improve comment 2015-06-25 12:19:26 +10:00
Alys
f6cdc57228 move dailyTask.repeat error handling to correct location; add dailyTask.everyX error handling (might not be needed) 2015-06-25 12:19:26 +10:00
Alys
bacd35b895 refactor shouldDo check for Daily's startDate being in the future 2015-06-25 12:19:26 +10:00
Blade Barringer
96162b37bd Merge pull request #5433 from gisikw/ultimate-gear-fix 
Ultimate gear fix
 2015-06-20 17:34:47 -05:00
Alys
6eac1174a2 sort eligibleEquipment before choosing random item from Enchaned Armoire - possible partial fix for https://github.com/HabitRPG/habitrpg/issues/5376#issuecomment-111799217 2015-06-20 20:22:27 +10:00
Kevin Gisi
f32305458a Fix armoire edge case 2015-06-20 01:58:54 -04:00
Blade Barringer
ecb2544cdc Merge pull request #5396 from hairlessbear/remove_freeRebirth 
Removed 'freeRebirth' from user model and everywhere else in codebase
 2015-06-15 08:00:18 -05:00
hairlessbear
4bf1b94c1d Removed 'freeRebirth' from user model and all uses in codebase 2015-06-13 14:18:03 -04:00
hairlessbear
2504b06026 Removed user.achievements.ultimateGear checks from orb of rebirth logic (fixes #5352) 2015-06-12 17:17:50 -04:00
Blade Barringer
1d18f53a67 Merge branch 'develop' into blade-Finish_weeklies_pr 
Added Sabe's novalidate change to adding a new task
 2015-06-10 07:53:37 -05:00
Blade Barringer
ca72b9a9e1 Merge branch 'chimericdream-issues/4838' into develop 2015-06-09 12:45:22 -05:00
Sabe Jones
fe9666d5ee fix(achievements): Never strip Ultimate Gear 
Fixes #5369.
 2015-06-09 10:47:59 -05:00
Bill Parrott
05286d1e8f use correct http status code 2015-06-09 08:55:06 -05:00
Bill Parrott
9cbc21d798 check for duplicate task ID when adding a new task 2015-06-09 08:55:06 -05:00
Alys
e5b8c5c4e0 use a different random seed for starting Armoire randomness than for sub-choices within it to prevent bug that gives only some foods 2015-06-08 21:15:51 +10:00
Blade Barringer
164a26616e Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-05 17:35:16 -05:00
Sabe Jones
804cced3ff chore(various): News and sprites 
Also tweaks the drop probability of equipment from 70% to 60%.
 2015-06-05 10:22:22 -05:00
Sabe Jones
20859b83ef feat(Armoire): Improved counter 
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
 2015-06-04 15:45:55 -05:00
Blade Barringer
705e0dce71 Calculate days since task start with start of day 2015-06-04 08:25:06 -05:00
Sabe Jones
09d32390f9 feat(Armoire): Item counter 
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
 2015-06-03 16:48:11 -05:00
Sabe Jones
97ae243c40 fix(Armoire): Fixes 
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
 2015-06-03 12:50:57 -05:00
Sabe Jones
af3ee8cfcd feat(Armoire): Updates from feedback 
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
 2015-06-03 11:58:30 -05:00
Blade Barringer
7adde1d1dd Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-03 07:41:09 -05:00
Sabe Jones
c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Blade Barringer
719ae1c89d Add missing ?; common tests pass 2015-05-30 23:10:44 -05:00
Sabe Jones
726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Blade Barringer
8b347bca8b Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI 2015-05-26 17:59:11 -05:00
Blade Barringer
cfd2f7003b Merge branch 'develop' into fallenpanda1-improved_dailies 2015-05-23 08:44:56 -05:00
Allen Pan
90dd078a6a Fixed bug where we were using moment.startOf instead of api.startOfDay in shouldDo. 2015-05-23 02:29:06 -07:00
Allen Pan
56f0e3ae4a Removed unnecessary TODOs. 2015-05-22 22:18:17 -07:00
Blade Barringer
664bf491d2 Adjust fallenPanda's PR 
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
 2015-05-22 22:14:58 -07:00
Blade Barringer
bd76b762e6 Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications 
Negue wip push notifications
 2015-05-18 11:14:53 -05:00
Allen Pan
dd1b2a4b07 In taskDefaults method, added default values for new fields: startDate, everyX, and frequency. 2015-05-15 20:24:47 -07:00
Allen Pan
d1805f9181 Fixed issue where incorrect time type passed in for shouldDo’s ‘day’ argument (should be a Date, sometimes Moment is passed in). Fixed incorrect comparison between Moment and Date. 2015-05-15 20:24:47 -07:00
Allen Pan
fbb636a339 Removed stray debugging console logs. 2015-05-15 20:24:47 -07:00
Allen Pan
1ecf608408 Added support in daily tasks for specifying ’every X days’ and ‘every X weeks on specific days of the week’. 
- shouldDo() now takes the entire task as an input instead of just the ‘repeat’ (days of the week) dictionary.
- the ‘start’ date for a task can be specified (and can also be in the future, in which case it will be greyed out until then.) ‘start’ date also affects ‘every X days’ and ‘every X weeks’.
- no migration code yet.
 2015-05-15 20:24:46 -07:00
Sabe Jones
84b333e5c1 fix(unlocks): Handle undefined/null balance 2015-05-13 15:34:23 -05:00
Sabe Jones
6e27b7af9d fix(purchases): Handle undefined/null balance 2015-05-13 15:15:40 -05:00
Sabe Jones
35ff90b4d3 Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins 2015-05-13 12:12:57 -05:00
Sabe Jones
29109051d7 feat(customize): Animal skins and ears 
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
 2015-05-13 11:19:08 -05:00