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

803 Commits

Author SHA1 Message Date
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
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
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 bd5f8d79ea fix(bailey): mystery 3014 promo 2014-12-03 19:24:42 -07:00
Tyler Renelle d2e230db1f fix(plans): various bug fixes 2014-12-03 18:34:26 -07:00
Tyler Renelle e1492809fd bailey(plans): Gifting Subscriptions And Gems, New Subscription 
Benefits, Mysterious Time Travelers, Steampunk Item Sets, And Block Subscriptions
 2014-12-03 16:31:38 -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
Tyler Renelle 0fffd66588 feat(plans): time travelers tab, 1 trinket to buy 1 set 2014-12-03 14:17:08 -07:00