Commit graph

6008 commits

Author SHA1 Message Date
Blade Barringer
195a8a5ca3 Merge pull request #4375 from thehindenburg/questimage
Quest image added in the completion screen
2014-12-14 07:39:16 -06:00
Sabe Jones
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
Sabe Jones
4ded747b88 fix(purchases): Correct hair path
Fixes https://github.com/HabitRPG/habitrpg/issues/4312.
2014-12-13 15:53:39 -06:00
Sabe Jones
4adf95feb6 fix(purchases): Hide "2/locked" as appropriate 2014-12-13 12:05:17 -06:00
Matteo Pagliazzi
61ae5c7420 fix(loggly): enable only manually 2014-12-13 15:01:38 +01:00
Matteo Pagliazzi
012e579cfe fix(loggly): typo 2014-12-13 14:57:05 +01:00
Matteo Pagliazzi
dac2fc682d feat(loggly): change tag based on base_url, logs internal server errors 2014-12-13 14:48:14 +01:00
Tyler Renelle
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
Tyler Renelle
e98243e3d8 refactor(env): small cleanup 2014-12-12 21:07:38 +01:00
Matteo Pagliazzi
8935538b53 feat(loggly): enable json loggin and start loggin errors during cron 2014-12-12 20:05:37 +01:00
thehindenburg
7c6d8d4dc2 Update quests.styl
further white space cleanup
2014-12-12 11:02:55 -08:00
thehindenburg
670542f3ce cleaning up white space 2014-12-12 10:44:06 -08:00
Tyler Renelle
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
thehindenburg
2db80c6841 changed to style sheet 2014-12-12 10:26:55 -08:00
benmanley
45d30ffef5 fix(footerCtrl.js): disable addThis hover
Activate addThis dropdown on click/tap not on hover.
2014-12-12 17:41:45 +00:00
benmanley
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
thehindenburg
375253fb84 changing the reward text to clear the image 2014-12-12 09:38:13 -08:00
Matteo Pagliazzi
b10d4606f5 fix(loggly): typo and remove testing 2014-12-12 13:09:21 +01:00
Matteo Pagliazzi
af1ff6d740 feat(loggly): add test log, use only in production and add sample config 2014-12-12 12:17:48 +01:00
Matteo Pagliazzi
7356e0bafe feat(loggly): add loggly 2014-12-12 12:11:26 +01:00
Matteo Pagliazzi
948d5762cd fix(flag-message): small refactor 2014-12-12 11:39:22 +01:00
Blade Barringer
ac34332582 Made reset flag count button red 2014-12-12 11:05:22 +01:00
Blade Barringer
5b17b8b382 Made flag number more helpful 2014-12-12 11:05:22 +01:00
Blade Barringer
35675e3f28 Admin can see flag on own message 2014-12-12 11:05:21 +01:00
Blade Barringer
7d38eb3b59 Allow admin to reflag a message they've flagged and unflagged previously 2014-12-12 11:05:21 +01:00
Blade Barringer
595ac1c03e Made it impossible to flag own message in inbox 2014-12-12 11:05:21 +01:00
Blade Barringer
c737729470 Changed transparent class for admin to only appear if it is hidden 2014-12-12 11:05:21 +01:00
Blade Barringer
5f49031c5e Adjusted spacing of chat buttons 2014-12-12 11:05:21 +01:00
Blade Barringer
b1600198be Added method for letting an admin unhide a flagged message 2014-12-12 11:05:20 +01:00
Blade Barringer
eb36a53f6e Moved ng-class so it would update transparent class in real time after flaggging 2014-12-12 11:05:20 +01:00
Blade Barringer
6bb51c36e2 Admin flagging counts for more, automatically hides message 2014-12-12 11:05:20 +01:00
Blade Barringer
d6262efd3f Added note about how many flags a message has 2014-12-12 11:05:20 +01:00
Blade Barringer
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
Blade Barringer
d3d5430bf2 Always show message if admin 2014-12-12 11:05:20 +01:00
Blade Barringer
b056faeb34 Hide message if flag count is 2 or higher 2014-12-12 11:05:20 +01:00
Blade Barringer
45b91b1251 Added flagCount variable 2014-12-12 11:05:19 +01:00
Blade Barringer
27ebe1a0fe Converted sent transparency to ng-class instead of style 2014-12-12 11:05:19 +01:00
Blade Barringer
3771d38d48 Added fallback for is message does not contain flags key. Added error
for if message was already flagged by user
2014-12-12 11:05:19 +01:00
Blade Barringer
b6ae2302e8 User can only flag message after accepting community guidelines 2014-12-12 11:05:19 +01:00
Blade Barringer
739106f13e Updated message preview on flag abuse modal to use markdown interpretation 2014-12-12 11:05:19 +01:00
Matteo Pagliazzi
e84880d3e8 feat(flag-message): add server methods 2014-12-12 11:05:19 +01:00
Blade Barringer
6749109423 Added note for paglias 2014-12-12 11:05:19 +01:00
Blade Barringer
1a59815cc8 Added todo for paglias 2014-12-12 11:05:18 +01:00
Blade Barringer
bbf94aac64 Added text of message to make sure user clicked the right flag 2014-12-12 11:05:18 +01:00
Blade Barringer
dd68e6a29d Converted heading to paragraph 2014-12-12 11:05:18 +01:00
Blade Barringer
057a8b1a06 Prevent modal from popping up if already reported 2014-12-12 11:05:18 +01:00
Blade Barringer
6d656d3713 Give flag text danger class and already reported message if already
reproted
2014-12-12 11:05:18 +01:00
Blade Barringer
a22c3c5968 Error handling for if message already flagged 2014-12-12 11:05:18 +01:00
Blade Barringer
3c62e0b862 Added some logic for adding flags 2014-12-12 11:05:17 +01:00
Blade Barringer
50e8236008 Removed flag from system notifications 2014-12-12 11:05:17 +01:00