78890012c1
Merge pull request #6305 from markhowson/fix_narrow_guild_desc
...
Fixes #6252 - Guild description is too narrow on guild page
2015-11-30 13:16:59 -06:00
5e105a0e45
allow moderators to reset flags for a chat message when there's only one flag
2015-11-29 19:46:27 +10:00
f67bd384d4
Moved guild leader message down slightly
2015-11-26 18:47:54 +00: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
fa462a1829
Renamed to wide-popover as it's the only remaining use
2015-11-26 12:56:22 +00:00
848a96a9fa
Fix for #6252
2015-11-26 11:56:32 +00: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
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
d385b2e415
Fixed broken string reference and centered the string.
2015-11-25 15:46:59 +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
b6e79f3ba8
Prevented modal from showing when user tries to hatch a pet they own
2015-11-23 10:20:39 -06:00
743e7cbebd
store inviteParty coachmark for iOS app
2015-11-23 16:24:46 +01:00
0b1758f5c6
Removed col-lg-6 class from tags and prize
2015-11-20 18:17:51 -05:00
b286a93006
removed challenge tag maxlength, reduced tag and prize field size
2015-11-19 23:21:15 -05:00
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05:00
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
c452cf9f99
Adjust styling of noscript block
2015-11-17 21:35:07 -06:00
1299afcb01
Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js
2015-11-17 21:28:22 -06:00
5b7c02334a
Adjust sm modal to not attach objects on rootScope
2015-11-17 21:23:20 -06:00
37e08e8d5d
Converted noscript text into translatable strings
2015-11-17 22:22:55 -05:00
b280267cde
Expand object to make it more readable.
2015-11-17 21:10:29 -06:00
f5f33bd1b9
fix(modals): SM modal fixes
...
Fixes #6253 , allows quest pets to appear in hatching and raising modals, and makes code for deciding whether or not to show a generic levelup modal a bit more readable per comments on #6042 .
2015-11-17 16:56:11 -05:00
53417adda1
Replaced magic numbers with variables
2015-11-17 14:07:35 +01:00
8b7f50bfcf
Adjust memory leak message to be meaningful.
...
Got this message in the heroku logs:
2015-11-17T04:28:18.549451+00:00 app[web.1]: '[Memory Leak] Memory=' + parseFloat(memory).toFixed(3) + ' Time=' + moment()
Converted the line into a variable and threw that instead.
2015-11-16 22:34:06 -06:00
c352a30d4e
chore(news): Bailey 2015-11-16
...
Also sprite recompile to incorporate sticker promo image.
2015-11-16 17:26:44 -05:00
2d1ad12cbd
fix(strings): Make plural more greppable
2015-11-16 17:08:38 -05:00
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
e811693752
Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap.
2015-11-16 15:11:11 +01:00
b87592c8a7
Changed p blocks to single line
2015-11-15 23:00:44 -04:30
21dcafd964
Fixed missing 0 when minutes where less than 10
2015-11-15 22:59:58 -04:30
41e6abfc83
Fixed capitalization
2015-11-15 16:58:19 -05:00
8df005d29e
Added noscript content for the landing page
2015-11-15 16:42:48 -05:00
b5e10bf1e9
Added a helpful message for when JS is disabled
2015-11-15 14:12:12 -05:00
a127bb8711
Switch to babel-core form babel.
...
Babel includes the CLI, which we don't need.
2015-11-15 08:59:57 -06:00
ddeb0e7b23
Add babel register in the server file
2015-11-15 08:16:11 -06:00
0a99361953
Adjust i18n script to actually display zh_TW language.
2015-11-13 15:52:52 -06:00
ada97c1f91
Add invite party to ios tutorial
2015-11-13 07:19:51 -06:00
27d3d9d296
Merge pull request #6229 from HabitRPG/emails
...
Adjust the way email invitations resolve.
2015-11-13 07:18:41 -06:00
565aaff976
Merge pull request #6219 from HabitRPG/js_ify_common
...
Js ify common
2015-11-13 06:49:54 -06:00
e4679d6a63
Adjust the way email invitations resolve.
2015-11-12 18:58:01 -06:00
8e147d7b12
Allow users who register via facebook to see site tutorial.
2015-11-12 18:26:42 -06:00
807726305f
Added timezone form
2015-11-12 19:27:25 -04:30
Sabe Jones