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

543 commits

Author SHA1 Message Date
Sabe Jones
3968acecb4 chore(news): Bailey 2015-09-30 2015-09-30 15:39:38 -04:00
Sabe Jones
35068481c4 chore(news): Fall plotline Bailey 2015-09-23 15:58:13 -04:00
Sabe Jones
009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Sabe Jones
6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons 
Front page Tweet button
 2015-09-22 17:38:47 -05:00
Sabe Jones
3e8a3ee5f4 feat(event): Fall Festival 2015 2015-09-18 15:19:59 -04:00
Sabe Jones
9be0990217 chore(news): Bailey 2015-09-16 2015-09-16 18:34:20 -04:00
Blade Barringer
f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only 
Adjustments to group quest behavior
 2015-09-15 18:57:32 -05:00
Blade Barringer
b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Sabe Jones
580a9871b9 chore(news): Bailey 2015/09/14 2015-09-14 21:21:22 -05:00
Blade Barringer
d573f3c53d Merge branch 'melarish-Mystery_items_already_owned' into develop 2015-09-13 18:28:18 -05:00
Alys
fbaa5d4321 add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme 2015-09-12 11:05:31 +10:00
Sabe Jones
6396b064d2 fix(social): Localize Tweet button 2015-09-10 18:51:19 -04:00
Sabe Jones
45c8bb06e2 Revert "feat(modals): Simplified scroll drop" 
This reverts commit 8b4d34da00.
 2015-09-10 18:08:51 -04:00
Sabe Jones
c03107b54b feat(social): Twitter share main page 2015-09-10 17:54:40 -04:00
Sabe Jones
e4c7870c22 WIP(social): Non-AddThis Tweet button 2015-09-10 17:31:12 -04:00
melarish
05cf144630 Pulled and merged 2015-09-09 23:23:45 +01:00
Sabe Jones
8b4d34da00 feat(modals): Simplified scroll drop 2015-09-09 14:27:34 -04:00
Sabe Jones
74cb7d7f04 chore(news): Horse Bailey 2015-09-08 14:56:49 -04:00
Blade Barringer
6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -05:00
Blade Barringer
4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page 
Party Page Revamp
 2015-09-06 13:28:14 -05:00
Blade Barringer
074e683ba7 Change formatting of cds modal 2015-09-06 09:57:44 -05:00
Blade Barringer
a44cd748af Use the user's preferred date format 2015-09-06 09:42:48 -05:00
Blade Barringer
3a8eda6c1a Remove extraneous info about last cron 2015-09-05 15:35:07 -05:00
Blade Barringer
9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer
807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Blade Barringer
047a88cef5 Merge branch 'zedutchgandalf-develop' into gulp_build 2015-09-04 16:35:45 -05:00
Blade Barringer
53a03b4396 Hide older news link in older news page 2015-09-04 16:32:05 -05:00
Blade Barringer
3e03ff124d Remove trailing blank spaces 2015-09-04 16:24:27 -05:00
Blade Barringer
f7df464ebd Remove unneeded class 2015-09-04 16:24:10 -05:00
Sabe Jones
8213643485 fix(FAQ): Link from Help button 
Also swaps a couple of URLs to use HTTPS.
 2015-09-04 15:12:17 -04:00
Sabe Jones
869651f5a2 feat(FAQ): Static FAQ page 
Introduces a new static page for Frequently Asked Questions, linked from the Help menu. Fixes #5773.
 2015-09-04 15:05:15 -04:00
Robin Arys
39df743693 Change headers to use the proper ones 2015-09-04 15:52:34 +02:00
Robin Arys
345ab4bdbe Move repeated classes up one level into a div 2015-09-04 15:34:03 +02:00
Robin Arys
c7dc8d551b Remove small_news_header and big_news_header CSS classes 2015-09-04 10:41:22 +02:00
Robin Arys
d03acee4bc Redesign static old news page per #5836 2015-09-04 00:22:41 +02:00
Sabe Jones
b5124e6cd8 fix(warnings): Show modal only once 
Also removes a random extra newline.
 2015-09-03 11:12:54 -04:00
Sabe Jones
1a675b8461 feat(warning): Revised low health modal 2015-09-02 16:31:56 -04:00
Sabe Jones
e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -04:00
melarish
b2bb6016fa Added +1 Hourglass to debug menu 2015-09-02 18:12:48 +01:00
Sabe Jones
6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
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-09-01 13:40:20 -05:00
Sabe Jones
68fef118e1 Merge pull request #5866 from HabitRPG/sabrecat/content-201509 
Content 201509
 2015-09-01 10:56:24 -05:00
Blade Barringer
41c38c6e63 Merge branch 'TheHollidayInn-directives-test-task-focus' into develop 2015-08-31 20:36:07 -05:00
Blade Barringer
f4ca8bb78d Rename task-focus focus-element 2015-08-31 20:31:03 -05:00
Blade Barringer
3e44c3a8ce Change focus-me to use task-focus 2015-08-31 20:16:14 -05:00
Blade Barringer
499e8578cd Merge branch 'TheHollidayInn-menu-fix-notification-menu-closing' into develop 2015-08-31 19:02:32 -05:00
Blade Barringer
dc5c35bb17 Merge branch 'develop' into TheHollidayInn-menu-fix-notification-menu-closing 2015-08-31 19:01:11 -05:00
Blade Barringer
ca49412313 Use === instead of == 2015-08-31 18:59:01 -05:00
Blade Barringer
dfaaed05a4 Switch double quotes to single quotes 2015-08-31 18:54:06 -05:00
Sabe Jones
5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Sabe Jones
3ead359538 chore(news): August Last Chance Bailey 2015-08-30 21:06:25 -05:00
Blade Barringer
ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer
a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Blade Barringer
4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00
Blade Barringer
dd1e69b9d5 Merge branch 'RossBrunton-develop' into develop 2015-08-28 21:42:16 -05:00
Blade Barringer
df3c498fcc Add rasterize class 2015-08-28 21:41:53 -05:00
Sabe Jones
9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	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
 2015-08-28 13:24:10 -05:00
