1da26acc93
fix jade vs angular
2015-02-01 09:27:10 -06:00
cec5797fc9
fix presskit and header
2015-02-01 09:27:09 -06:00
71436288ff
fix quest rewards translation
2015-02-01 09:25:44 -06:00
18afb1ce18
Merge pull request #4592 from SabreCat/birthday
...
Habit Birthday 2015
2015-01-30 13:55:00 -06:00
47d14a1f99
fix(news): Prettify Bailey more
2015-01-30 13:51:48 -06:00
4fe4c01f3c
fix(news): Left right left
2015-01-30 13:48:44 -06:00
0007e870ed
chore(news): Bailey
2015-01-30 13:44:09 -06:00
e165f5dac4
move aLink to mixins.jade
2015-01-29 20:40:06 +01:00
4ebc2953f5
feat(event): Habit Birthday 2015
2015-01-29 13:02:26 -06:00
4a16deb50d
aLink mixin to handle mobile links
2015-01-29 18:16:33 +01:00
043baf4961
Removed hp from modals
2015-01-28 15:10:21 -06:00
e6e1ea086e
Fixed alignment of notes on tasks
2015-01-28 14:51:51 -06:00
d8e09884a0
Added quest image and info to quest invitation modal
2015-01-27 20:37:09 -06:00
a77a46c543
Added one time bindings to quest modals
2015-01-27 20:27:14 -06:00
eaaa09c75a
Added quest details to buy quest and show quest modals
2015-01-27 20:16:11 -06:00
eceaaef954
Merge pull request #4567 from crookedneighbor/add-audio-watts
...
Added Watts' Theme to Audio Choices
2015-01-26 11:27:27 -06:00
65af7f362e
Merge branch 'scrolls' into develop
...
Conflicts:
views/shared/new-stuff.jade
2015-01-26 11:18:48 -06:00
ad08f1be9a
fix(news): Errant parenthesis
2015-01-26 11:11:04 -06:00
524761f1cf
feat(mystery): January subscriber set
2015-01-26 11:00:02 -06:00
de59c76609
Added watts themes to audio choices
2015-01-23 14:53:30 -06:00
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
042f2fbceb
Merge pull request #4498 from crookedneighbor/see-mp
...
See mp on stats page
2015-01-22 11:57:15 -06:00
9d7fc1efbb
chore(news): Stress Strike 3 Bailey
2015-01-21 10:17:19 -06:00
c73fb9eb31
Added in missing p tag
2015-01-20 16:44:49 -06:00
d4ab70b174
Removed errant comma
2015-01-20 16:41:36 -06:00
e95b238041
Gave credit to badge creators
2015-01-20 16:33:18 -06:00
cc65ea1346
Lemoness removed from items she didn't work on
2015-01-20 16:32:30 -06:00
b0bb3adf53
removed quest line text
2015-01-20 16:09:43 -06:00
7842bbe22e
Added stressbeast strike news
2015-01-20 15:58:00 -06:00
ebd5bbd19b
Added new info to Bailey announcement
2015-01-20 14:37:17 -06:00
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
3a95db0b0d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-01-19 17:06:27 +00:00
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
e40ea3032a
chore(news): Stress Strike 2 Bailey
2015-01-19 10:51:07 -06:00
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
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
b73518af5f
Removed $root from view
2015-01-18 22:54:07 -06:00
055db157f6
Merge branch 'bug/habitspell' of https://github.com/etaiklein/habitrpg into etaiklein-bug/habitspell
2015-01-18 22:50:26 -06:00
bb78b121da
revert part of a053486, angular is madeningly inconsistent with this bug
2015-01-18 16:38:31 -07:00
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
f64bc5b2ed
Removed if that would hide the triad bingo achievement until mount
...
master attained
2015-01-17 09:54:16 -06:00
373d5a5b64
Merge branch 'mountmaster' into triad-bingo
2015-01-17 09:53:56 -06:00
3d904f18b9
Allowed mountMaster achievement to always be shown
2015-01-17 09:53:28 -06:00
ca1f4890ea
Corrected icon for triad bingo
2015-01-16 11:55:23 -06:00
3ba057258f
Added triad bingo achievement modal
2015-01-16 11:49:19 -06:00
cecb2792e0
Added logic so triad bingo only appears in achievements after mount
...
master has been reached
2015-01-16 11:41:36 -06:00
cbdd30b25f
Merge branch 'mountmaster' into triad-bingo
2015-01-16 11:40:36 -06:00
6a63f55a94
Added logic so muted version of mount master only appears if user has
...
achieved beast master
2015-01-16 11:37:20 -06:00
ff4c2ade96
Added triadBingo to achievement list
2015-01-16 11:32:41 -06:00
10bc7e4eac
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-16 10:44:52 -06:00
Matt T Elliott