Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,106 Commits 64 Branches 1,256 Tags
3ba057258f566f4f7b40407c523a9904a8b32a67
Commit Graph

331 Commits

Author SHA1 Message Date
Blade Barringer 3ba057258f Added triad bingo achievement modal 2015-01-16 11:49:19 -06:00
Blade Barringer 1557907a1c Updated string names 2015-01-12 13:12:40 -06:00
Blade Barringer 2b20c52a8d Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-10 09:25:18 -06:00
Blade Barringer 7f20ca7d8b Made title dynamic 2015-01-10 08:26:11 -06:00
Blade Barringer dc37442691 Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat 
Cmd/Ctrl + enter for chat and pms.
 2015-01-09 13:51:21 -06:00
Sabe Jones ee339fba4a feat(event): World boss 
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:22:42 -06:00
Blade Barringer 0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -06:00
negue ad8add58d7 Merge pull request #4461 from negue/markdownText 
change markdown ngModel to text attribute
 2015-01-05 22:12:06 +01:00
Blade Barringer cc7b2f70ba Hide buy gems button if over level 100 in rebirth modal 2015-01-05 13:41:58 -06:00
Blade Barringer 10451d3296 Removed gem cost if lv 100 or higher 2015-01-05 13:38:00 -06:00
Blade Barringer a72faa5d92 Added ctrl+cmd enter command to pms 2015-01-05 13:21:23 -06:00
Blade Barringer 68e613c3fc Simplified count checks in keys to the kennel modal. Adjusted balance for releaseBoth to be correct 2015-01-02 14:11:59 -06:00
Blade Barringer 87d78618d8 Changed keys of the kennel npc to Matt 2015-01-02 13:46:21 -06:00
Blade Barringer 406edcb761 Added releaseBoth script and refactored keys to the kennel modal 2015-01-02 13:33:41 -06:00
Blade Barringer 7f2648eafb Renamed release scripts 2015-01-02 12:43:40 -06:00
Lucy Davies 0cfb705762 Add behaviour specific to the buy-gems popup. 2015-01-02 00:01:44 +00:00
Lucy Davies 0754b58cc2 Source the new mixin file, and call the mixins in place of including the former gems.jade 2015-01-01 23:58:28 +00:00
Blade Barringer 488a53f1cf Corrected comment title 2015-01-01 17:16:23 -06:00
Negue b3ccdc2859 change markdown ngModel to text attribute 2015-01-01 20:57:57 +01:00
Blade Barringer 0fd3f290b8 Merge branch 'develop' into mountmaster 2014-12-31 13:14:11 -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 d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -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
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 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
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
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 cea2879539 Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster 2014-12-11 08:15:18 -06:00
Matteo Pagliazzi ae6e0255c6 feat(flag-message): add server methods 2014-12-07 14:35:09 +01:00
Blade Barringer aafda2dad1 Added text of message to make sure user clicked the right flag 2014-12-07 13:50:47 +01:00
Blade Barringer 8537c96eb6 Converted heading to paragraph 2014-12-07 13:50:47 +01:00
Blade Barringer 62d92db332 Added buttons to footer, cleaned up functions 2014-12-07 13:50:46 +01:00
Blade Barringer 01c0ce1722 Added text-danger span on username 2014-12-07 13:50:46 +01:00
Blade Barringer 6fcf1846b3 Renamed everything from flag to abuseFlag 2014-12-07 13:50:46 +01:00
Blade Barringer 00abb168a1 Added heading and body of flag modal 2014-12-07 13:50:46 +01:00
Blade Barringer 5e1e1b2c13 Flag icon opens blank modal 2014-12-07 13:50:46 +01:00
Tyler Renelle d2e230db1f fix(plans): various bug fixes 2014-12-03 18:34:26 -07:00
Tyler Renelle 0a53a5717e refactor(payments): move payments into it's own service, out of rootCtrl 2014-12-03 14:17:08 -07:00