Commit graph

1442 commits

Author SHA1 Message Date
Alice Harris
5b9f79eab2 rename Habit tabs to make them shorter (Weak/Strong instead of Struggling/On Track) - https://github.com/HabitRPG/habitrpg/pull/4167#issuecomment-61394775 2014-11-09 09:09:38 +10:00
Alice Harris
6f4eebb348 Merge pull request #354 from Alys/beeminderDeleteWarning-2014-11-06
add warning text for Beeminder users about deleting To-Dos
2014-11-07 19:31:26 +10:00
Tyler Renelle
8120d69d05 feat(halloween): costume contest badges 2014-11-06 16:21:52 -07:00
Tyler Renelle
d043048d28 deleted facebook.jpeg, now using zocial (see HabitRPG/habitrpg#6304dd2) 2014-11-06 16:21:09 -07:00
Alice Harris
a34beb7686 add warning text for Beeminder users about deleting To-Dos 2014-11-06 12:24:27 +10:00
Tyler Renelle
c53e6a23cf feat(backgrounds): add new backgrounds 2014-11-04 19:45:42 -07:00
Matteo Pagliazzi
28668bea8c Merge pull request #352 from Alys/commGuide-translation-fix-2014-11-04
merge strings to ease translations
2014-11-04 19:15:13 +01:00
Alice Harris
cad04b376a merge strings to ease translations 2014-11-04 16:44:15 +10:00
Matteo Pagliazzi
2ac9cd037c chore(i18n): add communityGuidelines translations 2014-11-03 20:28:18 +01:00
Matteo Pagliazzi
e788872932 fix typo in previous commit 2014-11-03 19:55:10 +01:00
Matteo Pagliazzi
e692b4b392 do not allow user to revive if not dead, fixes HabitRPG/habitrpg#3599 2014-11-03 19:53:27 +01:00
Matteo Pagliazzi
7e573bc877 chore(i18n): update locales, add pirate english 2014-11-03 19:29:01 +01:00
Tyler Renelle
3fc4978176 feat(fall): back to default npcs 2014-11-02 23:10:48 -07:00
Tyler Renelle
1151002dd6 feat(fall): disable candy drops 2014-11-02 17:02:09 -07:00
Tyler Renelle
8932db4cc9 feat(mystery): update box 2014-11-01 13:29:29 -06:00
Tyler Renelle
3132bbcb41 feat(fall): back to fall npcs 2014-11-01 13:28:32 -06:00
Tyler Renelle
44aa1209cd Merge pull request #351 from spacetime/develop
Added space before "target=" when added to href
2014-11-01 13:06:58 -06:00
Rishab Arora
a772c6dd8f Added space before "target=" when added to href
Fixes bug where the first links in markdown boxes don't work
2014-11-01 23:04:00 +05:30
Tyler Renelle
6f3c855db0 feat(halloween): halloween sprites 2014-10-31 13:05:22 -06:00
Tyler Renelle
5e594b3197 Merge pull request #339 from negue/chat_mentions
highlight the current username
2014-10-29 14:35:49 -06:00
Tyler Renelle
f9249ff488 Merge pull request #338 from gjoyner/languages
The language file for the Forgot Password fix
2014-10-29 14:30:06 -06:00
Tyler Renelle
c0a53740c4 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:19:14 -06:00
Alice Harris
9de41cd259 Merge pull request #347 from Alys/task-column-Habits-Rewards-tabs
new tabs for Habits and Rewards columns on task page
2014-10-27 18:46:13 +10:00
Alice Harris
c156aaadee add compiled file 2014-10-27 18:39:33 +10:00
Alice Harris
59fd7e92ba improve labels for Habit tags 2014-10-27 18:32:51 +10:00
Alice Harris
44ee614427 add text for tabs for Habits and Rewards columns on task page 2014-10-27 18:32:14 +10:00
Matteo Pagliazzi
b552a6762d Merge pull request #345 from Omnomnobot/patch-3
Fixed a typo (youself -> yourself)
2014-10-26 12:44:24 +01:00
Matteo Pagliazzi
f63d2bf309 chore(i18n): update locales 2014-10-26 13:42:16 +01:00
Tyler Renelle
5c1b7d245d Merge branch 'Alys-communityGuidelines' into develop
Conflicts:
	dist/habitrpg-shared.js
	locales/en/generic.json
2014-10-25 16:19:22 -06:00
Tyler Renelle
d6b41fd63f fix(mystery): typo 2014-10-24 20:37:50 -06:00
Tyler Renelle
3c249725af feat(mystery): mystery items 2014-10 2014-10-24 20:32:40 -06:00
Tyler Renelle
2f8a8d4874 Merge pull request #346 from taldin/develop
Fix possible bug when losing Jean Chalard's tunic
2014-10-24 17:09:24 -06:00
Taldin
bffce00a24 Fix possible bug when losing Jean Chalard's tunic
Can't buy back armor_special_2 without being a backer.   Other legendary
quest items have this extra code.
2014-10-24 13:24:09 -07:00
Tyler Renelle
1e441d6fcd feat(gear): add broad & slim for armor_special_2 2014-10-23 10:53:55 -06:00
Tyler Renelle
d3ca101dd8 feat(quests): add moonstone chain, lvl drop at 60 2014-10-23 10:33:20 -06:00
Omnomnobot
f95f85b380 Fixed a typo (youself -> yourself) 2014-10-23 17:19:51 +02:00
Alice Harris
d0aafcd8af Merge pull request #344 from crookedneighbor/add-at-to-arcosine
Added @ symbol to arcosine
2014-10-22 04:07:31 +10:00
Alice Harris
4b0805c393 Merge pull request #341 from crookedneighbor/fixPopoverGlitch
Shortened title so popover glitch would be fixed
2014-10-22 04:06:10 +10:00
Blade Barringer
a4c4b73997 Removed completion completion text 2014-10-21 11:11:00 -05:00
Blade Barringer
899afd9958 Added @ symbol to arcosine 2014-10-21 11:08:43 -05:00
Alice Harris
633b7f3e29 Merge pull request #340 from crookedneighbor/due-setting
Add option in settings to make due tab the default view
2014-10-20 05:33:55 +10:00
Matteo Pagliazzi
3edd4e970e chore(i18n): update locales 2014-10-19 12:45:50 +02:00
Blade Barringer
7c2329e156 Shortened title so popover glitch would be fixed 2014-10-17 11:23:39 -05:00
Blade Barringer
741b61d61e Corrected casing to match the site 2014-10-16 21:06:22 -05:00
Blade Barringer
6d268cd697 Added missing comma 2014-10-16 20:24:47 -05:00
Blade Barringer
ab0cdce119 Added key value pairs for making due a default 2014-10-16 19:46:22 -05:00
Alice Harris
1460a7e9c2 For spider quest changed "lay webs" to "lacy webs" 2014-10-16 14:02:56 +10:00
Negue
4698ab81a1 highlight the current username 2014-10-15 20:12:54 +02:00
gjoyner
b983ef5a35 The language file for the Forgot Password fix 2014-10-14 01:33:14 -07:00
Tyler Renelle
11761f9ee2 feat(quests): spider quest 2014-10-12 19:29:18 -06:00