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
12339 commits 3 branches 0 tags 1.6 GiB
Commit graph

1221 commits

Author SHA1 Message Date
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
Sabe Jones
f872547264 chore(news): Bailey 2016-01-20 2016-01-20 16:32:12 -05:00
Sabe Jones
016b080836 Merge branch 'anowlcalledjosh/add-task-fix' into develop 2016-01-20 14:27:21 -05:00
Sabe Jones
af53285e01 Merge branch 'proarunas/fix-css-bugs' into develop 2016-01-20 14:17:39 -05:00
Josh Holland
77342e5790 Fix 'add task' button jumping around 2016-01-19 20:56:06 +00:00
Sabe Jones
c4acd262eb Merge pull request #6476 from Sighne/sighne/upgrade-amount-users 
#6460: upgrade amount of users
 2016-01-19 13:41:03 -06:00
Sabe Jones
2848f5d709 Merge branch 'NathanMaton/fix-homepage-text' into develop 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2016-01-19 13:59:49 -05:00
Sabe Jones
95ee19b4ca Merge branch 'taldin/faq-wiki-links' into develop 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2016-01-19 13:50:35 -05:00
Jason Vinson
2989057dd3 Fix for issue #5182: Allow cancel editing group infobox 2016-01-18 22:39:06 -06:00
Sabe Jones
d44ff94acb Merge pull request #6547 from vIiRuS/guidelinespage 
Add viirus to Community Guidelines page. Fixes #6546
 2016-01-18 15:37:58 -06:00
Sabe Jones
c6b4b24052 Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks 
Text and visual tweaks for Gems
 2016-01-18 15:25:58 -06:00
Phillip Thelen
d0de12abac Add viirus to Community Guidelines page. Fixes #6546 2016-01-18 20:52:27 +01:00
Joshua Holland
e98dc1405b Fix rendering of front page news icons 
Rendering was 'pixelated', is now 'auto'.
 2016-01-16 22:43:29 +00:00
Sighne
a716ce3fa7 Adds a variable to manage user count 2016-01-16 11:11:48 +01:00
Sighne
ffe1dd6c6a Upgrade amount of users where I missed and add Discover logo on social pages 2016-01-16 11:11:48 +01:00
Sighne
a9f10380b9 Upgrades amount of users on static page 2016-01-16 11:11:48 +01:00
Sighne
de3d4ae8e7 Adds Discover magazine logo 2016-01-16 11:11:48 +01:00
Sabe Jones
23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Taldin
3b3c1fead7 Moved the Habitica Wiki link down to the bottom 
Per Lemoness' request.
 2016-01-15 09:48:16 -08:00
Luveluen
5315cc9055 Update character.json to separate optOut into two translation strings 
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
 2016-01-14 20:40:07 -06:00
Georgi Gardev
24e08676db Add icon for pinned Safari tabs 
Fixes #6451
Closes #6522
 2016-01-14 20:32:51 -06:00
Georgi Gardev
e761315c74 Remove tooltip for 'reverse chat messages' checkbox 
Fixes #6517
Closes #6525
 2016-01-14 20:28:08 -06:00
Josh Holland
a0b264f686 Align progress and help icons on to-dos column 
Fixes #6474

As per #6474, progress and help icons on the to-dos column were
previously misaligned due to inline styles. This commit adds the same
inline styles to both icons.

Move inline styles on task column icons to a class

This uses existing classes instead of adding a new one, because if new
icons are added in the future this should catch them without any extra
classes having to be added to the new icons.

In addition, this will catch any new .option-box added to .task-column
in the future; this may be good or bad, but is easy to fix in any case.
 2016-01-14 20:24:09 -06:00
Sabe Jones
b6b2c25358 style(modal): text and visual tweaks for Gems 2016-01-14 15:58:14 -05:00
Sabe Jones
14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Sabe Jones
2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng
8bc78af5ae Added specificity to CSS, removed exxtra line 2016-01-12 15:00:07 -05:00
AnitaYCheng
bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00
AnitaYCheng
6a72027d8b Add subscription conditionals for buying or purchasing gems 2016-01-12 14:58:39 -05:00
AnitaYCheng
5f88aef3ca Add new mixin for purchasing gems. Add new areas that will be conditionally set by user subscription status. 2016-01-12 14:58:39 -05:00
Sabe Jones
dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option 
Add option to reverse chat order
 2016-01-11 12:55:28 -06:00
Sabe Jones
7e8f0d24c5 Merge remote-tracking branch 'origin/pr/6307' into develop 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2016-01-11 13:48:01 -05:00
Taldin
fd81f70ffa Adjusted for generic translation 
Per Lady Alys's suggestion.
 2016-01-09 23:59:05 -08:00
