sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
12230 commits 3 branches 0 tags 1.6 GiB
Commit graph

1188 commits

Author SHA1 Message Date
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
Sabe Jones
d608fdb437 fix(news): Pfeffernusse typo 2016-03-10 16:59:39 -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
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
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
Sabe Jones
ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Nick Bunn
251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -06: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
Sabe Jones
bf002a2d1e chore(news): add bang 2016-02-25 14:06:06 -05:00
Sabe Jones
86824c5304 fix(news): add byline 2016-02-24 17:25:49 -05:00
Sabe Jones
ca57fad0b9 feat(time-travel): add Phoenixes 
Also adds Bailey news for the above and the subscriber set.
 2016-02-24 17:23:42 -05:00
Brian Murray
45a938c12d put the atrribute allocation td building in a loop to clean up the code per Alys 2016-02-19 21:46:23 -08:00
Brian Murray
04d0bcadb7 in profile.jade in the character build section display detailed info about the attribute 2016-02-19 19:22:05 -08:00
kogelnikp
00473dded7 fixed partially hidden button 
added clearfix class to prevent floating for the next elements.
 2016-02-19 22:17:39 +01:00
kogelnikp
db595564b3 fixed perk amounts when buying subscription through gem 
set SettingsCtrl as ng-controller for modal buy-gems window to show perk
amounts when buying subscriptions through gem button
 2016-02-18 23:43:25 +01:00
Sabe Jones
bafdfc4ed5 chore(news): Bailey 20160217 2016-02-17 20:59:11 -05:00
Alys
ffb5cfd46e Merge pull request #6582 from tylerxo/remove_modal_username 
Adds user details to the removal modal
 2016-02-18 06:39:31 +10:00
Sabe Jones
f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Sabe Jones
81098d5fe8 fix(static): update Android app image 2016-02-10 18:48:31 -05:00
Alys
13c06756e3 Merge pull request #6586 from anowlcalledjosh/front_page_image_alts 
#6560: Add alt attributes for images on front page
 2016-02-09 18:15:47 +10:00
Sabe Jones
884e3573a6 fix(deploy): junk commit for Heroku 2016-02-08 17:25:01 -05:00
Sabe Jones
e1b13db6e8 feat(quests): pets 201602 
Also enables the Valentine's Day card for selection in the Market.
 2016-02-08 16:20:05 -05:00
Sabe Jones
a3251ac9a0 fix(groups): DRY profile name logic 2016-02-05 15:26:15 -05:00
Sabe Jones
dd3918436f fix(groups): don't show HP in Guilds 2016-02-05 15:19:23 -05:00
Sabe Jones
e0effcdf5f Merge pull request #6626 from taldin/party_health 
Add HP to party page
 2016-02-04 15:56:39 -06:00
Sabe Jones
d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00
Tyler Smith
065238525c Removing extra class in favor of .lead 2016-02-02 10:22:17 -08:00
Taldin
51e579cb6a Update for cleaner code. 
Per Alys and crookedneighbor's suggestion.
 2016-02-02 10:01:08 -08:00
Sabe Jones
0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Taldin
12749ba497 fixed it so infinite decimals wouldn't print 
Added .toFixed(1) call.
 2016-02-01 10:14:42 -08:00
Alys
ea57808176 remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed) 2016-01-31 18:25:37 +10:00
Taldin
e08f77651b Add HP to party page 
Party page now displays each party member's health next to their name
(healers don't have to click on each party member to see their health)
 2016-01-30 16:32:10 -08:00
Sabe Jones
91c6ce27c5 feat(event): Habit Birthday 2016 
Also adds AWS Elastic Beanstalk local config file to .gitignore.
 2016-01-28 17:16:01 -05:00
Sabe Jones
d7782584db chore(news): Bailey 20160126 2016-01-26 20:31:43 -05:00
Josh Holland
7cc618b32c Add alt attributes for images on front page 
Some images have an empty alt attribute (alt=""); this isn't a mistake,
it's part of the HTML spec for images that don't add any information.
Debatably, some images marked up as such with this commit do add
information, but that information (e.g. what the Habitica UI looks
like from the intro image) isn't likely to be useful to someone not
able to see.

It's also difficult to convey purely visual concepts like the arrows
with alt-text, especially as the arrows themselves are not images and
therefore cannot have an alt attribute.

Fixes #6560.
 2016-01-26 17:35:35 +00:00
Tyler Smith
ff2ebe46b8 Fixing jade and angular syntax miscues 2016-01-26 07:59:31 -08:00
Tyler Smith
588fdc6cad Properly chaining classes in jade 2016-01-26 07:52:35 -08:00
Tyler Smith
fd157785f4 Adding text-center to container rather than individual elements 2016-01-25 17:42:50 -08:00
Tyler Smith
77cfc99b59 Adding user details to the removal modal 2016-01-25 17:37:18 -08:00
Shellbot
7d0ad86c43 Color code quest accepted/rejected text 2016-01-22 21:56:39 +00:00