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

1369 commits

Author SHA1 Message Date
Keith Holliday
78a8eea79a Updated quest service to use new api-v3 (#7126) 
* Updated quest service to use new api-v3

* Updated inviteToQuest function name. Used quest return rather than syncing party
 2016-05-03 17:16:30 +02:00
Sabe Jones
166a37d53f chore(event): end Spring Fling 2016 2016-05-02 01:36:03 +00:00
Matteo Pagliazzi
3437744f62 Merge branch 'api-v3' into api-v3-client 2016-04-30 16:51:15 +02:00
Matteo Pagliazzi
f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Sabe Jones
1787342951 chore(news): Last Chance Bailey 201604 2016-04-29 22:16:36 +00:00
Blade Barringer
2aa3a3175f Merge branch 'develop' into kelsin-develop 2016-04-27 19:11:56 -05:00
Sabe Jones
bf7ce46ea4 chore(news): Be-Wilder conclusion 2016-04-27 04:16:35 +00:00
Sabe Jones
d96b13ed43 chore(news): Floral Potions Bailey 2016-04-25 21:20:21 +00:00
Keith Holliday
ea490c9a1f Ported groups service to user new api v3 and ported dependent controllers (#7108) 
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Added promise rejections and updated http interceptor
 2016-04-25 23:11:23 +02:00
Sabe Jones
974896ce7b feat(events): April Mystery and Floral Potions (#7107) 
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
 2016-04-25 14:17:31 -05:00
Matteo Pagliazzi
f2d5c921ed Merge branch 'api-v3' into api-v3-client 2016-04-24 15:09:10 +02:00
Matteo Pagliazzi
6197fcea3b Merge branch 'develop' into api-v3 2016-04-24 15:08:13 +02:00
Sabe Jones
8355dbe63f chore(news): Bewildered Bailey 2016-04-23 04:00:30 +00:00
Matteo Pagliazzi
4cda56e3eb Merge branch 'api-v3' into api-v3-client 2016-04-23 03:08:37 +02:00
Matteo Pagliazzi
2d87cb0d87 Merge branch 'develop' into api-v3 2016-04-22 17:43:48 +02:00
Sabe Jones
867146dc19 fix(xss): Update site to use remarkable instead of marked 
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
 2016-04-21 13:23:53 -05:00
Matteo Pagliazzi
4138eab155 v3: undo changes to client that were necessary to test v2 2016-04-19 12:16:39 +02:00
Matteo Pagliazzi
f44dbbbd71 Merge branch 'develop' into api-v3 2016-04-19 12:16:22 +02:00
MathWhiz
ed49a377e1 add community guidelines info to profile editing (#7086) 
* add community guidelines info to profile editing

* Update profile.jade
 2016-04-19 10:15:21 +10:00
MathWhiz
f1788080da Add list of Featured third-party Apps (#7046) 
* add list of featured third-party apps

* Add comma

* add descriptions

* add description to other

* add table

* add description to other

Conflicts:
	common/locales/en/settings.json
	website/views/options/settings.jade

* Update settings.json

* Sort extensions by name
 2016-04-19 08:21:07 +10:00
Matteo Pagliazzi
c2b8cad886 v3: fix v3 proxied ops in v2, logout 2016-04-16 19:56:33 +02:00
Sabe Jones
881cf0292d chore(news): mobile and Beguilement Bailey 2016-04-15 18:46:02 +00:00
Sabe Jones
c608ac9ecc fix(news): Erratum 2016-04-15 11:53:58 -05:00
Blade Barringer
1a64886f7d Merge branch 'develop' into api-v3 2016-04-15 08:04:46 -05:00
Sabe Jones
ffb3ed0aa4 chore(news): annouce Android update 2016-04-14 23:48:45 +00:00
Ubuntu
13edca4588 chore(news): add skill icon announcement 2016-04-13 21:25:31 +00:00
Matteo Pagliazzi
925881b2a0 misc fixes and enable dev endpoints for easier live testing 2016-04-13 22:55:39 +02:00
Sabe Jones
7bb6f968b4 feat(content): Pet Quest 2016-04 (#7071) 
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
 2016-04-13 12:15:38 -05:00
Nick Bunn
55f0398928 moved broadcast to task page. changed up key press binding 2016-04-13 01:16:50 -05:00
Husman
11de1015ea Fixes: cursor as pointer on hero-box class in level up dialog that is not clickable by the user. 
Updates the style of the herobox to use the default cursor on this page instead of the pointer cursor that is defaulted by the hero-box class.
This is in relation to: https://github.com/HabitRPG/habitrpg/issues/7066
 2016-04-12 16:41:00 -07:00
Matteo Pagliazzi
a29dd1a1c7 fix(build) temporarily use habitrpg-shared from habitica.com in v3 client 2016-04-12 09:46:01 +02:00
Blade Barringer
ecb9e09ad8 fix: Add missing sprite class for skills icon in rewards column 
closes #4276
closes #6950
 2016-04-11 08:00:42 -05:00
Blade Barringer
b4eb386047 chore: Change spells file name to skills 2016-04-11 08:00:10 -05:00
Blade Barringer
8a42a3a51e Merge branch 'develop' into api-v3 2016-04-08 21:31:41 -05:00
Sabe Jones
b7d801a603 fix(news): typo 2016-04-08 16:17:51 -05:00
Ubuntu
7118e68cf0 chore(news): Beguilement Strike Bailey 2016-04-08 19:06:09 +00:00
Blade Barringer
74dace9b5a chore: Re-enable New Relic 
closes #7011
 2016-04-05 20:08:31 -05:00
Sabe Jones
1f6eef0082 Sabrecat/armoire 201604 
* WIP(content): add sprites

* feat(content): Armoire and Backgrounds 2016-04
 2016-04-05 15:30:01 -05:00
Matteo Pagliazzi
c5f17b4011 Merge branch 'develop' into api-v3 2016-04-01 11:50:41 +02:00
Sabe Jones
3281894d83 chore(news): World Boss Bailey 2016-03-31 19:54:13 -04:00
Sabe Jones
a07aed331c fix(world-boss): add chat message, Bailey handling, animation 2016-03-31 19:38:43 -04:00
Sabe Jones
f51653b7a5 WIP(world-boss): partial build 2016-03-31 17:29:21 -04:00
Matteo Pagliazzi
3089658cc7 Merge branch 'develop' into api-v3 2016-03-30 23:40:00 +02:00
Sabe Jones
4fa8c6dfbd chore(news): Bailey 2016-03-30 2016-03-30 15:39:12 -04:00
Blade Barringer
a9d227b490 Merge branch 'develop' into wheelchair 2016-03-28 21:12:52 -05:00
Matteo Pagliazzi
d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Blade Barringer
cd6adf2421 fix: correct wheelchair spelling 2016-03-24 21:31:20 -05:00
Blade Barringer
c88f2ce580 refactor: Use resized version of wheelchair for selection 2016-03-24 07:57:57 -05:00
Nick Bunn
0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Sabe Jones
17b02f2867 fix(news): missing promo 2016-03-23 15:47:22 -04:00
Sabe Jones
ba1cc67654 chore(news): fill out remaining Bailey 2016-03-23 15:36:24 -04:00
Sabe Jones
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
MathWhiz
86516b5e20 Update presskit 2016-03-22 08:41:02 -05:00
Matteo Pagliazzi
0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Sabe Jones
10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Blade Barringer
ced0b44b2f fix: Remove name from sortable inventory 2016-03-17 08:47:56 -05:00
Blade Barringer
d4d668a7aa fix: Correct typo in equipment click 2016-03-17 08:09:37 -05:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Christopher Giroir
cfae524579 Updating button text to GET instead of VIEW 2016-03-16 23:23:36 -07:00
Sabe Jones
b4b0d7e89c chore(news): mobile updates Bailey 2016-03-17 00:09:42 -04:00
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
Matteo Pagliazzi
c02082a200 Merge branch 'develop' into api-v3 2016-03-12 16:00:24 +01:00
Sabe Jones
d608fdb437 fix(news): Pfeffernusse typo 2016-03-10 16:59:39 -06:00
Matteo Pagliazzi
fbdbd8e006 Merge branch 'develop' into api-v3 2016-03-10 18:30:09 +01: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
Blade Barringer
3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06: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
Christopher Giroir
82cfd8afc8 Moving to new purple logo.png 2016-03-05 11:06:01 -08:00
Matteo Pagliazzi
8920b05f9e Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2016-03-02 12:59:51 +01:00
Sabe Jones
ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Matteo Pagliazzi
9114d74357 Merge branch 'develop' into api-v3 2016-03-01 09:44:57 +01:00
Nick Bunn
251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -06:00
Matteo Pagliazzi
0c700cc36d Merge branch 'develop' into api-v3 2016-02-29 16:39:31 +01:00
Christopher Giroir
7e845962f4 Fixing comments 2016-02-28 11:58:39 -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
Matteo Pagliazzi
bb461f0c5a Merge branch 'develop' into api-v3 2016-02-26 10:08:24 +01: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
Matteo Pagliazzi
9ef4b6409e Merge branch 'develop' into api-v3 and move new relic to new location 2016-02-22 11:43:35 +01:00
Christopher Giroir
896773f9ef Adding android app banners 
Fixes #6692
 2016-02-20 11:56:39 -08: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
Matteo Pagliazzi
cc31d266e4 port locals middleware, add some tests and a lot of fixes 2016-02-19 18:42:03 +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