pittaxx
8cd34e49bd Removed extra scrollbars at medium width. Cleared floating for todo tab in medium width. 2016-01-09 18:47:04 +02:00
Sabe Jones
1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05:00
Sabe Jones
eadf967c9f Merge pull request #6409 from pnrich/flag-text 
add extra text to flagging confirmation dialog and to top of PM inbox -- Fix for issue #4648, parts 3 and 4
 2016-01-08 14:05:22 -06:00
Daniel Van Camp
99a694bb10 added EU version of t-shirt 2016-01-06 23:15:36 +01:00
Daniel Van Camp
0362977dbd Merge branch 'develop' into static-page-merch 2016-01-06 22:38:19 +01:00
Sabe Jones
adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Nathan Maton
602dfd8369 went with head on habitrpg-shared.css 2016-01-05 22:09:33 -08:00
Nathan Maton
0e28c59878 changed type of activity from habit to daily for goals and chores on front page 2016-01-05 19:48:55 -08:00
Taldin
07fc30a131 update help menu and FAQ to jump to Wikia 
The Help > FAQ option no longer jumps to the Wiki.  Added a help menu
item to fix that.   I also added a link to the Wiki FAQ at the bottom of
the FAQ.
 2016-01-05 12:19:18 -08:00
Sabe Jones
cb984d8d22 fix(event): remove NYE card 2016-01-04 18:27:52 -05:00
Sabe Jones
cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05:00
Alys
23aaf78167 revert change to Bailey about Party Hats now that the code behaviour has changed 2016-01-01 16:06:52 +10:00
Alys
6a7cd0900e adjust Bailey message about party hats to clarify that they're not available to players who join from now on, and that only one hat will appear for each player 2016-01-01 11:24:15 +10:00
Sabe Jones
02f4a84146 fix(news): Winter Flame not Penguin 2015-12-30 18:38:00 -05:00
Sabe Jones
6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Georgi Gardev
42d09bd758 Reverse order of chat messages from chat box 2015-12-30 23:47:10 +02:00
Georgi Gardev
beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Georgi Gardev
ea54ec607a Add confirmation popover for Release pets/mounts 
Add tests for releasing pets and mounts

Refactor tests to use expect syntax from sinon-chai

tests(karma): Refine settings controller tests

refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
 2015-12-28 21:37:38 -06:00
Georgi Gardev
f6f82cafc4 Add confirmation popover for Rebirth 
Add confirmation popover for Fortify/Reroll

Add tests for reroll and rebirth
 2015-12-28 21:37:23 -06:00
Paul Rich
c9fdff38f9 Fix for issue #4648, parts 3 and 4 2015-12-28 14:24:48 -05:00
Paul Rich
56a00efb19 Fix for Issue #3517 Display Current Page Name 
Revision for Fix for issue #3517

lint: Remove extraneous white space in app.js file

fix: Correct attribute from pageTitle to title in $state interface
 2015-12-28 07:53:51 -06:00
Blade Barringer
363ef5e091 fix: Remove stray {{ characters 2015-12-26 19:05:12 -06:00
Blade Barringer
7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -06:00
Blade Barringer
ef25956ba3 feat(views): Create generic message alert modal 2015-12-26 19:00:44 -06:00
darkmeep
1c261056fe clear local storage page added 
changed submit bug to clear browser data

feat(views): Style clear local storage button
 2015-12-26 19:00:42 -06:00
Sabe Jones
7d0efdeeda chore(news): Android announcement 
Also adds a higher-quality version of the Winter Town background.
 2015-12-23 14:43:16 -05:00
Sabe Jones
468198b9e2 feat(mystery): subscriber items 2015-12 
Also enables the Snowball in the Seasonal Shop.
 2015-12-22 16:16:30 -05:00
Sabe Jones
afe3c87357 fix(credits): Lady Snuffles 2015-12-18 20:09:26 -05:00
Sabe Jones
493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones
3cc2866c76 Merge pull request #6368 from HabitRPG/sabrecat/pets-201512 
December Pet Quest
 2015-12-15 11:55:08 -06:00
Nathan Maton
35a921bf43 feat(content): Make mystery set strings translatable 
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
 2015-12-15 08:47:13 -06:00
Sabe Jones
fe1de12494 feat(pets): December quest 2015-12-14 16:28:39 -05:00
Daniel Van Camp
338cfb3fc9 update logo and image links to be dynamicly added instead with a manual written link 2015-12-14 21:44:32 +01:00