02acad9dfc
Removed unused 'armorSet' attribute in user model
2015-06-20 01:38:47 -04:00
07b41d16b6
Revert "Revert "new GSalvadi audio theme, created by NomindTR""
...
This reverts commit 30a091e14e
2015-06-18 22:19:35 +10:00
30a091e14e
Revert "new GSalvadi audio theme, created by NomindTR"
2015-06-18 07:39:38 +10:00
910fc2f213
Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15
...
new GSalvadi audio theme, created by NomindTR
2015-06-17 21:39:39 +10:00
b12ee725f4
incrementally enable weekly recap emails
2015-06-16 20:26:58 +02:00
95b481b31d
use discriminator field to distinguish users with weekly recap emails enabled
2015-06-16 17:51:24 +02:00
a82270fbaa
feat(weekly-recap): enable for new users who sign in
2015-06-16 11:15:03 +02:00
14983cb996
replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet
2015-06-16 13:10:49 +10:00
b6b2873faf
add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015
2015-06-15 20:33:14 +10:00
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
4bf1b94c1d
Removed 'freeRebirth' from user model and all uses in codebase
2015-06-13 14:18:03 -04:00
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
ed43bec8cd
Allow default tasks to not have notes
2015-06-10 08:49:26 -05:00
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
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
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
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
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
5513061d80
Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string
2015-06-01 21:07:09 -05:00
8074648c70
Merge branch 'develop' into tutorial
...
Conflicts:
common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
8a6c49f002
feat(weekly-recap): track last date of weekly recap email
2015-05-31 12:10:03 +02:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
cfcfb8fd02
Changed invite to RSVPNeeded
2015-05-27 09:18:44 -04:00
0fa93506f5
Made quest invite modal pop-up on user sync (rewards display currently nonfunctional)
2015-05-26 23:01:29 -04:00
0c9576733e
Use moment to set startDate
2015-05-23 15:39:18 -05:00
3a8715f0a9
Set default startDate to today if task does not already have them
2015-05-23 15:29:36 -05:00
cfd2f7003b
Merge branch 'develop' into fallenpanda1-improved_dailies
2015-05-23 08:44:56 -05:00
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
e7cd3ff533
Set DailySchema’s ‘frequency’ default to weekly to maintain backwards compatibility.
2015-05-15 20:24:47 -07:00
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
30fd8e26e6
revert last 2 commits
2015-05-11 17:02:36 +02:00
e966de7bf0
feat(emails): add field to keep track of weekly recap emails
2015-05-11 16:54:44 +02:00
b23e901780
Merge branch 'develop' into pushNotifications2
2015-04-27 17:20:25 +02:00
37f7db3c4e
feat(emails): add support for weekly recap emails
2015-04-22 16:30:53 +02:00
71108ee935
feat(email): WIP start implementing unsubscription page and related features
2015-04-07 14:04:03 +02:00
7d735519ec
feat(email-unsubscription-page): create model to hold unsubscriptions
2015-04-07 14:04:03 +02:00
f0e7f0464c
fix(seasonal): NO FLOWERS
...
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
2015-04-01 23:07:36 -05:00
b6a4d65d8c
feat(seasonal): Shiny Seed
2015-04-01 22:36:07 -05:00
7105bc195f
add all Changes of #4565
2015-03-27 18:35:32 +01:00
e46789c303
feat(analytics): track cron count
2015-03-26 17:11:33 -04:00
560d51b2e2
feat(tour): esc force closes, but puts justin head in toolbar. clicking
...
justin head brings tour back.
2015-03-24 15:41:44 -06:00
1e8265a9f1
feat(tour): add the other tour entries @lemoness
2015-03-19 15:53:12 -06:00
9e540e86af
add email with optional message when kicking user from group
2015-03-18 19:12:53 +01:00
de67f44e1f
Merge pull request #4713 from HabitRPG/lefnire/interactive-tour
...
Interactive Tour
2015-03-10 19:23:01 -06:00
9cfa27f089
feat(surveys): Survey achievement
...
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
2015-03-10 18:39:00 -05:00
812493fec5
feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides
2015-03-10 15:40:18 -06:00
397a293ca8
change text for recapture emails settings
2015-02-20 18:15:47 +01:00
17032a4f13
Reverted changes back into website/src
2015-02-10 16:06:32 -06:00
hairlessbear