sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6062 commits 3 branches 0 tags 1.6 GiB
Commit graph

2509 commits

Author SHA1 Message Date
Sabe Jones
d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Sabe Jones
53fff0dbc6 feat(seasonal): Implement Snowball 
Adds the snowball from Winter 2014 to the Seasonal Shop.
 2014-12-29 19:40:11 -06:00
Blade Barringer
4eca27f19e Corrected class name closes #4434 2014-12-29 19:15:51 -06:00
Blade Barringer
0ddbbc93a3 Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop 2014-12-29 18:33:14 -06:00
Blade Barringer
efba545147 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-29 15:44:06 -06:00
Blade Barringer
b3025c36b1 Fixed checklist not advancing to next input. Closes #4430 2014-12-29 15:43:20 -06:00
Matteo Pagliazzi
4a37bec652 fix(pr): indentation and simplify 2014-12-29 21:21:54 +01:00
Matteo Pagliazzi
752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat 2014-12-29 21:09:04 +01:00
Blade Barringer
760381041f Added transparent class to gem purchasing if zero gems are available for purchase 2014-12-29 11:18:01 -06:00
Melissa Mcewen
8bdc0d55b9 Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:53:15 -06:00
Melissa Mcewen
c4e62fc79b Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:51:37 -06:00
Melissa Mcewen
f8cdcd2e75 Inconsistent alignment of Gem prices in Seasonal Shop #4434 2014-12-28 23:35:47 -06:00
Andy Zinsser
1a4455550d Remove duplicate equipment-tab classes 2014-12-27 17:49:58 -08:00
Negue
a082e88b5d Filter Array only once and one time binding - closes #4429 2014-12-27 23:26:30 +01:00
Blade Barringer
72d4bf2bf5 Merge pull request #4423 from andyzinsser/fix-no-food-text-color 
Add muted class when no food is in inventory
 2014-12-26 20:47:15 -06:00
Andy Zinsser
db6f52e4b5 Add muted class when no food is in inventory 2014-12-26 18:31:21 -08:00
Alice Harris
af7e68259d Merge pull request #4404 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:29:04 +10:00
Verabird
9b10081117 Removed useless comment in task.jade 2014-12-26 16:07:54 -05:00
Verabird
7297429888 Make it possible to choose between MM/dd and dd/MM date format 2014-12-26 15:52:42 -05:00
Verabird
e391fc04f0 Add variables for medium-length date display 2014-12-26 15:52:42 -05:00
Verabird
13be267efb added variable for date display and checking line ending issue 2014-12-26 15:52:41 -05:00
Blade Barringer
f5a0bd6903 Added trasnparent class to seasonal items already owned 2014-12-25 21:32:07 -06:00
Lucy Davies
33ed0794b9 Remove the onClick action of this file is included in the Buy Gems popup 2014-12-26 01:06:30 +00:00
Lucy Davies
c65fe65d4e Remove the + icon if this file is included in the Buy Gems popup 2014-12-26 00:34:48 +00:00
Lucy Davies
d29971695e Define the variable to control display of the + icon and the onClick functionality 2014-12-26 00:17:03 +00:00
Sabe Jones
1b4843ff58 fix(event): Better quest text placement 2014-12-25 17:42:09 -06:00
Sabe Jones
f4c582eb24 fix(event): quest syntax 2014-12-25 17:40:49 -06:00
Sabe Jones
597793e3ca feat(event): Quests and Bailey 2014-12-25 17:36:16 -06:00
Sabe Jones
1c90886548 fix(event): Better shop flow 2014-12-25 15:52:26 -06:00
Sabe Jones
0e28f04c90 feat(event): Implement Seasonal Shop 2014-12-25 14:33:11 -06:00
Blade Barringer
a8459c2f96 Changing button to a element fixed the delete on enter problem 2014-12-24 11:17:05 -06:00
Blade Barringer
0339bdf43f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-24 09:02:20 -06:00
Blade Barringer
fdcc22bde9 Closes #4361 2014-12-24 09:02:03 -06:00
benmanley
118ba88d3d fix(tasks): improve UI consistency and layout 
* Match UI elements with rest of site
* Tidy up layout
 2014-12-24 09:53:41 +00:00
