sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 03:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1842 commits 1 branch 0 tags 1.6 GiB
Commit graph

638 commits

Author SHA1 Message Date
scribblypanda
ccb1c4cd99 split emailChange message into 3 parts 2015-01-11 13:18:39 -05:00
scribblypanda
faf69fca8d added new translatable strings, mailto link 2015-01-11 10:37:16 -05:00
scribblypanda
d9cb197d95 added new translatable string emailChange 2015-01-11 03:31:32 -05:00
scribblypanda
9aca62a53d added new translatable string emailChange 2015-01-11 03:21:53 -05:00
Alice Harris
27dab4ae4e Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-11 14:18:37 +10:00
Alice Harris
4e2a79e69c change G to Gem to remove confusion with Gold 2015-01-11 10:58:47 +10:00
Blade Barringer
a24fad40ca Removed unused pieces of text 2015-01-10 09:39:23 -06:00
Blade Barringer
83d91dfe34 Merged in changes from develop and re-ran grunt full 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	dist/spritesmith5.css
	dist/spritesmith5.png
 2015-01-10 09:33:52 -06:00
Blade Barringer
06a89f67d7 Added title to keys heading. Allows dynamic display of beast master and 
or mount master
 2015-01-10 08:25:43 -06:00
Sabe Jones
fde64b0bdf feat(event): World Boss 
Implements the 2015 Winter Wonderland world boss: the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:24:26 -06:00
Blade Barringer
8f90d154a0 Merge remote-tracking branch 'upstream/develop' into mountmaster 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
 2015-01-08 11:30:53 -06:00
Matteo Pagliazzi
f4b72c088f chore(i18n): add danish and update locales 2015-01-06 15:59:20 +01:00
scribblypanda
2718fd39e3 off-hand to shield-hand in gear.json and questsContent.json 2015-01-05 23:27:04 -05:00
Sabe Jones
285ff6228c fix(backgrounds): Frigid, not Snowy, Peak 2015-01-05 16:41:23 -06:00
Sabe Jones
0bfc5b37c0 feat(backgrounds): January backgrounds 2015-01-05 16:36:11 -06:00
Matteo Pagliazzi
a65c675243 chore(i18n): add hungarian and update locales 2015-01-05 17:31:26 +01:00
Blade Barringer
0053dd67bd Adjusted translation key text, added a new one for releasing both. Added 
releaseBoth function
 2015-01-02 13:20:58 -06:00
Matteo Pagliazzi
edbfc24b08 fix(i18n): remove duplicate strings cc @negue 2015-01-02 12:45:40 +01:00
Blade Barringer
fb25848035 Adjusted text to match beastmasterProgress 2015-01-01 17:05:20 -06:00
Blade Barringer
e613edbe3a Adjusted text to be more accurate 2015-01-01 16:53:09 -06:00
Blade Barringer
c0f51379e7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-01 16:25:56 -06:00
Blade Barringer
38a5dca58e Merge branch 'yearUpdate' of https://github.com/thehindenburg/habitrpg-shared into thehindenburg-yearUpdate 2015-01-01 15:37:55 -06:00
thehindenburg
74a871a8d2 add two years to winter gear 2014-12-31 17:46:06 -08:00
Blade Barringer
a5a7d22ce4 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster 2014-12-31 13:17:21 -06:00
Matteo Pagliazzi
c3283483e3 chore(i18n): update locales 2014-12-31 13:35:49 +01:00
Sabe Jones
8fabcc4ffd Merge pull request #425 from SabreCat/nye 
New Year's event features
 2014-12-30 22:17:23 -06:00
Sabe Jones
dd3ec20e5e feat(NYE): Silly Party Hat 2014-12-30 21:20:07 -06:00
Sabe Jones
7a16c644c3 fix(NYE): I18N for random text 2014-12-30 20:51:40 -06:00
Sabe Jones
5623fb0078 fix(NYE): I18N shop text 2014-12-30 20:14:56 -06:00
Blade Barringer
53a18dbcac Added in last logged in string for sorting 2014-12-30 13:06:10 -06:00
Blade Barringer
3b8a686368 Added new strings 2014-12-30 12:40:08 -06:00
Blade Barringer
23de3eeff8 Corrected grammar to use a ; in stead of a , 2014-12-30 06:44:10 -06:00
Blade Barringer
3b5a2f925e Removed unused translation string 2014-12-30 06:36:29 -06:00
Sabe Jones
9e74d94e48 WIP(NYE): New Year's Cards 2014-12-29 20:57:12 -06:00
Matteo Pagliazzi
e93754e50b Merge pull request #414 from Verabird/dateformat 
Dateformat
 2014-12-29 21:23:29 +01:00
