Commit Graph

1972 Commits

Author SHA1 Message Date
Blade Barringer 3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00
Josh Holland a639038a41 Move stat allocation to a mixin to avoid code duplication 2016-03-16 22:07:00 -05:00
Josh Holland 952d9ec929 Quick allocation of attribute points from level-up modal
Resolves #6720.
2016-03-16 22:06:54 -05:00
Kaitlin Hipkin a0f65f8b25 emojis now properly displayed in challenge won modal 2016-03-16 20:12:52 -05:00
Kaitlin Hipkin ae92a98037 challenge title on challenge winner's profile supports markdown w/o emojis 2016-03-16 20:12:49 -05:00
Blade Barringer 1c811dbc82 refactor: Extract orderBy equipment button into mixin 2016-03-15 19:41:24 -05:00
Blade Barringer 9508ed45df refactor: Move order by equipmentment button to top of view 2016-03-15 19:41:11 -05:00
Matt Harrington a6fb945120 inventory sorting
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
2016-03-15 19:41:11 -05:00
Sabe Jones a9e0a4dfaf chore(news): announce badges and Spring Plot 2016-03-15 15:42:15 -04:00
Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
2016-03-15 14:57:38 -04:00
Kaitlin Hipkin 792e8d8094 fix awarding of party {up,on} achievs to update server 2016-03-10 20:38:53 -05:00
Sabe Jones d608fdb437 fix(news): Pfeffernusse typo 2016-03-10 16:59:39 -06:00
Sabe Jones d92614844a Merge pull request #6849 from HabitRPG/sabrecat/pets-201603
Pet quest March 2016
2016-03-09 15:11:14 -06:00
Sabe Jones cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage
Store data for next mobile update
2016-03-09 14:56:15 -06:00
Sabe Jones d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Kaitlin Hipkin fe178a62d9 move party up/on achievs about beast/mount achievs on profile 2016-03-08 21:03:57 -05:00
Kaitlin Hipkin 2ade78fc34 show party up/on achievs on user's profile achievements section 2016-03-08 20:57:19 -05:00
Kaitlin Hipkin d2d3b9deab award party {up,on} achiev when party reaches {2,4} members 2016-03-08 20:55:18 -05:00
Matteo Pagliazzi 582ded4494 disable rate limiting middleware 2016-03-08 23:21:11 +01:00
Sabe Jones f5ea9c5524 fix(analytics): don't log chat messages 2016-03-08 15:19:39 -05:00
Lucas Torroba d502db71e5 Changed tavern tier 1 text icon
The icon for the text/description of the 1st tier contributor was
incorrect. It should be the boot icon, but the firefox icon was being
displayed.
2016-03-08 03:05:46 -03:00
Phillip Thelen 36790592c6 add tests for improvement categories 2016-03-06 17:56:51 +01:00
Alys 34057c375b Merge pull request #6819 from zesme/develop
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
2016-03-06 20:28:47 +10:00
Alys 87bd55cca1 Merge pull request #6780 from colwem/issue6774
Improve styling of markdown blockquotes - fixes #6774
2016-03-06 19:59:30 +10:00
Alys e59f614568 Merge pull request #6786 from murraybd/use-level-style-in-modals
Use level style in modals
2016-03-06 18:52:21 +10:00
Alys 9cac8dd95e Merge pull request #6741 from delftswa2016/fix-hidden-button-issue-6740
Fixed partially hidden button in chat box
2016-03-06 18:18:02 +10:00
Alys 612d455fe1 Merge pull request #6782 from andrewcham/issue6779
update community guidelines - fixes #6779
2016-03-06 17:42:08 +10:00
Blade Barringer b553a6c134 fix: Remove active handles (incompatible with node v4) 2016-03-05 08:11:21 -06:00
Lucas Torroba 4f4ea8416c Closed issue #6758
After some discussion on the thread, this is probably the neatest
solution to issue #6758. I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
2016-03-04 13:16:37 -03:00
Blade Barringer 511b003ec5 Merge pull request #6811 from crookedneighbor/upgrade_babel
chore: upgrade babel to v6
2016-03-04 08:36:08 -06:00
Blade Barringer 9447a6ce10 feat: pre-compile babel when used in production 2016-03-04 07:44:22 -06:00
Phillip Thelen a1e1ac211f improve improvement category validation 2016-03-04 14:00:26 +01:00
Sabe Jones ea983179a4 Merge pull request #6804 from HabitRPG/sabrecat/active-handles
Active handles logging
2016-03-03 13:55:14 -06:00
Blade Barringer 0406142e0e chore: upgrade babel to v6 2016-03-02 21:36:27 -06:00
Sabe Jones af38e83e36 fix(logging): don't log without env var 2016-03-02 11:30:49 -05:00
Sabe Jones c761944c35 feat(logging): timestamp active handles output 2016-03-02 10:22:46 -05:00
Alys f69a29c152 improve group invitation code and tests 2016-03-02 09:26:55 +10:00
Sabe Jones a698559c04 fix(log-handles): don't log verbose code 2016-03-01 16:46:39 -05:00
Sabe Jones bff5258a56 fix(logging): get interval from env var 2016-03-01 16:46:39 -05:00
Sabe Jones 078100aac8 chore(logging): output active handles per 10 minutes 2016-03-01 16:46:38 -05:00
Sabe Jones ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Matteo Pagliazzi 531d3969f4 fix cluster.fork 2016-03-01 09:15:13 +01:00
Nick Bunn 251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -06:00
Brian Murray 8d7c46d79f Merge branch 'develop' into use-level-style-in-modals 2016-02-28 10:13:10 -08:00
Alys 6cd861dcdc Merge pull request #6742 from murraybd/develop
Display attribute info in Character Build
2016-02-28 19:39:20 +10:00
Andrew Cham 518532efdc #6779 Update community-guidelines.jade with current date 2016-02-28 01:20:31 -08:00
Alys 91fc6186e5 Merge pull request #6736 from delftswa2016/fix-perks-buygems
Fixed perk amounts when buying subscription through gem
2016-02-28 18:32:39 +10:00
Alys cc5f794f3d prevent party inviter's email address being used as a Reply-To 2016-02-27 18:48:41 +10:00
Martin Colwell 93410c4f7a issue(6774): add support for markdown blockquote 2016-02-26 20:07:12 -05:00
Brian Murray c107e42978 Change userLevelStyle to a root scope so it can be used in modals. 2016-02-25 15:59:04 -08:00