breiste
e1eaefa943 Fix #4296 (Subscription "Update Card" message is cut off) 2014-12-24 00:14:08 +01:00
Blade Barringer
84db289957 Merge branch 'develop' into add-flag-to-chat 2014-12-23 10:07:42 -06:00
Sabe Jones
833ff90a59 chore(news): Wonderland Bailey 1 2014-12-21 15:41:32 -06:00
Sabe Jones
bb89a10356 feat(event): Wintery Hair Colors 2014-12-21 13:58:47 -06:00
thehindenburg
1675bb26b2 change link in gala page to gala wiki 2014-12-19 07:47:28 -08:00
Blade Barringer
7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 
Conflicts:
	views/options/social/chat-message.jade
 2014-12-18 21:55:50 -06:00
Sabe Jones
8ff0a4a4a4 fix(seasonal): Leslie link 2014-12-17 18:27:37 -06:00
Sabe Jones
eadedd5897 Merge pull request #4383 from SabreCat/seasonal 
Seasonal Shop Basics
 2014-12-16 21:51:02 -06:00
Sabe Jones
dbe608bc3a fix(news): correct link and awkward image 2014-12-16 20:24:04 -06:00
Sabe Jones
58957118c0 chore(news): Bailey for Seasonal Shop 2014-12-16 20:18:55 -06:00
Tyler Renelle
2822ce233f fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231 2014-12-16 14:17:38 -07:00
Blade Barringer
d56eb1eeeb Added last guild link, corrected hall links 2014-12-14 20:10:42 -06:00
Blade Barringer
63c2248b38 Corrected guild links 2014-12-14 20:07:46 -06:00
Sabe Jones
071ac02ec2 chore(git): Resolve merge conflict 2014-12-14 14:55:37 -06:00
Sabe Jones
9f46e14cd6 fix(seasonal): missing bang 2014-12-14 14:18:57 -06:00
Sabe Jones
867f50b514 fix(seasonal): Add menu item 2014-12-14 14:12:20 -06:00
Sabe Jones
8cd1ea48db fix(I18N): Remove more hardcoded text 2014-12-14 14:10:39 -06:00
Sabe Jones
6dcbd329a5 fix(seasonal): Typo in string resource 2014-12-14 14:05:43 -06:00
Sabe Jones
7988dfcf82 fix(seasonal): Corrections for Shop 
Fix Jade indenting, add state control, add menu option
 2014-12-14 14:01:25 -06:00
Sabe Jones
29f693cd24 fix(I18N): Remove hardcoded text 2014-12-14 13:55:40 -06:00
Sabe Jones
506c396baf fix(I18N): Translate TT in menu 2014-12-14 13:53:00 -06:00
Sabe Jones
a98a685971 feat(seasonal): Seasonal Shop 
Initial commit of frontend for Seasonal Shop feature.
 2014-12-14 13:37:32 -06:00
Sabe Jones
35b02cfdd8 fix(I18N): Make Time Travel translatable 2014-12-14 12:59:45 -06:00
Sabe Jones
c287441cd9 Merge pull request #4378 from SabreCat/purchases 
Hide "2/locked" as appropriate
 2014-12-14 12:42:11 -06:00
Blade Barringer
dde3f5ffef Adjusted tooltip wrapping so it would only affect long titles 2014-12-14 12:18:59 -06:00
Blade Barringer
396176f14f Quest completion screen floats to right on everything but xs 2014-12-14 08:32:05 -06:00
Blade Barringer
41e1f4c75f Conditionally allow completed quest image to be centered if no 
completion text is present
 2014-12-14 08:13:50 -06:00
Blade Barringer
195a8a5ca3 Merge pull request #4375 from thehindenburg/questimage 
Quest image added in the completion screen
 2014-12-14 07:39:16 -06:00
Sabe Jones
e4df3435e1 fix(avatar): Correct "Facial Hair" text 
Adjusts the text style of "Facial Hair" header in Avatar shop to follow the same scheme as Hair. Before, the text was less header-like than elements under it.
 2014-12-13 16:07:58 -06:00
Sabe Jones
4ded747b88 fix(purchases): Correct hair path 
Fixes https://github.com/HabitRPG/habitrpg/issues/4312.
 2014-12-13 15:53:39 -06:00
Sabe Jones
4adf95feb6 fix(purchases): Hide "2/locked" as appropriate 2014-12-13 12:05:17 -06:00
Tyler Renelle
e1ea1a24c8 feat(challenges): optional checkbox on group create/edit: 
restrict challenge-creation to leader. Commented-out code for similar
setup for member invites, shouldn't be hard
 2014-12-12 11:37:00 -07:00
