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

1167 commits

Author SHA1 Message Date
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
Daniel Van Camp
3c7ddf8df1 Merge branch 'develop' into static-page-merch 2015-12-14 21:27:50 +01:00
Blade Barringer
5fa91713f5 fix(favicon): Add 192x192 image 2015-12-12 20:11:25 -06:00
Blade Barringer
025b302ec6 Merge branch 'develop' into anilanar-favicon192 2015-12-12 20:08:34 -06:00
Blade Barringer
81067efd19 Merge branch 'joyclark-new_mount_heads' into develop 2015-12-12 17:16:36 -06:00
Alys
10a63a6cb7 make Android link in footer open in new tab 2015-12-12 18:59:44 +10:00
Alys
95dbcde4b6 change Android link in footer to point to Google Play 2015-12-12 18:33:36 +10:00
Alys
5d6c4d4dcd add Android app with Google Play logo to static apps page; remove mailing list signup form 2015-12-12 11:32:17 +10:00
Sabe Jones
f6cdf5d257 chore(news): Android Bailey 2015-12-10 17:00:48 -05:00
Joy Clark
7628882f24 use new css class 2015-12-08 13:22:13 +01:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
Alys
d63cf64944 allow Fetch Recent Messages button to appear on newly-created groups 2015-12-03 10:03:59 +10:00
Sabe Jones
1add0084e8 chore(news): Update Bailey for GX3 2015-12-01 18:27:03 -05:00
Sabe Jones
03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Sabe Jones
483ff8cb67 Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom 
Tasks add push to bottom
 2015-12-01 14:20:02 -06:00
Daniel Van Camp
3d9b2047d0 updated static.styl with less classes 
added key attribute to merchant array
changed item to merchant for clearity
added fallback for when no logo is found (no image can be provided)
updated guidelines
updated json
 2015-11-30 22:33:12 +01:00
Sabe Jones
78890012c1 Merge pull request #6305 from markhowson/fix_narrow_guild_desc 
Fixes #6252 - Guild description is too narrow on guild page
 2015-11-30 13:16:59 -06:00
Daniel Van Camp
6056a59cbe minor update in the comment section 2015-11-29 19:12:45 +01:00
Daniel Van Camp
afecae9ef0 cleared merch.json of attributes that should not be translated 2015-11-29 19:05:32 +01:00
Alys
5e105a0e45 allow moderators to reset flags for a chat message when there's only one flag 2015-11-29 19:46:27 +10:00
Keith Holliday
0dcba276a6 Fixed task push text and move ctrlPressed logic to rootScope. 2015-11-28 12:06:34 -06:00
Daniel Van Camp
6a535277a7 updated tab indent 
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
 2015-11-27 23:25:56 +01:00
Daniel Van Camp
a28a167437 merge 2015-11-27 10:25:08 +01:00
Daniel Van Camp
ae8153c1f0 Merge branch 'static-page-merch' of https://github.com/danielvancamp/habitrpg into static-page-merch 2015-11-27 10:23:53 +01:00
Daniel Van Camp
1f8ae40d9d updated counter to the real 2 sellers 2015-11-27 10:07:12 +01:00
Daniel Van Camp
3a47221d74 added better bootstrap for multiple merchandises 2015-11-27 10:07:12 +01:00
Daniel Van Camp
f67bf77143 added guide how to add merchandise 2015-11-27 10:07:12 +01:00
Daniel Van Camp
e881ba37e7 added static merch page 
added lang en .json
modified pages.js with the extra merch page
 2015-11-27 10:07:12 +01:00
Daniel Van Camp
a7c05de8e7 added better bootstrap for multiple merchandises 2015-11-27 00:19:52 +01:00
Daniel Van Camp
610a555849 added guide how to add merchandise 2015-11-27 00:06:33 +01:00
Daniel Van Camp
169a8d9915 added static merch page 
added lang en .json
modified pages.js with the extra merch page
 2015-11-26 23:51:57 +01:00
Mark Howson
f67bd384d4 Moved guild leader message down slightly 2015-11-26 18:47:54 +00:00
Sabe Jones
ad347090c3 Merge remote-tracking branch 'origin/pr/5968' into develop 
Conflicts:
	website/views/options/social/challenge-box.jade
 2015-11-26 13:33:33 -05:00
Sabe Jones
0a90c7c66d Merge pull request #6270 from Arodang/challenge-tag-field-character-limit 
Removed Challenge Tag Maxlength
 2015-11-26 11:15:23 -06:00
Mark Howson
fa462a1829 Renamed to wide-popover as it's the only remaining use 2015-11-26 12:56:22 +00:00
Mark Howson
848a96a9fa Fix for #6252 2015-11-26 11:56:32 +00:00
Keith Holliday
274f4ab4d2 Removed css in favor of using inverted glyphicon 2015-11-25 23:44:13 -06:00
Alys
0c77737f36 Merge pull request #6299 from ojeytonwilliams/static-string-fix 
Fixed broken string reference and centered the string.
 2015-11-26 08:59:03 +10:00
Alys
5461345770 remove trailing whitespace 2015-11-26 08:49:40 +10:00
Keith Holliday
83934bf5c9 Added markdown directive to challenge titles 2015-11-26 08:49:40 +10:00
Sabe Jones
29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Oliver Eyton-Williams
d385b2e415 Fixed broken string reference and centered the string. 2015-11-25 15:46:59 +01:00
Alys
e04066e45f Merge pull request #6228 from AminArria/timezone-information 
Timezone information
 2015-11-24 21:21:10 +10:00
Keith Holliday
b668829d85 Added ability to invert pushToBottom when holding down ctrl or cmd button 2015-11-22 15:57:14 -06:00
Arodang
0b1758f5c6 Removed col-lg-6 class from tags and prize 2015-11-20 18:17:51 -05:00
arodang
b286a93006 removed challenge tag maxlength, reduced tag and prize field size 2015-11-19 23:21:15 -05:00
Sabe Jones
bdf1c82b39 chore(news): Misc Bailey 2015-11-19 21:22:38 -05:00
Alys
cb1f745d39 Merge pull request #6247 from ojeytonwilliams/subcriber-benefits-comparisons 
Potential fix for #6085 - fix subscriber benefits comparisons; round down 3 month blocks for perks - fixes #6085
 2015-11-19 07:09:14 +10:00
Blade Barringer
c452cf9f99 Adjust styling of noscript block 2015-11-17 21:35:07 -06:00
Blade Barringer
1299afcb01 Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js 2015-11-17 21:28:22 -06:00
Gautham Chandra
37e08e8d5d Converted noscript text into translatable strings 2015-11-17 22:22:55 -05:00
Sabe Jones
f5f33bd1b9 fix(modals): SM modal fixes 
Fixes #6253, allows quest pets to appear in hatching and raising modals, and makes code for deciding whether or not to show a generic levelup modal a bit more readable per comments on #6042.
 2015-11-17 16:56:11 -05:00
Sabe Jones
c352a30d4e chore(news): Bailey 2015-11-16 
Also sprite recompile to incorporate sticker promo image.
 2015-11-16 17:26:44 -05:00
Sabe Jones
2d1ad12cbd fix(strings): Make plural more greppable 2015-11-16 17:08:38 -05:00
Sabe Jones
e73c7be47a fix(achievement): Make Costume Contest repeatable 2015-11-16 16:07:16 -05:00