Alice Harris
ba9a10f688 Merge pull request #408 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:46:32 +10:00
Verabird
baa528fe7b Add dateFormat phrase for translation 2014-12-26 15:48:20 -05:00
Verabird
a3f0d4dea5 Add default values for shortdate and mediumdate formats 2014-12-26 15:48:19 -05:00
Matteo Pagliazzi
971ea8a495 chore(i18n): update locales 2014-12-26 11:33:21 +01:00
Sabe Jones
620fcd1144 Merge pull request #413 from SabreCat/seasonal 
Winter Wonderland 2015 Cont'd
 2014-12-25 17:48:12 -06:00
Alice Harris
5836436b7b Merge pull request #404 from Alys/develop 
Style Guide for Equipment Descriptions
 2014-12-26 08:26:20 +10:00
Sabe Jones
9471393776 feat(event): 2014 Mystery Items 2014-12-25 16:08:06 -06:00
Sabe Jones
41f4ab7b8a feat(event): Implement Seasonal Shop 2014-12-25 14:58:25 -06:00
Alice Harris
6fcf6b7d05 Merge pull request #412 from lacrimae/develop 
Restored missing quote
 2014-12-26 06:47:14 +10:00
lacrimae
93119d7eab ... and the quote I missed :P 2014-12-25 21:41:11 +01:00
lacrimae
772994c8a0 Restored missing quote 2014-12-25 21:40:24 +01:00
Blade Barringer
aeceb70b54 Merge pull request #411 from lacrimae/develop 
Corrected wording
 2014-12-25 08:35:06 -06:00
lacrimae
17233ef5df Corrected wording 
"may become grow more severe" -> "may grow more severe"
 2014-12-25 15:21:29 +01:00
Steffen Breiler
e33101b762 Fix #4296 (Subscription "Update Card" message is cut off) 2014-12-24 00:06:17 +01:00
thehindenburg
0dfa770fe4 update winter 2013 to winter 2014 to satisfy new naming conventions 2014-12-22 21:13:59 -08:00
Alice Harris
d34b116732 update formatting for gear style guidelines 2014-12-23 06:43:05 +10:00
Alice Harris
d6354007f1 update formatting for gear style guidelines 2014-12-23 06:42:10 +10:00
Alice Harris
9d7bf26988 update formatting for gear style guidelines 2014-12-23 06:38:21 +10:00
Alice Harris
36a552b4a3 update formatting for gear style guidelines 2014-12-23 06:34:57 +10:00
Alice Harris
e30ff2eebb create style guide for gear/equipment descriptions based on ShilohT's suggestions in https://github.com/HabitRPG/habitrpg-shared/pull/372 2014-12-23 06:28:34 +10:00
Blade Barringer
6f410f59ce Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into add-flag-to-chat 2014-12-22 13:28:01 -06:00
Matteo Pagliazzi
d079ebbee9 chore(i18n): update locales 2014-12-22 20:09:45 +01:00
Sabe Jones
649e207769 Merge pull request #402 from SabreCat/winter2015/hair 
Wintery Hair Colors for Wonderland 2015
 2014-12-21 15:16:10 -06:00
Sabe Jones
d0a97fb20f feat(event): Wintery Hair Colors 
Also removes an accidental duplication of a prior hair resource.
 2014-12-21 13:55:23 -06:00
Sabe Jones
8ec9f79188 feat(event): Winter Wonderland 2015 gear 2014-12-21 12:37:37 -06:00
Blade Barringer
eeff8a80d6 Brought in groups.json from original branch 2014-12-18 22:01:52 -06:00
Matteo Pagliazzi
486d8a9bbf chore(i18n): update locales 2014-12-18 22:56:34 +01:00
James Leonis
c308f6cf9f Incorrect grammar in Vice 2 quest notes 
"makes it's way to Mt. Habitica" to "makes its way to Mt. Habitica"
 2014-12-18 01:01:18 -08:00
Sabe Jones
6e77392e7a fix(seasonal): Leslie link 2014-12-17 18:26:52 -06:00
Sabe Jones
cbfd043b2c Merge pull request #394 from SabreCat/seasonal 
Seasonal Shop Basics
 2014-12-16 21:52:28 -06:00
Tyler Renelle
059f719461 Merge pull request #231 from wc8/patch-1 
innText update of groups.json to call username
 2014-12-16 14:16:26 -07:00
Sabe Jones
c7ee171ee4 feat(seasonal): Seasonal shop 
Initial commit of resources for the Seasonal Shop feature.
 2014-12-14 13:33:10 -06:00
Sabe Jones
8d042745be fix(I18N): Translate Time Travelers 2014-12-14 12:57:36 -06:00
lacrimae
ff8a508860 Streamlined "Confers no benefit" placements 2014-12-14 13:32:44 +01:00
lacrimae
a15c57c275 Accidentally a dash 2014-12-13 00:15:46 +01:00
lacrimae
63263bbf3a Spells now mention which attribute they affect 
https://github.com/HabitRPG/habitrpg-shared/issues/380
 2014-12-13 00:15:46 +01:00