thehindenburg
2db80c6841 changed to style sheet 2014-12-12 10:26:55 -08:00
thehindenburg
375253fb84 changing the reward text to clear the image 2014-12-12 09:38:13 -08:00
thehindenburg
d70de5972e added the image to the end screen and made adjustments to the line 2014-12-11 22:28:07 -08:00
Blade Barringer
a95947b2dc Made reset flag count button red 2014-12-11 21:49:42 -06:00
Blade Barringer
dff7a74135 Made flag number more helpful 2014-12-11 21:47:06 -06:00
Blade Barringer
a0a4378465 Admin can see flag on own message 2014-12-11 21:44:58 -06:00
Blade Barringer
3c2319b63c Made it impossible to flag own message in inbox 2014-12-11 21:42:39 -06:00
Blade Barringer
c67da1804a Changed transparent class for admin to only appear if it is hidden 2014-12-11 21:40:25 -06:00
Blade Barringer
6b8280ccbb Adjusted spacing of chat buttons 2014-12-11 17:41:54 -06:00
Blade Barringer
38cd0e8de1 Added method for letting an admin unhide a flagged message 2014-12-11 17:29:01 -06:00
Blade Barringer
f9c00003f3 Moved ng-class so it would update transparent class in real time after flaggging 2014-12-11 13:38:57 -06:00
Blade Barringer
db1f24e7b4 Added note about how many flags a message has 2014-12-11 13:12:50 -06:00
Blade Barringer
c8c64a1b81 Allow admin to see messages that have been flagged more than twice, but 
make them semi-transparent
 2014-12-11 13:09:00 -06:00
Blade Barringer
1fb73b35ab Always show message if admin 2014-12-11 13:05:48 -06:00
Blade Barringer
4718641d3e Hide message if flag count is 2 or higher 2014-12-11 13:01:50 -06:00
Blade Barringer
d24f6ad1ac Converted sent transparency to ng-class instead of style 2014-12-11 12:45:25 -06:00
Blade Barringer
564677340c User can only flag message after accepting community guidelines 2014-12-11 10:29:12 -06:00
Blade Barringer
9bd0304223 Updated message preview on flag abuse modal to use markdown interpretation 2014-12-11 10:23:29 -06:00
Blade Barringer
0cf7bba822 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 2014-12-11 10:21:19 -06:00
Blade Barringer
e79126bf59 Merge pull request #4372 from thehindenburg/optoutspace 
added space in Jade to the arrow and opt out text in the inbox
 2014-12-10 15:51:38 -06:00
thehindenburg
799934c31b added space in Jade to the arrow and opt out text in the inbox 2014-12-10 12:31:09 -08:00
Blade Barringer
7fb1e69927 Changed inbox text to use an env.t var 2014-12-10 10:47:05 -06:00
Blade Barringer
4af70a2a0f Made invite button for guild invitations part of an input-group 2014-12-10 09:47:58 -06:00
Sabe Jones
dc034e4ab5 fix(quest): Add penguin to shop 2014-12-09 20:48:08 -06:00
Sabe Jones
2d9d8fe209 chore(Bailey): Announce Penguin 2014-12-09 20:20:17 -06:00
Blade Barringer
1511002a08 Fixed styling of invitation to guild page 2014-12-08 17:03:11 -06:00
Blade Barringer
5230883015 Adjusted styling of select box used for ordering party 2014-12-08 16:57:37 -06:00
Blade Barringer
2a3bd8a9cb No longer displays an extra popover that says true. Closes #4362 2014-12-08 12:44:37 -06:00
Blade Barringer
72fbe6a8a7 Removed yellow background from join public guild page 2014-12-07 20:58:42 -06:00
Blade Barringer
bd21c93b36 Fixed weirdness on create guild page. Elements were overflowing out of 
their boxes
 2014-12-07 20:52:49 -06:00
Blade Barringer
46cb38660e Fixed padding on challenges filter box 2014-12-07 20:20:42 -06:00
Matteo Pagliazzi
ae6e0255c6 feat(flag-message): add server methods 2014-12-07 14:35:09 +01:00
Blade Barringer
aafda2dad1 Added text of message to make sure user clicked the right flag 2014-12-07 13:50:47 +01:00
Blade Barringer
8537c96eb6 Converted heading to paragraph 2014-12-07 13:50:47 +01:00