c287441cd9
Merge pull request #4378 from SabreCat/purchases
...
Hide "2/locked" as appropriate
2014-12-14 12:42:11 -06:00
dde3f5ffef
Adjusted tooltip wrapping so it would only affect long titles
2014-12-14 12:18:59 -06:00
a961d6b342
Added wrapping rule for user tooltip in chat messages closes #4367
2014-12-14 12:05:36 -06:00
fd3cbf481d
Merge pull request #390 from lacrimae/develop
...
Streamlined "Confers no benefit" placements
2014-12-14 11:02:45 -06:00
396176f14f
Quest completion screen floats to right on everything but xs
2014-12-14 08:32:05 -06:00
d0df9e46d6
Added helper classes for floats at various screen sizes
2014-12-14 08:31:40 -06:00
41e1f4c75f
Conditionally allow completed quest image to be centered if no
...
completion text is present
2014-12-14 08:13:50 -06:00
195a8a5ca3
Merge pull request #4375 from thehindenburg/questimage
...
Quest image added in the completion screen
2014-12-14 07:39:16 -06:00
ff8a508860
Streamlined "Confers no benefit" placements
2014-12-14 13:32:44 +01:00
e4df3435e1
fix(avatar): Correct "Facial Hair" text
...
Adjusts the text style of "Facial Hair" header in Avatar shop to follow the same scheme as Hair. Before, the text was less header-like than elements under it.
2014-12-13 16:07:58 -06:00
4ded747b88
fix(purchases): Correct hair path
...
Fixes https://github.com/HabitRPG/habitrpg/issues/4312 .
2014-12-13 15:53:39 -06:00
4adf95feb6
fix(purchases): Hide "2/locked" as appropriate
2014-12-13 12:05:17 -06:00
61ae5c7420
fix(loggly): enable only manually
2014-12-13 15:01:38 +01:00
012e579cfe
fix(loggly): typo
2014-12-13 14:57:05 +01:00
dac2fc682d
feat(loggly): change tag based on base_url, logs internal server errors
2014-12-13 14:48:14 +01:00
5368d3b760
Merge pull request #389 from lacrimae/develop
...
Pull req: Clarifying spell effects on attributes
2014-12-13 10:31:50 +10:00
9d6caaa138
feat(iap): ignore keys/ directory. upload any keys/iap-sandbox iap-live
...
etc on a private branch
2014-12-12 16:19:13 -07:00
118a5432e5
Merge branch 'develop' of https://github.com/lacrimae/habitrpg-shared into develop
2014-12-13 00:16:24 +01:00
a15c57c275
Accidentally a dash
2014-12-13 00:15:46 +01:00
63263bbf3a
Spells now mention which attribute they affect
...
https://github.com/HabitRPG/habitrpg-shared/issues/380
2014-12-13 00:15:46 +01:00
e98243e3d8
refactor(env): small cleanup
2014-12-12 21:07:38 +01:00
60d03dd17f
Merge pull request #387 from SabreCat/rebalancing
...
Implement boss damage from Habits
2014-12-13 05:27:00 +10:00
8935538b53
feat(loggly): enable json loggin and start loggin errors during cron
2014-12-12 20:05:37 +01:00
7c6d8d4dc2
Update quests.styl
...
further white space cleanup
2014-12-12 11:02:55 -08:00
670542f3ce
cleaning up white space
2014-12-12 10:44:06 -08:00
e1ea1a24c8
feat(challenges): optional checkbox on group create/edit:
...
restrict challenge-creation to leader. Commented-out code for similar
setup for member invites, shouldn't be hard
2014-12-12 11:37:00 -07:00
2db80c6841
changed to style sheet
2014-12-12 10:26:55 -08:00
45d30ffef5
fix(footerCtrl.js): disable addThis hover
...
Activate addThis dropdown on click/tap not on hover.
2014-12-12 17:41:45 +00:00
0943a229ec
fix(avatar.styl): improve label layout
...
Fixes #4349
* Tweak position of labels to align better with background border.
* Increase z-index of share button to prevent it being obscured by
avatar.
* Move share button to bottom left corner to prevent it obscuring
avatar name.
2014-12-12 17:41:45 +00:00
375253fb84
changing the reward text to clear the image
2014-12-12 09:38:13 -08:00
b10d4606f5
fix(loggly): typo and remove testing
2014-12-12 13:09:21 +01:00
af1ff6d740
feat(loggly): add test log, use only in production and add sample config
2014-12-12 12:17:48 +01:00
7356e0bafe
feat(loggly): add loggly
2014-12-12 12:11:26 +01:00
948d5762cd
fix(flag-message): small refactor
2014-12-12 11:39:22 +01:00
ac34332582
Made reset flag count button red
2014-12-12 11:05:22 +01:00
5b17b8b382
Made flag number more helpful
2014-12-12 11:05:22 +01:00
35675e3f28
Admin can see flag on own message
2014-12-12 11:05:21 +01:00
7d38eb3b59
Allow admin to reflag a message they've flagged and unflagged previously
2014-12-12 11:05:21 +01:00
595ac1c03e
Made it impossible to flag own message in inbox
2014-12-12 11:05:21 +01:00
c737729470
Changed transparent class for admin to only appear if it is hidden
2014-12-12 11:05:21 +01:00
5f49031c5e
Adjusted spacing of chat buttons
2014-12-12 11:05:21 +01:00
b1600198be
Added method for letting an admin unhide a flagged message
2014-12-12 11:05:20 +01:00
eb36a53f6e
Moved ng-class so it would update transparent class in real time after flaggging
2014-12-12 11:05:20 +01:00
6bb51c36e2
Admin flagging counts for more, automatically hides message
2014-12-12 11:05:20 +01:00
d6262efd3f
Added note about how many flags a message has
2014-12-12 11:05:20 +01:00
dfd982cb04
Allow admin to see messages that have been flagged more than twice, but
...
make them semi-transparent
2014-12-12 11:05:20 +01:00
d3d5430bf2
Always show message if admin
2014-12-12 11:05:20 +01:00
b056faeb34
Hide message if flag count is 2 or higher
2014-12-12 11:05:20 +01:00
45b91b1251
Added flagCount variable
2014-12-12 11:05:19 +01:00
27ebe1a0fe
Converted sent transparency to ng-class instead of style
2014-12-12 11:05:19 +01:00
Sabe Jones