3e41b62bc9
Include mixins.jade also in layout.jade
2015-01-30 17:47:55 +01:00
e6a5feeeb6
Merge pull request #4590 from negue/fixAchievementsOnMobile
...
aLink mixin to handle mobile links
2015-01-30 00:17:10 +01:00
e165f5dac4
move aLink to mixins.jade
2015-01-29 20:40:06 +01:00
6b25797154
Added reminder about swearing to the tavern chat box
2015-01-29 12:22:26 -06:00
4a16deb50d
aLink mixin to handle mobile links
2015-01-29 18:16:33 +01:00
154b8a00e5
Merge pull request #4585 from crookedneighbor/quest-scroll-popover-and-modal-changes
...
Quest scroll popover and modal changes
2015-01-28 15:39:32 -06: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
d3d12bc638
Added popover-append-to-body to inventory popovers
2015-01-28 14:23:38 -06:00
84552597d6
Adjusted hrs for popovers
2015-01-28 14:00:06 -06:00
4c6bf8f543
Added append to body to quest scroll popovers
2015-01-28 13:37:34 -06:00
50bc48f325
fix(share): addthis in static pages
2015-01-28 20:32:35 +01: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
b56c5af978
Changed popover text for quest scrolls. Closes #4575
2015-01-27 19:32:06 -06:00
58650baba3
Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border
2015-01-27 09:10:46 -06:00
2c40097403
move from left div to right
2015-01-26 23:14:19 -08:00
b9784fa4aa
Added notice for rebirth in seasonal shop
2015-01-26 22:15:24 -06:00
7eae5db256
Added comment describing the silly conditional for transparency in the
...
seasonal shop
2015-01-26 19:25:53 -06:00
3b1743dee8
Corrected ng-class condition to show transparent class
...
on seasonal shop items after rebirth
2015-01-26 18:55:10 -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
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
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
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
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
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
7c10d27c04
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-18 15:56:11 -06:00
137ff71bc8
Added one way binding for email
2015-01-18 15:55:39 -06:00
negue