 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 |
|
|
Blade Barringer
|
d5d83d67e9
|
Renamed flagChat to flagChatMessage
|
2014-12-12 11:05:17 +01:00 |
|
|
Blade Barringer
|
e2c0a41f88
|
Added a flags key to message object
|
2014-12-12 11:05:17 +01:00 |
|
|
Blade Barringer
|
9fd4588b74
|
Added buttons to footer, cleaned up functions
|
2014-12-12 11:05:16 +01:00 |
|
|
Blade Barringer
|
658046024e
|
Corrected tooltip name
|
2014-12-12 11:05:16 +01:00 |
|
|
Blade Barringer
|
f50f40b77d
|
Added text-danger span on username
|
2014-12-12 11:05:16 +01:00 |
|
|
Blade Barringer
|
ee9214396b
|
Renamed everything from flag to abuseFlag
|
2014-12-12 11:05:16 +01:00 |
|
|
Blade Barringer
|
b3a56b6ded
|
Added heading and body of flag modal
|
2014-12-12 11:05:15 +01:00 |
|
|
Blade Barringer
|
1e3a07b8b5
|
Flag icon opens blank modal
|
2014-12-12 11:05:15 +01:00 |
|
|
thehindenburg
|
d70de5972e
|
added the image to the end screen and made adjustments to the line
|
2014-12-11 22:28:07 -08:00 |
|
|
Tyler Renelle
|
ae762837e2
|
refactor(challenges): cleanup challenge-creation. can use async.auto to
keep variables around, no need to set parent closure vars
|
2014-12-11 21:35:41 -07:00 |
|
|
Tyler Renelle
|
3027ccff83
|
fix(plans): fix fields which are NaN
|
2014-12-11 21:06:38 -07:00 |
|
|
Blade Barringer
|
a95947b2dc
|
Made reset flag count button red
|
2014-12-11 21:49:42 -06:00 |
|
|
Blade Barringer
|
dff7a74135
|
Made flag number more helpful
|
2014-12-11 21:47:06 -06:00 |
|
|
Blade Barringer
|
a0a4378465
|
Admin can see flag on own message
|
2014-12-11 21:44:58 -06:00 |
|
|
Blade Barringer
|
a021ab2896
|
Allow admin to reflag a message they've flagged and unflagged previously
|
2014-12-11 21:43:01 -06:00 |
|
|
Blade Barringer
|
3c2319b63c
|
Made it impossible to flag own message in inbox
|
2014-12-11 21:42:39 -06:00 |
|
|
Blade Barringer
|
c67da1804a
|
Changed transparent class for admin to only appear if it is hidden
|
2014-12-11 21:40:25 -06:00 |
|
|
Blade Barringer
|
6b8280ccbb
|
Adjusted spacing of chat buttons
|
2014-12-11 17:41:54 -06:00 |
|
|
Blade Barringer
|
38cd0e8de1
|
Added method for letting an admin unhide a flagged message
|
2014-12-11 17:29:01 -06:00 |
|
|
Tyler Renelle
|
14a38033f9
|
Merge branch 'negue-iap_verification' into develop
|
2014-12-11 14:51:31 -07:00 |
|
|
Blade Barringer
|
f9c00003f3
|
Moved ng-class so it would update transparent class in real time after flaggging
|
2014-12-11 13:38:57 -06:00 |
|
|
Blade Barringer
|
8ac3e312ed
|
Admin flagging counts for more, automatically hides message
|
2014-12-11 13:34:43 -06:00 |
|
|
Blade Barringer
|
db1f24e7b4
|
Added note about how many flags a message has
|
2014-12-11 13:12:50 -06:00 |
|
|
Blade Barringer
|
c8c64a1b81
|
Allow admin to see messages that have been flagged more than twice, but
make them semi-transparent
|
2014-12-11 13:09:00 -06:00 |
|
|
Blade Barringer
|
1fb73b35ab
|
Always show message if admin
|
2014-12-11 13:05:48 -06:00 |
|
|
Blade Barringer
|
4718641d3e
|
Hide message if flag count is 2 or higher
|
2014-12-11 13:01:50 -06:00 |
|
|
Blade Barringer
|
6fb531234d
|
Added flagCount variable
|
2014-12-11 13:00:25 -06:00 |
|
|
Blade Barringer
|
d24f6ad1ac
|
Converted sent transparency to ng-class instead of style
|
2014-12-11 12:45:25 -06:00 |
|
|
Blade Barringer
|
d8515fc8de
|
Added fallback for is message does not contain flags key. Added error
for if message was already flagged by user
|
2014-12-11 12:16:57 -06:00 |
|
|
Blade Barringer
|
564677340c
|
User can only flag message after accepting community guidelines
|
2014-12-11 10:29:12 -06:00 |
|
|
Blade Barringer
|
9bd0304223
|
Updated message preview on flag abuse modal to use markdown interpretation
|
2014-12-11 10:23:29 -06:00 |
|
|
Blade Barringer
|
0cf7bba822
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
|
2014-12-11 10:21:19 -06:00 |
|
|
Blade Barringer
|
6f459f33e4
|
Added fields for total pet/mount count as well as achievment progress
|
2014-12-11 10:09:09 -06:00 |
|
|
Matteo Pagliazzi
|
29382d18f7
|
fix(reset-password): use array for variables
|
2014-12-11 17:05:31 +01:00 |
|
|
Matteo Pagliazzi
|
1761752240
|
use email server for reset-password
|
2014-12-11 16:51:39 +01:00 |
|
|
Blade Barringer
|
cea2879539
|
Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster
|
2014-12-11 08:15:18 -06:00 |
|
|
Blade Barringer
|
e79126bf59
|
Merge pull request #4372 from thehindenburg/optoutspace
added space in Jade to the arrow and opt out text in the inbox
|
2014-12-10 15:51:38 -06:00 |
|
|
Tyler Renelle
|
f9cc2adda5
|
fix(iap): iap verification fixes
|
2014-12-10 14:25:00 -07:00 |
|
|
Negue
|
bb37c163cf
|
fix spacing
|
2014-12-10 14:21:03 -07:00 |
|
|
Negue
|
d92832bfb2
|
Hopefully a working IOS Verification
|
2014-12-10 14:21:03 -07:00 |
|
|
Negue
|
ecf20f423c
|
IAP Verification for Android
|
2014-12-10 14:21:03 -07:00 |
|
|
Negue
|
b59a70f128
|
more dummy controller, just for iap data
|
2014-12-10 14:21:02 -07:00 |
|
|
Negue
|
cc4812712a
|
dummy iap verify routes
|
2014-12-10 14:21:02 -07:00 |
|
|
Negue
|
2ea12d5c71
|
Add in-app-purchase Package
|
2014-12-10 14:21:02 -07:00 |
|
|
thehindenburg
|
799934c31b
|
added space in Jade to the arrow and opt out text in the inbox
|
2014-12-10 12:31:09 -08:00 |
|
|
Blade Barringer
|
7fb1e69927
|
Changed inbox text to use an env.t var
|
2014-12-10 10:47:05 -06:00 |
|
|
Blade Barringer
|
4af70a2a0f
|
Made invite button for guild invitations part of an input-group
|
2014-12-10 09:47:58 -06:00 |
|