Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,193 Commits 64 Branches 1,256 Tags
e966de7bf0fd0f4eecff7ace286d4863565bbd7b
Commit Graph

9193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alice Harris 86c25085fc Merge remote-tracking branch 'upstream/develop' into fix-chat-visibility-2015-01-13 2015-01-13 07:53:52 +10:00
Alice Harris 0bd22e7c77 disallow fetching of chat messages 2015-01-13 06:10:46 +10:00
Blade Barringer f1e354ba0e Added string for both beast master and mount master 2015-01-12 13:12:50 -06:00
Blade Barringer 1557907a1c Updated string names 2015-01-12 13:12:40 -06:00
Blade Barringer 1fd068ae89 Corrected capitalization 2015-01-12 13:09:51 -06:00
Blade Barringer c7d8c40b0b Updated strings to use master instead of abreviated mast 2015-01-12 12:58:55 -06:00
Tyler Renelle ca2d45113c fix(billing): script to fix current_period_end, see #4420 2015-01-12 11:50:46 -07:00
scribblypanda 45ae1ec7d6 changed display name description to be consistent with login name description 2015-01-11 20:31:52 -05:00
scribblypanda 8e3e66dc08 added description of login name and link to page to edit display name 2015-01-11 20:30:25 -05:00
scribblypanda 6c99bbc948 added translatable strings for login name description 2015-01-11 20:29:36 -05:00
scribblypanda a505d88452 added translatable strings for display name description 2015-01-11 20:17:36 -05:00
scribblypanda 393ef6b1f4 added description of display name and link to page to edit login name 2015-01-11 20:17:05 -05:00
Blade Barringer b4a62d76b7 Corrected beastmaster to beast master 2015-01-11 18:28:50 -06:00
Blade Barringer 995daee88d Corrected camel casing of beastMaster and mountMaster 2015-01-11 18:27:04 -06:00
Blade Barringer a72ae097d6 Corrected how count is calculated 2015-01-11 18:23:27 -06:00
Blade Barringer f6885427a8 Corrected Beast Master and Mount Master count so it would be accurate. 2015-01-11 17:24:01 -06:00
Blade Barringer 11f20555c4 Corrected stats page to show profile data instead of user data 2015-01-11 17:23:30 -06:00
scribblypanda ccb1c4cd99 split emailChange message into 3 parts 2015-01-11 13:18:39 -05:00
scribblypanda 684c6a997d fixed emailChange message, displays properly on localhost 2015-01-11 13:18:00 -05:00
scribblypanda faf69fca8d added new translatable strings, mailto link 2015-01-11 10:37:16 -05:00
scribblypanda d560bacd32 plain text to translatable strings 2015-01-11 10:36:14 -05:00
scribblypanda 9907379a60 plain text to translatable strings 2015-01-11 10:22:24 -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
scribblypanda 998fe684e4 added new translatable string emailChange 2015-01-11 03:20:22 -05:00
scribblypanda c3fce5fcba changed Username to Login Name 2015-01-11 01:18:37 -05:00
Alice Harris 7b9514dc5d fix final bit of conflict 2015-01-11 14:54:41 +10: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 7660141365 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 
Conflicts:
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2015-01-11 14:15:55 +10:00
Alice Harris 9e9b5dbb20 Merge pull request #433 from Verabird/BuffSkillsAgain 
Buffed some healer and warrior spells.
 2015-01-11 12:04:10 +10:00
Alice Harris b0fc2a8e7c Merge pull request #434 from Alys/develop 
change G to Gem to remove confusion with Gold
 2015-01-11 11:06:48 +10:00
Alice Harris 4e2a79e69c change G to Gem to remove confusion with Gold 2015-01-11 10:58:47 +10:00
Blade Barringer c9f5113daa Merge pull request #4486 from kangabell/spell-active-highlight 
Give greater indication to which spell is currently being cast.
 2015-01-10 11:59:35 -06:00
K. Belardinelli 22446a5ddb apply active class to special spells too 2015-01-10 11:06:39 -05:00
Blade Barringer 09c3b643bd Removed comment because bug was fixed 2015-01-10 09:54:49 -06:00
Blade Barringer 1e11947c9e Removed unnecessary comment 2015-01-10 09:52:51 -06:00
Blade Barringer 819ab0b6e1 Added updated mountCount to releaseBoth function 2015-01-10 09:52:09 -06:00
Blade Barringer a24fad40ca Removed unused pieces of text 2015-01-10 09:39:23 -06:00
Blade Barringer 1c0520c94d Removed link to picture of all pets, since it is now inaccurate and 
there is no corresponding one for mounts
 2015-01-10 09:38:03 -06:00
K Bell d6dc2119cb add active class to spell item when it is selected 2015-01-10 10:36:00 -05:00
K Bell 0f2adcad14 highlight spell item when it has class of 'active' 2015-01-10 10:35:27 -05: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 2b20c52a8d Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-10 09:25:18 -06:00
Blade Barringer 0f3d6bc751 Explicitly reset mountCount to 0. (Otherwise, will not reset until refresh) 2015-01-10 09:24:30 -06:00
Blade Barringer a5d6c9de3f Force update of mountCount after feedling 2015-01-10 09:22:53 -06:00
Blade Barringer d5436dc8ec Corrected release mounts code 2015-01-10 09:13:25 -06:00
Blade Barringer c6ef4b52ab The inventory controllers watch on mounts was creating an inaccurate count (was counting quest and special mounts) 2015-01-10 09:03:59 -06:00
Blade Barringer 7f20ca7d8b Made title dynamic 2015-01-10 08:26:11 -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
Blade Barringer 38f7c1e634 Closes #4490. Day start saves on blur instead of change 2015-01-09 19:10:10 -06:00