 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 |
|
|
Alice Harris
|
8401790017
|
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
Conflicts:
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
locales/cs/gear.json
locales/de/gear.json
locales/de/generic.json
locales/de/subscriber.json
locales/es/communityguidelines.json
locales/es/gear.json
locales/es/generic.json
locales/es_419/communityguidelines.json
locales/es_419/gear.json
locales/es_419/generic.json
locales/es_419/questscontent.json
locales/fr/gear.json
locales/fr/generic.json
locales/fr/limited.json
locales/hu/backgrounds.json
locales/hu/communityguidelines.json
locales/hu/content.json
locales/hu/front.json
locales/hu/gear.json
locales/hu/generic.json
locales/hu/groups.json
locales/hu/limited.json
locales/hu/messages.json
locales/hu/npc.json
locales/hu/pets.json
locales/hu/questscontent.json
locales/hu/subscriber.json
locales/hu/tasks.json
locales/it/gear.json
locales/it/generic.json
locales/it/groups.json
locales/it/limited.json
locales/it/subscriber.json
locales/nl/gear.json
locales/nl/limited.json
locales/nl/questscontent.json
locales/pl/gear.json
locales/pl/limited.json
locales/pl/subscriber.json
locales/pt/gear.json
locales/ro/gear.json
locales/ru/gear.json
locales/ru/limited.json
script/content.coffee
|
2015-01-18 15:46:25 +10: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 |
|
|
Blade Barringer
|
f5e9568cef
|
Consolidated calcTriadBingo function
|
2015-01-16 21:33:58 -06:00 |
|
|
Tyler Renelle
|
465bfe4df9
|
Merge pull request #443 from HabitRPG/lefnire/httpinterceptor
move httpInterceptor from app.js to habitrpg-shared/config.js
|
2015-01-16 18:32:52 -07:00 |
|
|
Tyler Renelle
|
f71737a84c
|
Merge pull request #4530 from HabitRPG/lefnire/httpinterceptor
move httpInterceptor from website/app.js to habitrpg-shared/config.js
|
2015-01-16 18:32:45 -07:00 |
|
|
Tyler Renelle
|
dbeb6f8c1e
|
refactor(config): add mobile
|
2015-01-16 18:31:37 -07:00 |
|
|
Tyler Renelle
|
90c7142da5
|
refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js.
|
2015-01-16 16:48:53 -07:00 |
|
|
Tyler Renelle
|
6b6802a27a
|
refactor(config): move httpInterceptor from website/app.js to
habitrpg-shared/config.js. Will merge in mobile soon
|
2015-01-16 16:48:35 -07:00 |
|
|
Blade Barringer
|
75971b0f40
|
Added triad bingo check to releaseBoth function
|
2015-01-16 17:01:01 -06:00 |
|
|
Blade Barringer
|
8b1ba48bfe
|
Merge branch 'mountmaster' into triad-bingo
|
2015-01-16 16:53:35 -06:00 |
|
|
Blade Barringer
|
d9fed69147
|
Corrected releasBoth function to reset current pet and deduct the
correct amount of gems
|
2015-01-16 16:52:59 -06:00 |
|
|
Blade Barringer
|
e25472759a
|
Added triad bingo achievment
|
2015-01-16 16:43:48 -06:00 |
|
|
Blade Barringer
|
7860819ee3
|
Added shell for awarding triad bingo
|
2015-01-16 12:27:51 -06:00 |
|