Commit Graph

343 Commits

Author SHA1 Message Date
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
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 a763a3a3da Cleaned up task.jade file:
- moved ugly html newlines into the stylesheet
- renamed temporary var for datePicker’s ngmodel from _dateString to _tempDateForPicker
- renamed open -> openDatePicker, and have the function track datePicker’s open/closed state on a per task instead of global basis
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
Alys d6e1d765da adjust Inn message when user is already Resting - https://github.com/HabitRPG/habitrpg/issues/5128#issuecomment-99233779 2015-05-14 08:13:13 +10:00
Sabe Jones 89d1d63b24 Merge pull request #5198 from SabreCat/pet-skins
Pet Skins and Ears
2015-05-13 15:44:23 -05: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
Matteo Pagliazzi b639896ae6 chore(i18n): update locales 2015-05-13 19:47:59 +02: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 2b8414766b chore(grunt): compile sprites 2015-05-13 11:19:33 -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
Blade Barringer dca45d7845 Enable new inn behavior 2015-05-13 08:44:08 -05:00
Alys 2ac763cc50 add message about Resting in the Inn to top of Dailies column when preferences.sleep is true 2015-05-13 16:56:52 +10:00
Blade Barringer c123ca6a42 Correct casing of translatable string 2015-05-10 09:13:05 -05:00
GihHubSphinx 6c5d9f3a6c Tried to make line translatable
Tried to make the "Only group leader can create challenges" line in the
guild creation dialog translatable
2015-05-10 08:59:43 -05:00
Alys 1dec4ba7a6 allow MP gained for Habits and Dailies to be increased when a critical hit occurs (crits are triggered in addPoints) 2015-05-10 18:17:17 +10:00
Blade Barringer 71c65c7a73 change coupon route in angular router to promo 2015-05-08 21:24:57 -05:00
Blade Barringer 1bfc82c636 Merge branch 'develop' into NotGonnaGitUs-develop 2015-05-08 21:02:09 -05:00
NotGonnaGitUs ef0b96e5e4 Changed promo code text. 2015-05-08 10:33:26 +05:30
negue e628dba5e8 Merge pull request #5087 from negue/copyMessageTodo
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Sabe Jones 040e6e0a41 chore(grunt):compile sprites 2015-05-06 19:53:08 -05:00
Sabe Jones 00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Matteo Pagliazzi a91b544830 typo 2015-05-06 16:18:14 +02:00
Matteo Pagliazzi a1fb1468ba chore(i18n): update locales 2015-05-05 19:52:20 +02:00
Tyler Renelle a090fed10b feat(analytics): "motivate yourself" 3 variants @lemoness 2015-05-04 15:31:00 -04:00
Blade Barringer 41a6818ea8 Revert inn text 2015-05-03 20:21:53 -05:00
Matteo Pagliazzi 0454938303 chore(i18n): update locales 2015-05-03 21:24:53 +02:00
NotGonnaGitUs a45390321e Patched translation fixes and added a few phrases to locales. 2015-05-03 23:41:42 +05:30
Blade Barringer b408f016fd Merge pull request #5119 from NotGonnaGitUs/develop
Made front page translatable
2015-05-03 09:43:43 -05:00
Blade Barringer e09d4f3a91 Commented out new dailies behavior 2015-05-03 08:21:29 -05:00
NotGonnaGitUs 4d5ec83234 Removed objects not used anywhere by env.t function. 2015-05-03 14:33:46 +05:30
Blade Barringer 68aedda3bb Merge branch 'develop' into hairlessbear-cron_dailies_fix 2015-05-02 22:10:58 -05:00
Blade Barringer c81d321366 Checklists should reset even when resting in the inn 2015-05-02 22:10:26 -05:00
NotGonnaGitUs 0fc068ea93 Removed objects not used by front.jade, footer.jade or login-modale.jade 2015-05-02 20:02:20 +05:30
Blade Barringer cad47dc2c0 Fixes #5123 2015-05-02 09:28:55 -05:00
Blade Barringer ace1d2a9e2 Update sprites with shading - @lemoness 2015-05-02 09:26:11 -05:00
NotGonnaGitUs 21f470cd5a Removed objects not used front.jade or shared/footer.jade 2015-05-02 17:42:38 +05:30
NotGonnaGitUs 9e88a55d54 Removed objects not used by front.jade. 2015-05-02 17:12:46 +05:30
Matteo Pagliazzi 72f8c60ccf chore(i18n): update locales 2015-05-02 11:43:38 +02:00
Sabe Jones 74877f0653 chore(grunt): compile sprites 2015-05-01 19:22:09 -05:00
Sabe Jones d50d4ad8bb feat(Spring): Flung 2015-05-01 19:09:28 -05:00
NotGonnaGitUs 124df58644 Made front page translatable. 2015-05-01 21:18:25 +05:30
NotGonnaGitUs 02e7b52fbf Adding environment variables to the static front page for translation. - Halfway done. 2015-05-01 20:14:19 +05:30
Blade Barringer 9b22ac68da Merge pull request #5116 from HabitRPG/rebalancing-2015-03
Skills rebalancing
2015-04-30 21:10:31 -05:00
Blade Barringer e4b21ac325 Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo 2015-04-29 17:19:24 -05:00