7f10049b37
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
views/options/social/chat-message.jade
2014-12-18 21:55:50 -06:00
396176f14f
Quest completion screen floats to right on everything but xs
2014-12-14 08:32:05 -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
2db80c6841
changed to style sheet
2014-12-12 10:26:55 -08:00
375253fb84
changing the reward text to clear the image
2014-12-12 09:38:13 -08:00
d70de5972e
added the image to the end screen and made adjustments to the line
2014-12-11 22:28:07 -08:00
a95947b2dc
Made reset flag count button red
2014-12-11 21:49:42 -06:00
38cd0e8de1
Added method for letting an admin unhide a flagged message
2014-12-11 17:29:01 -06:00
9bd0304223
Updated message preview on flag abuse modal to use markdown interpretation
2014-12-11 10:23:29 -06:00
ae6e0255c6
feat(flag-message): add server methods
2014-12-07 14:35:09 +01:00
aafda2dad1
Added text of message to make sure user clicked the right flag
2014-12-07 13:50:47 +01:00
8537c96eb6
Converted heading to paragraph
2014-12-07 13:50:47 +01:00
62d92db332
Added buttons to footer, cleaned up functions
2014-12-07 13:50:46 +01:00
01c0ce1722
Added text-danger span on username
2014-12-07 13:50:46 +01:00
6fcf1846b3
Renamed everything from flag to abuseFlag
2014-12-07 13:50:46 +01:00
00abb168a1
Added heading and body of flag modal
2014-12-07 13:50:46 +01:00
5e1e1b2c13
Flag icon opens blank modal
2014-12-07 13:50:46 +01:00
d2e230db1f
fix(plans): various bug fixes
2014-12-03 18:34:26 -07:00
0a53a5717e
refactor(payments): move payments into it's own service, out of rootCtrl
2014-12-03 14:17:08 -07:00
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
7e9b92fcad
feat(gifts): allow gifting from balance
2014-12-03 14:17:07 -07:00
66b4dae0d9
feat(news): move old news to /static/old-news, better use of content space
2014-12-03 13:49:24 -07:00
44baa822c8
Adjusted ng-hide so users cannot block themeselves
2014-11-30 10:50:39 -06:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
b15e239601
Merge branch 'Alys-communityGuidelines' into develop
2014-10-27 16:20:30 -06:00
1ca6d7a55b
Removed second binding
2014-10-17 13:02:26 -05:00
8f6dc64b10
Corrected html not showing up correctly in quest modal
2014-10-17 12:45:16 -05:00
8427c53d90
release pets feature
2014-09-29 13:35:38 -07:00
9cd323294a
disable feature to block chat until use agreed to guidelines; remove unneeded code; adjust last-updated date to today
2014-09-14 12:39:25 +10:00
c68a061c0d
experimental changes for indicating acceptance of guidelines
2014-09-07 15:14:58 +10:00
82eb6bff3c
adjust community guidelines modal for new static location and comment it out because not currently needed
2014-09-05 21:20:41 +10:00
3b9b6b78bc
add Community Guidelines document and its images; add jade modal for displaying it
2014-09-05 21:17:56 +10:00
a4ae9332bb
feat(block-user): show "blocked" status in an alert, log the user out
2014-07-25 12:14:48 -06:00
6e29facb98
feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness
2014-07-25 12:14:48 -06:00
8cfcf8db10
make it really obvious that you can choose a class later
2014-07-13 16:09:43 +10:00
d848faee8e
fix(quests): show completion dialog
2014-07-12 14:32:13 -06:00
45ab28269a
feat(jade): split file to be used on mobile
2014-07-12 15:50:15 +02:00
8175f01f23
create new static view for news
2014-06-21 18:38:30 +02:00
040f922d95
chore(bailey): summer update + new gear, npcs, etc
2014-06-20 15:09:14 -06:00
81ab40f89f
summer
2014-06-19 23:15:24 -06:00
7e11d970a8
fix(i18n): use string
2014-06-16 21:55:31 +02:00
2aacf63308
feat(backgrounds): bailey
2014-06-10 18:52:13 -06:00
f85d6b2978
feat(quests): add octopus quest
2014-06-09 14:33:08 -06:00
74d206ab74
fix(i18n): use strings
2014-06-07 14:26:58 +02:00
4aa938dfd9
chore(bailey): june mystery item, earthquake thingy
2014-06-05 22:59:06 -06:00
29be5d6e3e
feat(mystery): may 2014 mystery item
2014-05-23 00:34:32 +02:00
96c9c7f101
chore(bailey): bailey on level-100 cap
2014-05-14 12:14:46 -06:00
8506db9849
feat(rat): add rat quest
2014-05-14 08:54:24 -06:00
304beb6482
fix(i18n): use strings
2014-05-12 17:15:38 +02:00
Blade Barringer