Blade Barringer
eceaaef954
Merge pull request #4567 from crookedneighbor/add-audio-watts
...
Added Watts' Theme to Audio Choices
2015-01-26 11:27:27 -06:00
Sabe Jones
65af7f362e
Merge branch 'scrolls' into develop
...
Conflicts:
views/shared/new-stuff.jade
2015-01-26 11:18:48 -06:00
Sabe Jones
ad08f1be9a
fix(news): Errant parenthesis
2015-01-26 11:11:04 -06:00
Sabe Jones
524761f1cf
feat(mystery): January subscriber set
2015-01-26 11:00:02 -06:00
Blade Barringer
de59c76609
Added watts themes to audio choices
2015-01-23 14:53:30 -06:00
Sabe Jones
412417505f
feat(quests): Differentiated scrolls
...
Implements logic to show specific scroll images per quest, falling back to the present scroll image if none is present. Also implements a "locked scroll" picture for unavailable quests in addition to the current background dimming.
2015-01-23 10:40:32 -06:00
Sabe Jones
ec114d6a3e
chore(news): Victory Bailey
...
Also includes a fix to disallow party quest bosses from using Rage healing to exceed initial Health.
2015-01-23 10:20:50 -06:00
Blade Barringer
042f2fbceb
Merge pull request #4498 from crookedneighbor/see-mp
...
See mp on stats page
2015-01-22 11:57:15 -06:00
Sabe Jones
9d7fc1efbb
chore(news): Stress Strike 3 Bailey
2015-01-21 10:17:19 -06:00
Blade Barringer
c73fb9eb31
Added in missing p tag
2015-01-20 16:44:49 -06:00
Blade Barringer
d4ab70b174
Removed errant comma
2015-01-20 16:41:36 -06:00
Blade Barringer
e95b238041
Gave credit to badge creators
2015-01-20 16:33:18 -06:00
Blade Barringer
cc65ea1346
Lemoness removed from items she didn't work on
2015-01-20 16:32:30 -06:00
Blade Barringer
b0bb3adf53
removed quest line text
2015-01-20 16:09:43 -06:00
Blade Barringer
7842bbe22e
Added stressbeast strike news
2015-01-20 15:58:00 -06:00
Blade Barringer
ebd5bbd19b
Added new info to Bailey announcement
2015-01-20 14:37:17 -06:00
Blade Barringer
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
benmanley
3a95db0b0d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-01-19 17:06:27 +00:00
benmanley
f93e0ba6b9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
...
Conflicts:
views/shared/tasks/task.jade
2015-01-19 17:06:19 +00:00
Sabe Jones
e40ea3032a
chore(news): Stress Strike 2 Bailey
2015-01-19 10:51:07 -06:00
benmanley
2c88be85cf
fix(tasks): vertically align habit buttons
...
* When a task has + and - buttons, display the buttons vertically and
expand them to fill the full height of the task.
* Use glyphicons for + and - icons
2015-01-19 16:41:01 +00:00
Alice Harris
57637d4271
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
ally if it merges an updated upstream into a topic branch.
2015-01-19 17:52:54 +10:00
Blade Barringer
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
Blade Barringer
5d572c2a40
Merge pull request #4501 from crookedneighbor/fix-day-start
...
Closes #4490 . Day start saves on blur instead of change
2015-01-18 22:57:23 -06:00
Blade Barringer
b73518af5f
Removed $root from view
2015-01-18 22:54:07 -06:00
Blade Barringer
055db157f6
Merge branch 'bug/habitspell' of https://github.com/etaiklein/habitrpg into etaiklein-bug/habitspell
2015-01-18 22:50:26 -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
137ff71bc8
Added one way binding for email
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
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
Tyler Renelle
2306b7c572
refactor(services): move to a single "habitrpg" module for services /
...
directives / filters
2015-01-17 18:43:37 -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
Blade Barringer
ca1f4890ea
Corrected icon for triad bingo
2015-01-16 11:55:23 -06:00
Blade Barringer
3ba057258f
Added triad bingo achievement modal
2015-01-16 11:49:19 -06:00
Blade Barringer
cecb2792e0
Added logic so triad bingo only appears in achievements after mount
...
master has been reached
2015-01-16 11:41:36 -06:00
Blade Barringer
cbdd30b25f
Merge branch 'mountmaster' into triad-bingo
2015-01-16 11:40:36 -06:00
