Commit graph

11825 commits

Author SHA1 Message Date
pittaxx
6fff7f9b93 Changed css bootstrap screen-width constants to variables. 2015-12-27 13:28:41 +02:00
pittaxx
c7d47dcd0a Fixed css bug, where both min-width and max-width were set to 768.
Max-width was changed to 767 to prevent overlap, which produces artifacts when
screen width is exactly 768 pixels.
2015-12-26 21:37:42 +02:00
Blade Barringer
e5c9924141 lint: Ignore rule for one-var in tests 2015-12-26 08:13:45 -06:00
Blade Barringer
c5bf06cd24 tests(common): Add test for preening todos 2015-12-26 08:11:02 -06:00
Sabe Jones
7a41d36834 fix(mystery): add event timeframe 2015-12-23 20:33:45 -05:00
Sabe Jones
799e68614d Revert "fix(test): pend brittle subscription checks"
This reverts commit 61c5e2e3e9.
2015-12-23 20:32:39 -05:00
Sabe Jones
26a1bcee6b Merge pull request #6395 from HabitRPG/sabrecat/subscriber-201512
Subscriber items 2015-12
2015-12-23 14:17:33 -06:00
Sabe Jones
61c5e2e3e9 fix(test): pend brittle subscription checks 2015-12-23 15:07:21 -05:00
Sabe Jones
7d0efdeeda chore(news): Android announcement
Also adds a higher-quality version of the Winter Town background.
2015-12-23 14:43:16 -05:00
Sabe Jones
468198b9e2 feat(mystery): subscriber items 2015-12
Also enables the Snowball in the Seasonal Shop.
2015-12-22 16:16:30 -05:00
Blade Barringer
1aaebef114 tests(docs): Document how to run tests against a locally running server 2015-12-21 18:08:01 -06:00
Blade Barringer
6539399667 tests: Move api integration test readme to api directory 2015-12-21 18:03:13 -06:00
Sabe Jones
afe3c87357 fix(credits): Lady Snuffles 2015-12-18 20:09:26 -05:00
Sabe Jones
1c833eadc1 Merge pull request #6381 from HabitRPG/sabrecat/winter-wonderland
Winter Wonderland 2015-16
2015-12-18 17:08:49 -06:00
Sabe Jones
c259c5c819 fix(event): sprite and string tweaks 2015-12-18 17:58:46 -05:00
Sabe Jones
1e1f15b495 fix(content): linting errors 2015-12-18 17:27:27 -05:00
Sabe Jones
493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Sabe Jones
1bf0b6ca8d Merge pull request #6375 from mfdeveloper/phantomjs-dependency
Fix npm install error - Phantomjs dependency
2015-12-16 16:14:28 -06:00
Michel Felipe de Oliveira Ferreira
11bbf165b1 Added explicitly phantomjs dependency 2015-12-16 16:47:17 -03:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones
3cc2866c76 Merge pull request #6368 from HabitRPG/sabrecat/pets-201512
December Pet Quest
2015-12-15 11:55:08 -06:00
Nathan Maton
35a921bf43 feat(content): Make mystery set strings translatable
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
2015-12-15 08:47:13 -06:00
Sabe Jones
fe1de12494 feat(pets): December quest 2015-12-14 16:28:39 -05:00
Sabe Jones
e638661c71 Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message
Changed language when deleteing tasks to indicate type and text of task
2015-12-14 14:30:06 -06:00
Blade Barringer
883fd14775 tests(lint): remove unused variables 2015-12-13 16:40:44 -06:00
Blade Barringer
9ec26a8ee9 tests(common): Use generateUser helper in dailies test 2015-12-13 16:29:29 -06:00
Blade Barringer
b10c6f21a8 tests(common): Convert algos tests to use generateUser helper 2015-12-13 16:23:25 -06:00
Blade Barringer
e82085ac1b tests(helpers): Add common helpers for generating tasks 2015-12-13 16:22:58 -06:00
Blade Barringer
0f789ba780 Merge branch 'TheHollidayInn-skills-burst-backstap-leveling-fix' into develop 2015-12-13 15:38:03 -06:00
Blade Barringer
ce06d8a873 tests(common): Simplify spell tests 2015-12-13 15:37:18 -06:00
Alys
9edb0831c0 specify $ USD for subscription prices 2015-12-14 07:16:22 +10:00
Keith Holliday
f152a352bb Merge pull request #4 from crookedneighbor/common_helper
Common helper
2015-12-13 12:06:22 -06:00
Blade Barringer
4ee21f2578 tests(common): Use helper to generate user 2015-12-13 10:40:50 -06:00
Blade Barringer
70751abe01 tests(helpers): Add helper to generate user for common and content tests 2015-12-13 10:40:00 -06:00
Blade Barringer
dafe014ec8 Merge branch 'develop' into TheHollidayInn-skills-burst-backstap-leveling-fix 2015-12-13 10:06:27 -06:00
Keith Holliday
beea6d920f Added tests for backstab and fireball 2015-12-13 09:19:20 -06:00
Blade Barringer
5fa91713f5 fix(favicon): Add 192x192 image 2015-12-12 20:11:25 -06:00
Blade Barringer
025b302ec6 Merge branch 'develop' into anilanar-favicon192 2015-12-12 20:08:34 -06:00
Blade Barringer
530babf516 chore(css): Add explanation for empty-task-notification rule 2015-12-12 17:27:43 -06:00
Blade Barringer
73c8db01ad chore(sprites): Update readme 2015-12-12 17:17:04 -06:00
Blade Barringer
81067efd19 Merge branch 'joyclark-new_mount_heads' into develop 2015-12-12 17:16:36 -06:00
Blade Barringer
ee87d1b4b7 chore(sprites): Compile 2015-12-12 17:12:53 -06:00
Blade Barringer
a7ffb41acd fix(sprites): Correct size of tiger mount icon 2015-12-12 16:04:03 -06:00
Blade Barringer
1f37338782 fix(sprites): Correct mount head icons for peppermint pets 2015-12-12 14:35:14 -06:00
Blade Barringer
6d6e1caf0f fix(sprites): Correct spooky pet mount icons 2015-12-12 14:20:38 -06:00
Blade Barringer
8ad2b07253 fix(sprites): Correct gryphon mount icon sizing 2015-12-12 11:09:27 -06:00
Blade Barringer
9aa73db281 fix(sprites): Correct size of tiger sprites 2015-12-12 11:02:54 -06:00
Blade Barringer
963995e42e refactor(css): Adjust mount heads pixel paw positioning 2015-12-12 10:50:05 -06:00
Alys
10a63a6cb7 make Android link in footer open in new tab 2015-12-12 18:59:44 +10:00
Alys
95dbcde4b6 change Android link in footer to point to Google Play 2015-12-12 18:33:36 +10:00