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

2466 commits

Author SHA1 Message Date
Negue
b3ccdc2859 change markdown ngModel to text attribute 2015-01-01 20:57:57 +01:00
Blade Barringer
5d958b1456 Adjusted styles for snowball and spookDust so they would align like the coins 2014-12-31 09:31:56 -06:00
Sabe Jones
ccfe48099f fix(NYE): fix cards 
Improve random messages and have Bailey give instruction on where to find cards.
 2014-12-30 23:25:34 -06:00
Sabe Jones
438516b26f fix(NYE): Correct achievement badge 2014-12-30 22:56:40 -06:00
Sabe Jones
d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -06:00
Sabe Jones
230482c578 chore(news): Bailey 2014-12-30 21:58:15 -06:00
Tyler Renelle
edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones
e35722865a fix(NYE): I18N for random text 2014-12-30 20:52:06 -06:00
Sabe Jones
51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -06:00
Blade Barringer
303d30a270 Merge pull request #4439 from crookedneighbor/transparent-gems 
Added transparent class to gem purchasing if zero gems are available for purchase
 2014-12-30 11:11:32 -06:00
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
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