68e613c3fc
Simplified count checks in keys to the kennel modal. Adjusted balance for releaseBoth to be correct
2015-01-02 14:11:59 -06:00
87d78618d8
Changed keys of the kennel npc to Matt
2015-01-02 13:46:21 -06:00
406edcb761
Added releaseBoth script and refactored keys to the kennel modal
2015-01-02 13:33:41 -06:00
7f2648eafb
Renamed release scripts
2015-01-02 12:43:40 -06:00
488a53f1cf
Corrected comment title
2015-01-01 17:16:23 -06:00
0fd3f290b8
Merge branch 'develop' into mountmaster
2014-12-31 13:14:11 -06:00
ccfe48099f
fix(NYE): fix cards
...
Improve random messages and have Bailey give instruction on where to find cards.
2014-12-30 23:25:34 -06:00
d1355faa31
Merge pull request #4452 from SabreCat/nye
...
New Year's event features
2014-12-30 22:18:11 -06:00
edf66cbb59
feat(discount) google discount & use sub.key instead of sub.months
2014-12-30 20:05:07 -07:00
e35722865a
fix(NYE): I18N for random text
2014-12-30 20:52:06 -06:00
d8cfc1dd4b
WIP(NYE): New Year's cards
2014-12-29 20:58:28 -06:00
0ddbbc93a3
Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop
2014-12-29 18:33:14 -06:00
8bdc0d55b9
Private Message (PM / DM) textbox is too small #4425
2014-12-28 23:53:15 -06:00
c4e62fc79b
Private Message (PM / DM) textbox is too small #4425
2014-12-28 23:51:37 -06:00
7297429888
Make it possible to choose between MM/dd and dd/MM date format
2014-12-26 15:52:42 -05:00
e391fc04f0
Add variables for medium-length date display
2014-12-26 15:52:42 -05:00
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
cea2879539
Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster
2014-12-11 08:15:18 -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
506ac6ebe7
added mountmaster support
...
inventoryCtrl: Changed Matt to show 90 mounts instead of 180
notificationCtrl: added mountmaster achievement test
userCtrl: added scope.profile.mountCount
user.js: added fields for mountMaster and mountMasterCount (not used
yet), mountCount function
modals/achievements.jade - added modal dialog for mountmaster (note:
wolf graphic was not available locally)
profiles/achievements - jade - mountmaster added
stats.jade -- uncommented broken Mounts Tamed section, since it works
now
2014-10-30 12:35:40 -07: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
Blade Barringer