Blade Barringer
3c3d73e15a Added strings for beast/mount master progress 2014-12-11 10:09:44 -06:00
Blade Barringer
324077566b Merge branch 'mountmaster' of https://github.com/taldin/habitrpg-shared into taldin-mountmaster 
Conflicts:
	script/content.coffee
 2014-12-11 08:31:19 -06:00
Blade Barringer
d2e5f60dd4 Added inbox as a env.t var 2014-12-10 10:46:36 -06:00
Sabe Jones
5cd6c02e8a fix(quest): Dapper to perspicacious 2014-12-09 20:56:38 -06:00
Sabe Jones
7fd4cebbdc fix(quest): Penguin corrections 
Fix missing egg item and line breaks in quest text
 2014-12-09 20:44:10 -06:00
Sabe Jones
d25455fa5a feat(quest): Implement Penguin pet quest 2014-12-09 20:21:20 -06:00
Paul Klipp
3d2c7e8854 Fixed a grammar error in the Golden Knight 2 quest 
Changed “Perhaps I will shall . . . “ to “Perhaps I will . . . “
 2014-12-08 12:19:08 -06:00
Blade Barringer
6739ec25a3 Merge pull request #379 from andymantell/feature/linking-timetravellers-names 
Link for Tyler and Vicky's names
 2014-12-06 16:48:00 -06:00
Matteo Pagliazzi
17f9d4de72 fix(i18n): fix english string 2014-12-06 19:18:28 +01:00
Andy Mantell
82cea43e07 Link for Tyler and Vicky's names 2014-12-06 15:42:32 +00:00
Matteo Pagliazzi
f010bd7ad9 chore(i18n): update locales 2014-12-05 16:21:13 +01:00
Matteo Pagliazzi
198d41d5e8 fix(pr): conflicts 2014-12-05 16:06:15 +01:00
Blade Barringer
6dac81f850 Corrected strings so they only used on variable 2014-12-04 20:03:17 -06:00
Sabe Jones
6369934ca3 feat(Gems): Add strings for Market gem 2014-12-04 19:04:07 -06:00
Blade Barringer
a55fa37412 Converted strings to be able to use links 2014-12-03 22:46:41 -06:00
Blade Barringer
2e2faa6117 Moved pre-subscription time travelers title and popover to shared 2014-12-03 22:24:43 -06:00
Blade Barringer
87092e8109 Added mystic hourglass and time travelers screens 2014-12-03 22:19:33 -06:00
Tyler Renelle
78a4edb38a i18n(plans): update wording cc @Alys 2014-12-03 19:14:27 -07:00
Tyler Renelle
d81badde69 feat(plans): add time traveler - buy individual mystery items 2014-12-03 15:24:08 -07:00
Sabe Jones
4d8a9c5287 feat(backgrounds): December purchasables 2014-11-30 22:54:37 -06:00
Matteo Pagliazzi
f7c6e9063b chore(i18n): update locales 2014-11-30 21:59:49 +01:00
Matteo Pagliazzi
aa6afcdce8 chore(i18n): update locales 2014-11-30 20:21:59 +01:00
Tyler Renelle
5ee9f4904a Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop 
Conflicts:
	locales/en/gear.json
 2014-11-29 08:26:23 -07:00
ShilohT
a86b92f5a0 Standardized text in gear.json 
Added "Confers no benefit." if missing.
Added "(Month) 2014 Subscriber Item." if missing.
Rearranged some Mystery Item notes from "(Description). (Month) 2014
Subscriber Item. Confers no benefit." to "(Description). Confers no
benefit. (Month) 2014 Subscriber Item."
- All Special Event accessory notes are written in this order.
Changed "October 2014 Subscriber Outfit" to "October 2014 Subscriber
Item".
- All other preexisting Mystery Item strings read "Item".
Changed "Adds # points to (Stat)" in some Special Event equipment to
"Increases (Stat) by #"
- All other equipment reads "Increases (Stat) by #."
Changed "Confers no stat bonus." to "Confers no benefit." in some
Special Event accessories.
- All other items read "Confers no benefit."
Moved "Limited Edition 2013 Winter Gear." to end of string.
- All other Limited Edition tags are at the end.
Changed and capitalized "Special edition convention armor." to "Special
Edition Convention Item."
- Armor is a type of equipment.
 2014-11-26 23:26:30 -05:00
Tyler Renelle
22cddb1086 feat(mystery): mystery 201411 2014-11-24 19:34:47 -07:00
Tyler Renelle
04b8e889f3 Merge branch 'crookedneighbor-add-quick-reply-string' into develop 
Conflicts:
	locales/en/groups.json
 2014-11-24 18:11:18 -07:00
Blade Barringer
801521df98 Added message sent note string 2014-11-23 21:39:36 -06:00
Blade Barringer
66e68a5814 Added additional strings for pm modal 2014-11-23 21:33:41 -06:00
Blade Barringer
6b859fa11b Added additional translation strings for pms 2014-11-23 21:20:27 -06:00