Commit graph

10092 commits

Author SHA1 Message Date
GihHubSphinx
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
Sabe Jones
44bcb1c233 Merge pull request #5584 from HabitRPG/sabrecat/derby-day
Derby Day
2015-07-09 12:32:40 -07:00
Sabe Jones
d5f97b2781 chore(news): Derby Day Bailey 2015-07-09 14:24:22 -05:00
Sabe Jones
353dcff908 fix(Market): Sell whale eggs 2015-07-09 13:27:16 -05:00
Sabe Jones
6cc0a08dc2 feat(event): Derby Day pet quest 2015-07-09 12:57:43 -05:00
Kevin Barbour
5a57895077 Show Extra Notes icon regardless of task ownership.
fixes #5552
2015-07-08 20:48:42 -04:00
Kevin Barbour
d6aef8ee24 Prevent "Resting in the Inn" message when viewing challenges.
fixes #5559
2015-07-08 20:22:23 -04:00
Sabe Jones
c0d35dc472 WIP(quests): Quests page cont'd
Test fixes and addition of function for buying Quests with Gold
2015-07-08 17:43:08 -05:00
Sabe Jones
78d4989544 WIP(event): Summer Splash cont'd
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
Sabe Jones
46543f9072 feat(event): Derby Day mount 2015-07-08 16:07:37 -05:00
Blade Barringer
7dc64f8448 Update iOS link to point to new app in footer 2015-07-07 21:30:08 -05:00
Sabe Jones
3dd2493fed chore(news): iOS release Bailey 2015-07-07 13:27:19 -05:00
Matteo Pagliazzi
fa8e2785bd chore(i18n): update locales 2015-07-06 22:11:26 +02:00
Matteo Pagliazzi
3a2422086f fix(french): use env.t client side 2015-07-06 13:39:18 +02:00
Blade Barringer
fb5ad3830c Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-07-05 22:06:04 -05:00
Blade Barringer
6553c9b346 Merge branch 'duckspeaker-issue-5563-pin-or-replace-unregistered-packages' into develop 2015-07-05 22:04:07 -05:00
Blade Barringer
ed5afb85a5 Alphabetize dependencies in bower.json 2015-07-05 22:01:16 -05:00
Blade Barringer
1ae505eabd Adjust tags for bower; Set github link to main habitrpg org 2015-07-05 21:58:48 -05:00
Blade Barringer
fca4ef8d3f Remove changelog; pin to lefnire's version of icalendar 2015-07-05 21:57:39 -05:00
Matteo Pagliazzi
1618534785 chore(i18n): update locales 2015-07-05 20:51:08 +02:00
Alys
d7084ce0c8 remove unnecessary default for dailyTask.startDate (website/src/models/task.js gives default); give user's timezone to their task startDate values (possible solution for https://github.com/HabitRPG/habitrpg/issues/5395 https://github.com/HabitRPG/habitrpg/issues/5510 https://github.com/HabitRPG/habitrpg/issues/5549) 2015-07-05 19:22:10 +10:00
Matteo Pagliazzi
2fb25207bb fix(amazon-payments): use lastBillingDate 2015-07-05 11:17:40 +02:00
Joe Gallo
bd39d378fd update or pin unregistered bower packages 2015-07-04 20:08:21 -04:00
Joe Gallo
4c70cfd8d2 simplify github repo urls in bower packages file 2015-07-04 19:20:24 -04:00
Joe Gallo
b8df812621 all possible unregistered packages in package.json replaced/upgraded
(upgrading swagger-node-express breaks api tests)
2015-07-04 19:17:23 -04:00
Will
a21f2427e9 jade syntax errors 2015-07-03 22:22:29 -07:00
Will
b3a780b720 more places in header.jade needing maxHealth fix 2015-07-03 22:22:28 -07:00
Will
9bcb3b5cbe update model maxHealth 2015-07-03 22:22:28 -07:00
Will
5f6ddd76a7 update view: stats box in header 2015-07-03 22:22:28 -07:00
Will
03eec12fdd update view: stats table 2015-07-03 22:22:28 -07:00
Will
512d248255 update getUser to use shared.maxHealth 2015-07-03 22:22:28 -07:00
Will
4027c99959 maxHealth added to shared scripts 2015-07-03 22:22:28 -07:00
Blade Barringer
12d5515879 Change motivate message 2015-07-03 19:13:31 -05:00
Sabe Jones
dc5b7f31d8 fix(build): Pin working zocial CSS commit 2015-07-03 18:19:39 -05:00
Sabe Jones
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
Blade Barringer
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
Matteo Pagliazzi
fb912313b9 fix(amazon-payments): handle declined payments 2015-07-03 16:54:57 +02:00
Matteo Pagliazzi
313ac91020 improve(amazon-payments): do not redirect after cancellation with ?noRedirect=true 2015-07-03 14:56:19 +02:00
Matteo Pagliazzi
f6480faf22 chore(i18n): update locales 2015-07-03 10:49:35 +02:00
Blade Barringer
95c29c5c97 Remove one-time bindings 2015-07-02 20:26:31 -05:00
Blade Barringer
33f2ef7cef Simplify start party button 2015-07-02 19:36:58 -05:00
Sabe Jones
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
Blade Barringer
4d7a3afc93 Merge branch 'LionC-develop' into develop 2015-07-02 07:58:59 -05:00
Blade Barringer
4bcff71859 Adjust login modal
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
2015-07-02 07:58:11 -05:00
Blade Barringer
f2cd6f921c Merge pull request #5543 from hairlessbear/pointer_on_notes_icon
Changed task notes icon from 'span' to 'a' element to cause cursor to show icon as clickable
2015-07-02 07:40:12 -05:00
Blade Barringer
fe7642e33a Add find the cub art
Closes #5545
2015-07-01 20:19:46 -05:00
Blade Barringer
ba85487b29 Correct naming of backgrounds 2015-07-01 19:50:49 -05:00
hairlessbear
ebbc6666a6 Modified broken challenge icon to cause cursor to show item as clickable 2015-07-01 18:00:49 -04:00
hairlessbear
6e5f741e4a Changed task notes from 'span' to 'a' element to cause cursor to show item as clickable 2015-07-01 17:53:45 -04:00
Kevin Gisi
74d51e530f Merge pull request #5541 from alexbragdon/gulp_fail_fix
Gulp Tests now report summaries even when some tests fail.
2015-07-01 15:44:49 -04:00