95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
7a1c5835d0
Final adjustments to PR #5114
...
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
2015-06-04 08:48:05 -05:00
2234c7219e
Moved invite friends button to under the subscribe button
2015-06-03 20:33:39 -05:00
09d32390f9
feat(Armoire): Item counter
...
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
2015-06-03 16:48:11 -05:00
af3ee8cfcd
feat(Armoire): Updates from feedback
...
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
2015-06-03 11:58:30 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
ee88ed4b44
Change signature of notification service
2015-06-02 12:33:21 -05:00
24c299783a
Merge branch 'TheHollidayInn-markdown-for-spells' into develop
2015-06-02 07:58:29 -05:00
b375c068de
Refactor notification service and add tests
2015-06-02 07:51:54 -05:00
e3f5c22fe8
Added start party option, locales, and plus button
2015-06-01 21:07:53 -05:00
3291062b31
Move markdown parsing to notification service
2015-06-01 17:49:27 -05:00
39f363ec29
Add tests for castEnd on root controller
2015-06-01 17:38:18 -05:00
766f3b6057
Merge pull request #5307 from HabitRPG/tutorial
...
Tutorial overhaul
2015-05-31 13:58:12 -07:00
8074648c70
Merge branch 'develop' into tutorial
...
Conflicts:
common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
91f93df7cc
Merge branch 'develop' into mixpanel
...
Conflicts:
config.json.example
2015-05-31 15:40:21 -05:00
d28ed6badf
Correct format of directive creation to work in un-minified state
...
Fixes #4606
2015-05-31 15:25:32 -05:00
a8ca01ba62
Added markdown filter to endCast notification
2015-05-30 22:00:29 -05:00
726a8f1acb
feat(analytics): Mixpanel implementation WIP
2015-05-29 16:22:35 -05:00
7a8046317d
feat(tour): Iteration 5/29
2015-05-29 15:14:19 -05:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
17842d2103
Adding Beffymaroo to moderators
2015-05-27 01:25:40 +02:00
5d93f364c1
Merge branch 'blade-hairlessbear_markdown_help_table' into develop
2015-05-24 22:47:02 -05:00
9b2798ee71
Refine markdown help
2015-05-24 22:45:09 -05:00
abbfdaeda5
Adjust NotGonnaGitUs's PR
...
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
2015-05-24 21:22:40 -05:00
165dd3a4a6
Fixes for minor visual inconsistencies with popovers and toolbars
...
Closes #5274 , closes #5272 , closes #5271
2015-05-24 15:34:12 -05:00
681668f131
Tweak @hairlessbear's pr
...
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
2015-05-24 09:20:12 -05:00
337a727390
Added hidable markdown help menu and adding to private messages
2015-05-23 22:51:40 -04:00
3c35b52d27
Hide contributor level if contribText func is not available; put math on scope
2015-05-15 23:08:26 -05:00
d6385a94e9
Front page now shows avatar with link
2015-05-15 22:31:47 -05:00
35ff90b4d3
Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins
2015-05-13 12:12:57 -05:00
29109051d7
feat(customize): Animal skins and ears
...
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
2ac763cc50
add message about Resting in the Inn to top of Dailies column when preferences.sleep is true
2015-05-13 16:56:52 +10:00
109ca1b67c
Correct bullet list position; fixes #5181
2015-05-10 14:16:11 -05:00
5123bdb4c4
Merge pull request #5080 from joyclark/develop
...
Fixing the grid view for mounts so that the animals are aligned correctly.
2015-05-10 19:01:56 +10:00
71c65c7a73
change coupon route in angular router to promo
2015-05-08 21:24:57 -05:00
382add82c3
feat(tutorial): put tut back in, we just need to replace it in near future
2015-05-08 12:58:43 -04:00
8569f7b749
Merge branch 'joyclark-autocomplete-click-behavior' into develop
2015-05-08 08:45:06 -05:00
e628dba5e8
Merge pull request #5087 from negue/copyMessageTodo
...
copy chat messages as todo
2015-05-07 22:21:42 +02:00
4f7c9cd445
feat(guide): temporarily remove current tutorial, add simple ? to expand help
2015-05-07 14:31:53 -04:00
7d08358791
fix(registration) do not re-enable registrations if the first one is successfull
2015-05-06 16:23:15 +02:00
8066589268
disable registration while request in progress
2015-05-06 15:43:30 +02:00
a090fed10b
feat(analytics): "motivate yourself" 3 variants @lemoness
2015-05-04 15:31:00 -04:00
4450a5d7c3
Fixes #5094 Now show list based on whether or not a search query is defined. The autocomplete function from the directive is encapsulated so that it can be called and then the query can be set to null.
2015-05-03 18:14:28 +02:00
b2bad4d77f
Update todo preview in dialog
2015-05-03 17:12:08 +02:00
e4b21ac325
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
2015-04-29 17:19:24 -05:00
78249122f7
Ignore casing when searching for user name in autocomplete
2015-04-29 08:21:13 -05:00
6e35c45d5f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into joyclark-autocomplete_unit_tests
2015-04-29 07:50:33 -05:00
df1c349ea7
Fixing #5706 filtering system messages results in errors.
2015-04-27 23:01:15 +02:00
Sabe Jones