 Blade Barringer
|
6a7d84b842
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop
|
2015-01-18 21:24:28 -06:00 |
|
|
Blade Barringer
|
8b864e114b
|
Compiled spritesheets
|
2015-01-18 21:11:49 -06:00 |
|
|
Blade Barringer
|
86c7203170
|
Added rock mounts
|
2015-01-18 21:11:41 -06:00 |
|
|
Blade Barringer
|
511b4a1b0b
|
Added pet rocks
|
2015-01-18 20:34:12 -06:00 |
|
|
Alice Harris
|
9b9b70b7d4
|
change "level" to "tier"; remove incorrect number of gems
|
2015-01-19 11:24:42 +10:00 |
|
|
Blade Barringer
|
5a11dea855
|
Merge pull request #4529 from HabitRPG/triad-bingo
Triad bingo
|
2015-01-18 19:12:28 -06:00 |
|
|
Blade Barringer
|
e22269fd61
|
Merge pull request #442 from HabitRPG/triad-bingo
Triad bingo
|
2015-01-18 19:12:18 -06:00 |
|
|
Blade Barringer
|
69c9c12969
|
Updated keys to kennel info for triad bingo
|
2015-01-18 19:10:50 -06:00 |
|
|
Blade Barringer
|
418f54a32d
|
Added rock pet egg
|
2015-01-18 18:38:56 -06:00 |
|
|
Blade Barringer
|
0bb9aa9f56
|
Added rock quest boss
|
2015-01-18 18:30:54 -06:00 |
|
|
Blade Barringer
|
3bed7d8153
|
Added january mystery items
|
2015-01-18 18:25:25 -06:00 |
|
|
Blade Barringer
|
c13f6b15a1
|
Added feb background images
|
2015-01-18 18:12:45 -06:00 |
|
|
Tyler Renelle
|
bb78b121da
|
revert part of a053486, angular is madeningly inconsistent with this bug
|
2015-01-18 16:38:31 -07:00 |
|
|
Blade Barringer
|
7c10d27c04
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2015-01-18 15:56:11 -06:00 |
|
|
Blade Barringer
|
505a0c4ce9
|
Merge branch 'scribblypanda-issue4468' into develop
|
2015-01-18 15:55:49 -06:00 |
|
|
Blade Barringer
|
137ff71bc8
|
Added one way binding for email
|
2015-01-18 15:55:39 -06:00 |
|
|
Blade Barringer
|
13e89f1947
|
Added sync after changing username so username would update
|
2015-01-18 15:55:39 -06:00 |
|
|
Blade Barringer
|
e0a081b0ff
|
Adjusted spacing and line breaks
|
2015-01-18 15:55:39 -06:00 |
|
|
Blade Barringer
|
cdad6e36da
|
Adjusted some spacing and line breaks
|
2015-01-18 15:55:39 -06:00 |
|
|
Blade Barringer
|
4a5fe1867d
|
Removed target="_blank" attribute from mailto link
|
2015-01-18 15:55:39 -06:00 |
|
|
scribblypanda
|
b3c9371d9f
|
changed links to relative, corrected mailto link
|
2015-01-18 15:55:39 -06:00 |
|
|
scribblypanda
|
1c151f57c2
|
applied .muted to text so less cluttered looking
|
2015-01-18 15:55:39 -06:00 |
|
|
scribblypanda
|
b978852e11
|
added description of login name and link to page to edit display name
|
2015-01-18 15:55:39 -06:00 |
|
|
scribblypanda
|
ae90889dec
|
added description of display name and link to page to edit login name
|
2015-01-18 15:55:39 -06:00 |
|
|
scribblypanda
|
18317f3346
|
fixed emailChange message, displays properly on localhost
|
2015-01-18 15:55:39 -06:00 |
|
|
scribblypanda
|
5a4ebda187
|
plain text to translatable strings
|
2015-01-18 15:55:39 -06:00 |
|
|
scribblypanda
|
c4113994e6
|
plain text to translatable strings
|
2015-01-18 15:55:38 -06:00 |
|
|
scribblypanda
|
330a9191a5
|
added new translatable string emailChange
|
2015-01-18 15:55:38 -06:00 |
|
|
scribblypanda
|
7c990ba109
|
changed Username to Login Name
|
2015-01-18 15:55:38 -06:00 |
|
|
Tyler Renelle
|
a44e0f7c31
|
fix(avatar-sharing): screw it, 1.3.3 backwards compat isn't working at
the router level anyway. Besides, avatar sharing hasn't worked via
addthis for a while, so we don't need this
|
2015-01-18 14:53:18 -07:00 |
|
|
Tyler Renelle
|
a053486fcd
|
fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x
bug. Also, anon wasn't able to view avatar shares!
|
2015-01-18 14:51:40 -07:00 |
|
|
Blade Barringer
|
5026e67ead
|
Added one way binding for email
|
2015-01-18 15:51:00 -06:00 |
|
|
Blade Barringer
|
62c9aafb7d
|
Added sync after changing username so username would update
|
2015-01-18 15:50:43 -06:00 |
|
|
Blade Barringer
|
c4c2c6a1dc
|
Adjusted spacing and line breaks
|
2015-01-18 15:39:45 -06:00 |
|
|
Blade Barringer
|
ad612a9c36
|
Adjusted some spacing and line breaks
|
2015-01-18 15:38:16 -06:00 |
|
|
Blade Barringer
|
801a5a957a
|
Removed target="_blank" attribute from mailto link
|
2015-01-18 15:33:58 -06:00 |
|
|
Blade Barringer
|
e7cb3f58e9
|
Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg-shared into scribblypanda-issue4468
|
2015-01-18 15:24:48 -06:00 |
|
|
Blade Barringer
|
a2d6ed83a1
|
Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg into scribblypanda-issue4468
|
2015-01-18 15:23:52 -06:00 |
|
|
Blade Barringer
|
6c9c2a5ec1
|
Merge pull request #445 from j-wilkins/patch-1
fix typo in README.md
|
2015-01-18 12:00:15 -06:00 |
|
|
Jake Wilkins
|
d6a7fa0d2c
|
s/migraring/migrating
|
2015-01-18 10:35:03 -07:00 |
|
|
Tyler Renelle
|
7b753e7543
|
Merge pull request #4533 from HabitRPG/lefnire/one-module
Move to a single "habitrpg" module for services / directives / filters
|
2015-01-17 19:08:41 -07:00 |
|
|
Tyler Renelle
|
436e8b5622
|
Merge pull request #444 from HabitRPG/lefnire/one-module
Move to a single "habitrpg" module for services / directives / filters
|
2015-01-17 19:08:21 -07:00 |
|
|
Tyler Renelle
|
503fd9ff51
|
refactor(services): remove un-used authService, cleanup authCtrl
|
2015-01-17 18:59:28 -07:00 |
|
|
Tyler Renelle
|
2306b7c572
|
refactor(services): move to a single "habitrpg" module for services /
directives / filters
|
2015-01-17 18:43:37 -07:00 |
|
|
Tyler Renelle
|
81bdb2481c
|
refactor(services): move to a single "habitrpg" module for services /
directives / filters
|
2015-01-17 18:42:01 -07:00 |
|
|
Blade Barringer
|
f64bc5b2ed
|
Removed if that would hide the triad bingo achievement until mount
master attained
|
2015-01-17 09:54:16 -06:00 |
|
|
Blade Barringer
|
373d5a5b64
|
Merge branch 'mountmaster' into triad-bingo
|
2015-01-17 09:53:56 -06:00 |
|
|
Blade Barringer
|
3d904f18b9
|
Allowed mountMaster achievement to always be shown
|
2015-01-17 09:53:28 -06:00 |
|
|
Alice Harris
|
6a5210d3ad
|
fix(plans): when gifting subscription, set plan.dateUpdated so it can roll gemCapExtra next month. Fixes #4480. Removes datedUpdated from previous version of fix.
|
2015-01-17 16:45:55 +10:00 |
|
|
Blade Barringer
|
2efadf7381
|
Removed white space on t-rex iamges closes #4531
|
2015-01-16 22:33:06 -06:00 |
|