3d9b2047d0
updated static.styl with less classes
...
added key attribute to merchant array
changed item to merchant for clearity
added fallback for when no logo is found (no image can be provided)
updated guidelines
updated json
2015-11-30 22:33:12 +01:00
6056a59cbe
minor update in the comment section
2015-11-29 19:12:45 +01:00
afecae9ef0
cleared merch.json of attributes that should not be translated
2015-11-29 19:05:32 +01:00
6a535277a7
updated tab indent
...
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
2015-11-27 23:25:56 +01:00
37378e8497
once more i try to add it back
2015-11-27 10:28:45 +01:00
a28a167437
merge
2015-11-27 10:25:08 +01:00
ae8153c1f0
Merge branch 'static-page-merch' of https://github.com/danielvancamp/habitrpg into static-page-merch
2015-11-27 10:23:53 +01:00
45f43379b0
added original static.styl again, mistakenly removed it while editing
2015-11-27 10:23:10 +01:00
1f8ae40d9d
updated counter to the real 2 sellers
2015-11-27 10:07:12 +01:00
3a47221d74
added better bootstrap for multiple merchandises
2015-11-27 10:07:12 +01:00
f67bf77143
added guide how to add merchandise
2015-11-27 10:07:12 +01:00
e881ba37e7
added static merch page
...
added lang en .json
modified pages.js with the extra merch page
2015-11-27 10:07:12 +01:00
a7c05de8e7
added better bootstrap for multiple merchandises
2015-11-27 00:19:52 +01:00
610a555849
added guide how to add merchandise
2015-11-27 00:06:33 +01:00
169a8d9915
added static merch page
...
added lang en .json
modified pages.js with the extra merch page
2015-11-26 23:51:57 +01:00
9f53365648
add comment for refactoring to fix reset bug that doesn't unequip gear properly (e.g., https://github.com/HabitRPG/habitrpg/issues/6304 )
2015-11-27 06:13:14 +10:00
ad347090c3
Merge remote-tracking branch 'origin/pr/5968' into develop
...
Conflicts:
website/views/options/social/challenge-box.jade
2015-11-26 13:33:33 -05:00
3c672ea814
Merge pull request #6281 from TheHollidayInn/inventory-prevent-hatch-model-from-showing-on-hatched-pet
...
Prevented modal from showing when user tries to hatch a pet they own
2015-11-26 11:56:38 -06:00
846b6597ab
Merge pull request #6280 from vIiRuS/patch-6
...
Store inviteParty coachmark for iOS app
2015-11-26 11:45:33 -06:00
0a90c7c66d
Merge pull request #6270 from Arodang/challenge-tag-field-character-limit
...
Removed Challenge Tag Maxlength
2015-11-26 11:15:23 -06:00
5d02b70be1
Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix
...
Two-handed weapons no longer automatically equip unless desired. fixes #6231
2015-11-26 10:53:50 -06:00
9cbe94c602
chore(gulp): compile sprites
2015-11-26 11:25:25 -05:00
98a62c5cc9
fix the phoenix base on the right place now
...
(cherry picked from commit a8a2e3b74a
2015-11-26 11:22:57 -05:00
0c77737f36
Merge pull request #6299 from ojeytonwilliams/static-string-fix
...
Fixed broken string reference and centered the string.
2015-11-26 08:59:03 +10:00
5461345770
remove trailing whitespace
2015-11-26 08:49:40 +10:00
83934bf5c9
Added markdown directive to challenge titles
2015-11-26 08:49:40 +10:00
e429be7046
Merge pull request #6293 from HabitRPG/sabrecat/fix-mount-modal
...
Show mount modal more often
2015-11-25 16:24:05 -06:00
863f416514
Merge pull request #6303 from HabitRPG/sabrecat/thanksgiving
...
Habitica Thanksgiving event
2015-11-25 16:23:09 -06:00
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
9671f4a09d
feat(event): November sprites
2015-11-25 13:33:36 -06:00
d385b2e415
Fixed broken string reference and centered the string.
2015-11-25 15:46:59 +01:00
9bda5657d2
Fixed syntax for linter.
2015-11-25 12:40:40 +01:00
707cd08a8b
Merged: updating two-handed tests to use arrow functions.
2015-11-25 12:12:22 +01:00
28205663e4
fix(modals): Show mount modal more often
...
Fixes #6288 . Previously, we used a count of all properties within the user's items.pets.mounts to determine whether or not they'd gained a new mount. That would not work as expected if they had mounts with a null or false status, such as after using the Key to the Kennels. This commit also adds some tests to the inventory controller in Angular for pet raising.
2015-11-24 16:54:59 -05:00
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
431eaec71a
add a missing full stop to a message and to the associated test
2015-11-24 14:11:01 +10:00
69553260d3
revert refactor of preenHistory
2015-11-24 08:24:33 +10:00
b6e79f3ba8
Prevented modal from showing when user tries to hatch a pet they own
2015-11-23 10:20:39 -06:00
671d4aaecc
Change timezone text
2015-11-23 11:38:26 -04:30
743e7cbebd
store inviteParty coachmark for iOS app
2015-11-23 16:24:46 +01:00
7d49a8cbf8
Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers
2015-11-23 08:07:58 -06:00
b88a1c98db
Merge branch 'Alys-refactor-cron-time-day-2015-11-21' into develop
2015-11-23 08:04:17 -06:00
65c276c477
fix formatting in preenHistory
2015-11-22 21:08:51 +10:00
1082bb1f81
refactor preenHistory from index.js to cron.js
2015-11-22 15:52:30 +10:00
83ea085c21
refactor api.shouldDo and associated code; fix new bug in sanitizeOptions()
2015-11-22 11:28:51 +10:00
728a94d199
improve coding style
2015-11-22 11:05:03 +10:00
a380c1aa30
refactor api.daysSince to a cron.js function not exposed on api
2015-11-22 10:48:15 +10:00
2f8b6d68e8
refactor api.startOfDay to a cron.js function not exposed on api
2015-11-22 07:13:44 +10:00
9a76e7a62c
chore(gulp): Add convience task for starting up a test server.
2015-11-21 09:33:29 -06:00
6183fd9e71
refactor api.startOfWeek to a cron.js function not exposed on api
2015-11-21 22:26:05 +10:00
Daniel Van Camp