Mark Howson
f67bd384d4
Moved guild leader message down slightly
2015-11-26 18:47:54 +00:00
Mark Howson
fa462a1829
Renamed to wide-popover as it's the only remaining use
2015-11-26 12:56:22 +00:00
Mark Howson
848a96a9fa
Fix for #6252
2015-11-26 11:56:32 +00:00
Alys
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
Alys
5461345770
remove trailing whitespace
2015-11-26 08:49:40 +10:00
Keith Holliday
83934bf5c9
Added markdown directive to challenge titles
2015-11-26 08:49:40 +10:00
Sabe Jones
e429be7046
Merge pull request #6293 from HabitRPG/sabrecat/fix-mount-modal
...
Show mount modal more often
2015-11-25 16:24:05 -06:00
Sabe Jones
863f416514
Merge pull request #6303 from HabitRPG/sabrecat/thanksgiving
...
Habitica Thanksgiving event
2015-11-25 16:23:09 -06:00
Sabe Jones
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
Sabe Jones
9671f4a09d
feat(event): November sprites
2015-11-25 13:33:36 -06:00
Oliver Eyton-Williams
d385b2e415
Fixed broken string reference and centered the string.
2015-11-25 15:46:59 +01:00
Sabe Jones
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
Alys
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
Alys
431eaec71a
add a missing full stop to a message and to the associated test
2015-11-24 14:11:01 +10:00
Alys
69553260d3
revert refactor of preenHistory
2015-11-24 08:24:33 +10:00
Amin Arria
671d4aaecc
Change timezone text
2015-11-23 11:38:26 -04:30
Blade Barringer
7d49a8cbf8
Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers
2015-11-23 08:07:58 -06:00
Blade Barringer
b88a1c98db
Merge branch 'Alys-refactor-cron-time-day-2015-11-21' into develop
2015-11-23 08:04:17 -06:00
Alys
65c276c477
fix formatting in preenHistory
2015-11-22 21:08:51 +10:00
Alys
1082bb1f81
refactor preenHistory from index.js to cron.js
2015-11-22 15:52:30 +10:00
Alys
83ea085c21
refactor api.shouldDo and associated code; fix new bug in sanitizeOptions()
2015-11-22 11:28:51 +10:00
Alys
728a94d199
improve coding style
2015-11-22 11:05:03 +10:00
Alys
a380c1aa30
refactor api.daysSince to a cron.js function not exposed on api
2015-11-22 10:48:15 +10:00
Alys
2f8b6d68e8
refactor api.startOfDay to a cron.js function not exposed on api
2015-11-22 07:13:44 +10:00
Blade Barringer
9a76e7a62c
chore(gulp): Add convience task for starting up a test server.
2015-11-21 09:33:29 -06:00
Alys
6183fd9e71
refactor api.startOfWeek to a cron.js function not exposed on api
2015-11-21 22:26:05 +10:00
Alys
e0784a9791
refactor sanitizeOptions from index.js to cron.js
2015-11-21 22:06:02 +10:00
Alys
a73662bab6
refactor api.dayMapping to DAY_MAPPING const, not exposed on api
2015-11-21 20:48:18 +10:00
Sabe Jones
66725a561c
fix(test): Remove only
2015-11-20 13:39:54 -05:00
Sabe Jones
e5d3e7bc83
fix(test): Linting and coverage
2015-11-20 13:36:41 -05:00
Sabe Jones
fb17c3ae80
Merge branch 'develop' into sabrecat/modularize-statHelpers
2015-11-20 13:27:25 -05:00
Blade Barringer
a6fb5790e5
refactor(gulp): Dry out linting task
2015-11-20 07:56:59 -06:00
Blade Barringer
776faddb34
(chore): lint test/common files
2015-11-19 20:27:39 -06:00
Sabe Jones
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05:00
Blade Barringer
5947dcf68b
(chore): Add lint:watch task
2015-11-18 17:23:33 -06:00
Alys
cb1f745d39
Merge pull request #6247 from ojeytonwilliams/subcriber-benefits-comparisons
...
Potential fix for #6085 - fix subscriber benefits comparisons; round down 3 month blocks for perks - fixes #6085
2015-11-19 07:09:14 +10:00
Sabe Jones
72ea9426dd
fix(lint): Space infix operator (?)
2015-11-18 15:18:44 -05:00
Sabe Jones
ed443b490a
refactor(constant): Screaming camel MAX_LEVEL
2015-11-18 15:14:47 -05:00
Sabe Jones
31b68219d1
refactor(stats): Address PR comments
2015-11-18 15:06:55 -05:00
Blade Barringer
eded44fea5
Adjust helper files for linting preferences.
2015-11-18 08:54:34 -06:00
Blade Barringer
22c8a24d15
Move test specific eslint rules to eslint task
2015-11-18 08:50:03 -06:00
Blade Barringer
f94394127a
Remove unused var
2015-11-18 08:00:14 -06:00
Blade Barringer
9e557c43d3
Fix bug where seasonal items could not be purchased.
2015-11-18 07:58:01 -06:00
Blade Barringer
26b82dff4b
Fix bug where armoire items could not be repurchased.
2015-11-18 07:57:45 -06:00
Blade Barringer
553548046f
Add linting for tests
2015-11-17 23:14:49 -06:00
Blade Barringer
94bf181301
Add noscript locales
2015-11-17 22:02:57 -06:00
Blade Barringer
0a7d7fc42d
Merge pull request #6251 from crookedneighbor/modularize-content-gear
...
Pull out gear into separate modules
2015-11-17 21:57:13 -06:00
Blade Barringer
4d415ee9c1
chore(i18n): update locales
2015-11-17 21:54:30 -06:00
Blade Barringer
fba35ea491
chore(i18n): update locales
2015-11-17 21:48:55 -06:00
Blade Barringer
6bd0ed76cc
Fixes #6524 . Correct spelling of community
2015-11-17 21:41:06 -06:00