Sabe Jones
8d713a53c4 feat(tutorial): Splash screen overhaul complete 2015-08-28 13:58:30 -04:00
Blade Barringer
15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
Sabe Jones
f88c536836 chore(news): Back to School Bailey 2015-08-27 16:20:15 -05:00
Sabe Jones
c4012ad762 WIP(tutorial): New intro splash 2015-08-27 16:04:59 -04:00
TheHollidayInn
6fb29d8766 Added ability to close menu when a child element has closeMenu directive 2015-08-26 15:32:59 -05:00
Sabe Jones
6564cb52dc fix(news): wording tweak 2015-08-25 13:10:33 -04:00
Sabe Jones
c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00
Blade Barringer
427fbb959b Add join existing party button 2015-08-23 14:59:06 -05:00
Blade Barringer
fd35f58ccd Display invite party to quest only if party has more than one member 2015-08-23 08:29:45 -05:00
Blade Barringer
59a2d2b2f0 Improve quest modal appearance 2015-08-23 08:22:34 -05:00
Blade Barringer
fefcbd1d2f Merge branch 'develop' into sabrecat/party-page 2015-08-22 21:42:05 -05:00
Alys
5b8c161932 changed habitrpg.wikia.com to habitica.wikia.com 2015-08-23 12:31:10 +10:00
Blade Barringer
99d2b7f749 Merge branch 'develop' into sabrecat/party-page 2015-08-22 19:18:08 -05:00
Blade Barringer
9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
Blade Barringer
950fab237d Correct invite users to guild 2015-08-22 12:52:21 -05:00
Blade Barringer
63b492ab51 Merge branch 'develop' into sabrecat/party-page 2015-08-22 12:44:07 -05:00
Blade Barringer
60a36ca6fc Correct view 2015-08-22 08:18:39 -05:00
Blade Barringer
53531ae296 Add btn-block class 2015-08-22 07:42:15 -05:00
Blade Barringer
d55da12c01 Hide + button on invite by uuid tab 2015-08-22 07:41:54 -05:00
Blade Barringer
3153fbac3c Fix bug where mutliple user ids could not be saved 2015-08-21 08:19:39 -05:00
Alys
f9a0e494a7 changed "The Dreadful Cheetah" to "Such a Cheetah" 2015-08-21 20:49:58 +10:00
Blade Barringer
65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Alys
28e360d7f4 change Janet Janet Mongilio to janetmango 2015-08-20 11:23:29 +10:00
Sabe Jones
99c8f941e6 chore(news): August pet Bailey 2015-08-19 17:39:11 -04:00
TheHollidayInn
e762a51e4c Moved menu expand directive and created menu close directive 2015-08-19 08:53:51 -05:00
Blade Barringer
b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -05:00
Blade Barringer
fa7f957ccc Update habitrpg.com to habitica.com where applicable 2015-08-19 08:00:34 -05:00
Blade Barringer
1fecc7dc89 Change wiki links to habitica 2015-08-19 07:46:25 -05:00
Sabe Jones
12b0361d45 WIP(warning-modal): Low health warning 2015-08-18 16:05:48 -04:00
Sabe Jones
120550666d refactor(avatar): DRY out paperdolls 2015-08-18 13:07:27 -04:00
Blade Barringer
14ae3b1046 Add one time binding 2015-08-17 22:07:09 -05:00
Blade Barringer
ba2988ac98 Use new content for mixin 2015-08-17 21:51:08 -05:00
Blade Barringer
f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer
344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Alys
8c186f3068 add close button audio menu on mobile web view - fixes https://github.com/HabitRPG/habitrpg/issues/5359 2015-08-15 15:21:17 +10:00
Blade Barringer
2821e25451 Reinstate the string interpolation 2015-08-14 18:04:04 -05:00
Blade Barringer
28dda9ae9e Fix string interpolation 2015-08-14 17:49:51 -05:00
Blade Barringer
80a6b2dcf9 Merge branch 'develop' into card_tweaks 2015-08-14 17:29:17 -05:00
Sabe Jones
c4c563aca1 WIP(party-page): Restore Guild invite modal 2015-08-14 13:17:19 -05:00
Sabe Jones
572e64e3ed WIP(party-page): Refactor groups service 2015-08-14 12:58:46 -05:00
Sabe Jones
0f31873262 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
 2015-08-14 11:23:35 -05:00
Blade Barringer
80ba33bf7c Fix issue where card strings required quotes 2015-08-14 08:13:05 -05:00
Blade Barringer
6be339fc77 Fix bug where armoire notes would not display correctly 2015-08-14 06:59:23 -05:00
Sabe Jones
ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards 
Greeting and Thank-You Cards
 2015-08-13 22:35:25 -05:00