Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,984 Commits 64 Branches 1,256 Tags
153e0db71d87b2102ef6eada8f4eb96a44e41c02
Commit Graph

816 Commits

Author SHA1 Message Date
Lucy Davies 153e0db71d And of course convert this into a mixin 2015-01-01 23:57:08 +00:00
Lucy Davies 6f3ee14842 Move views/shared/gems.jade -> views/shared/mixins.jade 2015-01-01 23:50:38 +00:00
Blade Barringer 5d958b1456 Adjusted styles for snowball and spookDust so they would align like the coins 2014-12-31 09:31:56 -06:00
Sabe Jones ccfe48099f fix(NYE): fix cards 
Improve random messages and have Bailey give instruction on where to find cards.
 2014-12-30 23:25:34 -06:00
Sabe Jones 438516b26f fix(NYE): Correct achievement badge 2014-12-30 22:56:40 -06:00
Sabe Jones d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -06:00
Sabe Jones 230482c578 chore(news): Bailey 2014-12-30 21:58:15 -06:00
Tyler Renelle edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones e35722865a fix(NYE): I18N for random text 2014-12-30 20:52:06 -06:00
Sabe Jones d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Blade Barringer 0ddbbc93a3 Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop 2014-12-29 18:33:14 -06:00
Blade Barringer efba545147 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-29 15:44:06 -06:00
Blade Barringer b3025c36b1 Fixed checklist not advancing to next input. Closes #4430 2014-12-29 15:43:20 -06:00
Melissa Mcewen 8bdc0d55b9 Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:53:15 -06:00
Melissa Mcewen c4e62fc79b Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:51:37 -06:00
Verabird 9b10081117 Removed useless comment in task.jade 2014-12-26 16:07:54 -05:00
Verabird 7297429888 Make it possible to choose between MM/dd and dd/MM date format 2014-12-26 15:52:42 -05:00
Verabird e391fc04f0 Add variables for medium-length date display 2014-12-26 15:52:42 -05:00
Verabird 13be267efb added variable for date display and checking line ending issue 2014-12-26 15:52:41 -05:00
Sabe Jones 597793e3ca feat(event): Quests and Bailey 2014-12-25 17:36:16 -06:00
Blade Barringer a8459c2f96 Changing button to a element fixed the delete on enter problem 2014-12-24 11:17:05 -06:00
Blade Barringer 0339bdf43f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-24 09:02:20 -06:00
Blade Barringer fdcc22bde9 Closes #4361 2014-12-24 09:02:03 -06:00
benmanley 118ba88d3d fix(tasks): improve UI consistency and layout 
* Match UI elements with rest of site
* Tidy up layout
 2014-12-24 09:53:41 +00:00
Blade Barringer 84db289957 Merge branch 'develop' into add-flag-to-chat 2014-12-23 10:07:42 -06:00
Sabe Jones 833ff90a59 chore(news): Wonderland Bailey 1 2014-12-21 15:41:32 -06:00
Blade Barringer 7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 
Conflicts:
	views/options/social/chat-message.jade
 2014-12-18 21:55:50 -06:00
Sabe Jones eadedd5897 Merge pull request #4383 from SabreCat/seasonal 
Seasonal Shop Basics
 2014-12-16 21:51:02 -06:00
Sabe Jones dbe608bc3a fix(news): correct link and awkward image 2014-12-16 20:24:04 -06:00
Sabe Jones 58957118c0 chore(news): Bailey for Seasonal Shop 2014-12-16 20:18:55 -06:00
Blade Barringer d56eb1eeeb Added last guild link, corrected hall links 2014-12-14 20:10:42 -06:00
Blade Barringer 63c2248b38 Corrected guild links 2014-12-14 20:07:46 -06:00
Sabe Jones 071ac02ec2 chore(git): Resolve merge conflict 2014-12-14 14:55:37 -06:00
Sabe Jones 867f50b514 fix(seasonal): Add menu item 2014-12-14 14:12:20 -06:00
Sabe Jones 8cd1ea48db fix(I18N): Remove more hardcoded text 2014-12-14 14:10:39 -06:00
Sabe Jones 6dcbd329a5 fix(seasonal): Typo in string resource 2014-12-14 14:05:43 -06:00
Sabe Jones 7988dfcf82 fix(seasonal): Corrections for Shop 
Fix Jade indenting, add state control, add menu option
 2014-12-14 14:01:25 -06:00
Sabe Jones 29f693cd24 fix(I18N): Remove hardcoded text 2014-12-14 13:55:40 -06:00
Sabe Jones 506c396baf fix(I18N): Translate TT in menu 2014-12-14 13:53:00 -06:00
Blade Barringer 396176f14f Quest completion screen floats to right on everything but xs 2014-12-14 08:32:05 -06:00
Blade Barringer 41e1f4c75f Conditionally allow completed quest image to be centered if no 
completion text is present
 2014-12-14 08:13:50 -06:00
thehindenburg 2db80c6841 changed to style sheet 2014-12-12 10:26:55 -08:00
thehindenburg 375253fb84 changing the reward text to clear the image 2014-12-12 09:38:13 -08:00
thehindenburg d70de5972e added the image to the end screen and made adjustments to the line 2014-12-11 22:28:07 -08:00
Blade Barringer a95947b2dc Made reset flag count button red 2014-12-11 21:49:42 -06:00
Blade Barringer 38cd0e8de1 Added method for letting an admin unhide a flagged message 2014-12-11 17:29:01 -06:00
Blade Barringer 9bd0304223 Updated message preview on flag abuse modal to use markdown interpretation 2014-12-11 10:23:29 -06:00
Blade Barringer 0cf7bba822 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 2014-12-11 10:21:19 -06:00
Blade Barringer 7fb1e69927 Changed inbox text to use an env.t var 2014-12-10 10:47:05 -06:00
Sabe Jones 2d9d8fe209 chore(Bailey): Announce Penguin 2014-12-09 20:20:17 -06:00