4a9ea83d6b
Added whale quest back in, refactor
2015-07-11 16:35:16 -05:00
4acc0c03a8
Add in changes to equipment and seasonalshop
2015-07-11 16:16:29 -05:00
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
74dee2727e
Remove out of date todo
2015-07-11 15:54:09 -05:00
dccc10aa4d
Refactor
2015-07-11 15:05:58 -05:00
eeae12b002
Refactore inventory pages
2015-07-11 13:50:30 -05:00
066206f41c
Refactored inventory into separate files
2015-07-11 13:13:00 -05:00
c33a22ceb3
Put locale key creation into private function
2015-07-11 12:07:20 -05:00
94cd0bb852
Use user variable
2015-07-11 11:18:19 -05:00
d2e61bf5ef
Change string to str
2015-07-11 11:15:04 -05:00
cb4b2e43bf
Change variable name to itemList
2015-07-11 11:14:50 -05:00
ef496525a1
change white "Report" button to red "Report Violation" button in chat message flag modal
2015-07-11 21:23:39 +10:00
305414e152
Merge pull request #5553 from Lokeh/Lokeh/maxHealth
...
maxHealth refactor
2015-07-11 00:18:15 -05:00
48b520509c
fixes https://github.com/HabitRPG/habitrpg/issues/5555
2015-07-11 00:15:55 -05:00
c941511d11
Merge branch 'barbourkd-develop' into develop
2015-07-11 00:11:23 -05:00
50a924e470
Add space
2015-07-11 00:11:02 -05:00
09d85f39fc
Merge pull request #5586 from GitHubSphinx/Sphinx-entry2
...
Introducing a class for buttons allowing wrapping
2015-07-11 00:07:26 -05:00
ddf2489664
Merge pull request #5581 from barbourkd/bugfix/5552
...
Show Extra Notes icon regardless of task ownership.
2015-07-11 00:05:04 -05:00
2722651cc8
Merge branch 'GitHubSphinx-Sphinx-entry3' into develop
2015-07-10 23:47:42 -05:00
3644d43f0a
Remove unnecessary duplication
2015-07-10 23:47:23 -05:00
ab1870c1aa
Merge branch 'TheHollidayInn-groups-remove-message-when-kick' into develop
2015-07-10 23:24:20 -05:00
cdcc085530
Adjust test
2015-07-10 23:21:23 -05:00
acb82f99ce
Remove user's group msg notification when they are kicked from the group
2015-07-10 22:39:17 -05:00
cc00bd17b3
Don't show unneeded spaces between buttons in chat
...
Don't show spaces in front of a button in a chat message if button
itself is not shown
2015-07-10 20:47:24 +05:00
00f7af7807
Introducing a class for buttons allowing wrapping
...
New .btn-wrap class for buttons with long text allowing wrapping
2015-07-10 02:33:09 +05:00
d5f97b2781
chore(news): Derby Day Bailey
2015-07-09 14:24:22 -05:00
353dcff908
fix(Market): Sell whale eggs
2015-07-09 13:27:16 -05:00
5a57895077
Show Extra Notes icon regardless of task ownership.
...
fixes #5552
2015-07-08 20:48:42 -04:00
d6aef8ee24
Prevent "Resting in the Inn" message when viewing challenges.
...
fixes #5559
2015-07-08 20:22:23 -04:00
7dc64f8448
Update iOS link to point to new app in footer
2015-07-07 21:30:08 -05:00
3dd2493fed
chore(news): iOS release Bailey
2015-07-07 13:27:19 -05:00
3a2422086f
fix(french): use env.t client side
2015-07-06 13:39:18 +02:00
6553c9b346
Merge branch 'duckspeaker-issue-5563-pin-or-replace-unregistered-packages' into develop
2015-07-05 22:04:07 -05:00
1ae505eabd
Adjust tags for bower; Set github link to main habitrpg org
2015-07-05 21:58:48 -05:00
2fb25207bb
fix(amazon-payments): use lastBillingDate
2015-07-05 11:17:40 +02:00
a21f2427e9
jade syntax errors
2015-07-03 22:22:29 -07:00
b3a780b720
more places in header.jade needing maxHealth fix
2015-07-03 22:22:28 -07:00
9bcb3b5cbe
update model maxHealth
2015-07-03 22:22:28 -07:00
5f6ddd76a7
update view: stats box in header
2015-07-03 22:22:28 -07:00
03eec12fdd
update view: stats table
2015-07-03 22:22:28 -07:00
512d248255
update getUser to use shared.maxHealth
2015-07-03 22:22:28 -07:00
12d5515879
Change motivate message
2015-07-03 19:13:31 -05:00
6845e8caf3
fix(experiment): Style fixes
...
Corrects the display of Google Experiment variants in the absence of an API callback, and widens the avatar stat bar for users who don't have a party.
2015-07-03 13:46:22 -05:00
e924157fdf
Merge pull request #5508 from Alys/trivial-difficulty
...
add Trivial difficulty/priority setting to task Advanced Options
2015-07-03 10:08:46 -05:00
fb912313b9
fix(amazon-payments): handle declined payments
2015-07-03 16:54:57 +02:00
313ac91020
improve(amazon-payments): do not redirect after cancellation with ?noRedirect=true
2015-07-03 14:56:19 +02:00
95c29c5c97
Remove one-time bindings
2015-07-02 20:26:31 -05:00
33f2ef7cef
Simplify start party button
2015-07-02 19:36:58 -05:00
fb81c79b78
feat(analytics): Invite Friends experiment
...
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
2015-07-02 16:13:22 -05:00
4d7a3afc93
Merge branch 'LionC-develop' into develop
2015-07-02 07:58:59 -05:00
Blade Barringer