sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9406 commits 3 branches 0 tags 1.6 GiB
Commit graph

9406 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sabe Jones
c39ad2a2ae Merge pull request #5344 from SabreCat/develop 
June BGs
 2015-06-04 09:55:29 -07:00
Sabe Jones
6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Sabe Jones
c8f4e6209a Merge pull request #5343 from HabitRPG/sabrecat/mounts 
Readjusted lion
 2015-06-04 09:24:21 -07:00
Sabe Jones
4f6f0220ad fix(mounts): Readjusted lion 2015-06-04 11:02:58 -05:00
Blade Barringer
865f7651a9 Merge branch 'TheHollidayInn-invite-friends-in-header' into develop 2015-06-04 08:54:04 -05:00
Blade Barringer
7a1c5835d0 Final adjustments to PR #5114 
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
 2015-06-04 08:48:05 -05:00
TheHollidayInn
2234c7219e Moved invite friends button to under the subscribe button 2015-06-03 20:33:39 -05:00
Blade Barringer
e52a73f367 Merge branch 'negue-fixQuestNotify' into develop 2015-06-03 07:38:38 -05:00
negue
d6f5ba0fc7 Merge pull request #5336 from negue/fixQuestNotify 
FIX: Quest Invitation Notification
 2015-06-03 07:52:09 +02:00
Blade Barringer
64a61a26ca Add test for push notifications 2015-06-02 22:55:26 -05:00
Blade Barringer
399ff8c00b Merge branch 'http-tests' into develop 2015-06-02 17:34:07 -05:00
Blade Barringer
7a157fabb2 Finish tests for castEnd 2015-06-02 17:32:44 -05:00
Nick Tomlin
88e1ec690a Start tests for rootScope castEnd 2015-06-02 13:04:59 -05:00
Negue
5612b4be6b Only send "Quest Started" Notifications to users which accepted the quest 2015-06-02 20:02:14 +02:00
Blade Barringer
3ed6db753d Merge pull request #5337 from NickTomlin/notification-service 
Change signature of notification service
 2015-06-02 12:37:25 -05:00
Nick Tomlin
ee88ed4b44 Change signature of notification service 2015-06-02 12:33:21 -05:00
Negue
264a1e4b16 FIX: Quest Invitation Notification 
ADD: Quest Started Notification
 2015-06-02 17:40:19 +02:00
Blade Barringer
ca31b490e6 Add missing semicolons and s's 2015-06-02 08:43:10 -05:00
Blade Barringer
af94236a01 Add wiki link to reward help string. 
Fixes #5333
 2015-06-02 08:15:16 -05:00
Blade Barringer
24c299783a Merge branch 'TheHollidayInn-markdown-for-spells' into develop 2015-06-02 07:58:29 -05:00
Blade Barringer
b375c068de Refactor notification service and add tests 2015-06-02 07:51:54 -05:00
TheHollidayInn
d1df5d740d Changed button to invite friends text 2015-06-01 21:10:49 -05:00
TheHollidayInn
e3f5c22fe8 Added start party option, locales, and plus button 2015-06-01 21:07:53 -05:00
TheHollidayInn
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
Sabe Jones
879c8c5428 Merge pull request #5329 from HabitRPG/sabrecat/mounts 
Reposition mounts
 2015-06-01 17:31:32 -07:00
Sabe Jones
80da3a2dcd chore(news): Bailey on mounts 2015-06-01 19:17:30 -05:00
Sabe Jones
5cf6127382 fix(mounts): Reposition mounts 
Changes the remaining mounts revised by Kiwibot re: #4449.
 2015-06-01 18:37:01 -05:00
Blade Barringer
3291062b31 Move markdown parsing to notification service 2015-06-01 17:49:27 -05:00
Blade Barringer
39f363ec29 Add tests for castEnd on root controller 2015-06-01 17:38:18 -05:00
Sabe Jones
c94f6d1c2c Merge pull request #5325 from HabitRPG/mystery-presents 
Mystery presents
 2015-06-01 11:42:26 -07:00
Sabe Jones
3de9aed2c4 fix(sprites): Recanvas wolf mounts 
See #4449
 2015-06-01 12:33:13 -05:00
Sabe Jones
d76ca1c04d feat(mystery): Programmatic presents 
Shows the appropriately colored subscription giftwrap for the user's current month. Also includes the Bailey notification for this month's upcoming subscriber item.
 2015-06-01 12:06:35 -05:00
Sabe Jones
950c0da7ff Merge pull request #5319 from HabitRPG/announce 
May 31 Bailey
 2015-05-31 14:11:40 -07:00
Sabe Jones
829ed8a161 chore(news): May 31 Bailey 2015-05-31 16:04:42 -05:00
Sabe Jones
766f3b6057 Merge pull request #5307 from HabitRPG/tutorial 
Tutorial overhaul
 2015-05-31 13:58:12 -07:00
Sabe Jones
8074648c70 Merge branch 'develop' into tutorial 
Conflicts:
	common/locales/en/npc.json
 2015-05-31 15:52:12 -05:00
Sabe Jones
05962c6a0f Merge pull request #5306 from HabitRPG/mixpanel 
Mixpanel trial implementation
 2015-05-31 13:46:24 -07:00
Sabe Jones
91f93df7cc Merge branch 'develop' into mixpanel 
Conflicts:
	config.json.example
 2015-05-31 15:40:21 -05:00
Blade Barringer
d28ed6badf Correct format of directive creation to work in un-minified state 
Fixes #4606
 2015-05-31 15:25:32 -05:00
Matteo Pagliazzi
995721e0da chore(i18n): update locales 2015-05-31 15:36:54 +02:00
Matteo Pagliazzi
8a6c49f002 feat(weekly-recap): track last date of weekly recap email 2015-05-31 12:10:03 +02:00
Blade Barringer
6fb100874c Added mixpanel mock to make karma tests happy 2015-05-30 23:29:52 -05:00
Blade Barringer
719ae1c89d Add missing ?; common tests pass 2015-05-30 23:10:44 -05:00
TheHollidayInn
a8ca01ba62 Added markdown filter to endCast notification 2015-05-30 22:00:29 -05:00
Blade Barringer
6bced5d9ee Set default flag report email variable to array 2015-05-30 12:09:28 -05:00
Alys
467f725ef8 Merge pull request #5302 from agentx999/text-improvements 
Various text improvements
 2015-05-30 15:24:29 +10:00
Sabe Jones
a2f9e0579d chore(npm): install mixpanel 2015-05-29 16:24:03 -05:00
Sabe Jones
726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Sabe Jones
5127814f9e chore(grunt): compile sprites 2015-05-29 15:19:51 -05:00
Sabe Jones
7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00