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

793 commits

Author SHA1 Message Date
Blade Barringer
fdcc22bde9 Closes #4361 2014-12-24 09:02:03 -06: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
Tyler Renelle
5b01fff700 feat(gifts): allow gifting subscriptions 2014-12-03 14:17:07 -07:00
Tyler Renelle
e8dbd5ca1a feat(gifts): allow gifting gems from paypal/stripe 2014-12-03 14:17:07 -07:00
Tyler Renelle
7e9b92fcad feat(gifts): allow gifting from balance 2014-12-03 14:17:07 -07:00
Tyler Renelle
66b4dae0d9 feat(news): move old news to /static/old-news, better use of content space 2014-12-03 13:49:24 -07:00
benmanley
073b338bde fix(tasks): stop reward values overflowing 
Fixes #1993

* Restyle reward cost area to fit three digit rewards into default view
* Apply custom styles to rewards with higher values to prevent them
from overflowing
 2014-12-03 15:40:08 +00:00
Sabe Jones
3cf6e84451 chore(Bailey): Outage announcement 2014-12-01 21:05:36 -06:00
Sabe Jones
1713843067 fix(Bailey): correct date 2014-11-30 23:06:00 -06:00
Sabe Jones
452b459d69 chore(Bailey): Announce December 2014-11-30 23:03:08 -06:00
Sabe Jones
2ee6f0ed61 feat(Bailey): November subscription reminder 2014-11-30 11:50:31 -06:00
Blade Barringer
44baa822c8 Adjusted ng-hide so users cannot block themeselves 2014-11-30 10:50:39 -06:00