Commit Graph

151 Commits

Author SHA1 Message Date
Sabe Jones
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
Sabe Jones
c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Nick Tomlin
ee88ed4b44 Change signature of notification service 2015-06-02 12:33:21 -05:00
Blade Barringer
24c299783a Merge branch 'TheHollidayInn-markdown-for-spells' into develop 2015-06-02 07:58:29 -05:00
Blade Barringer
b375c068de Refactor notification service and add tests 2015-06-02 07:51:54 -05:00
Blade Barringer
3291062b31 Move markdown parsing to notification service 2015-06-01 17:49:27 -05:00
Blade Barringer
39f363ec29 Add tests for castEnd on root controller 2015-06-01 17:38:18 -05:00
Sabe Jones
766f3b6057 Merge pull request #5307 from HabitRPG/tutorial
Tutorial overhaul
2015-05-31 13:58:12 -07:00
Sabe Jones
8074648c70 Merge branch 'develop' into tutorial
Conflicts:
	common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
Sabe Jones
91f93df7cc Merge branch 'develop' into mixpanel
Conflicts:
	config.json.example
2015-05-31 15:40:21 -05:00
Blade Barringer
d28ed6badf Correct format of directive creation to work in un-minified state
Fixes #4606
2015-05-31 15:25:32 -05:00
TheHollidayInn
a8ca01ba62 Added markdown filter to endCast notification 2015-05-30 22:00:29 -05:00
Sabe Jones
726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Sabe Jones
7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00
Sabe Jones
6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
Blade Barringer
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
Blade Barringer
3c35b52d27 Hide contributor level if contribText func is not available; put math on scope 2015-05-15 23:08:26 -05:00
Sabe Jones
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
Blade Barringer
71c65c7a73 change coupon route in angular router to promo 2015-05-08 21:24:57 -05:00
Tyler Renelle
382add82c3 feat(tutorial): put tut back in, we just need to replace it in near future 2015-05-08 12:58:43 -04:00
Blade Barringer
8569f7b749 Merge branch 'joyclark-autocomplete-click-behavior' into develop 2015-05-08 08:45:06 -05:00
negue
e628dba5e8 Merge pull request #5087 from negue/copyMessageTodo
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Tyler Renelle
4f7c9cd445 feat(guide): temporarily remove current tutorial, add simple ? to expand help 2015-05-07 14:31:53 -04:00
Matteo Pagliazzi
7d08358791 fix(registration) do not re-enable registrations if the first one is successfull 2015-05-06 16:23:15 +02:00
Matteo Pagliazzi
8066589268 disable registration while request in progress 2015-05-06 15:43:30 +02:00
Tyler Renelle
a090fed10b feat(analytics): "motivate yourself" 3 variants @lemoness 2015-05-04 15:31:00 -04:00
Joy Clark
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
Blade Barringer
e4b21ac325 Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo 2015-04-29 17:19:24 -05:00
Blade Barringer
78249122f7 Ignore casing when searching for user name in autocomplete 2015-04-29 08:21:13 -05:00
Blade Barringer
6e35c45d5f Merge branch 'develop' of github.com:HabitRPG/habitrpg into joyclark-autocomplete_unit_tests 2015-04-29 07:50:33 -05:00
Joy Clark
df1c349ea7 Fixing #5706 filtering system messages results in errors. 2015-04-27 23:01:15 +02:00
Negue
189423b0db markdown preview - code "inherit white-space" / hide links for 'system' 2015-04-27 19:47:42 +02:00
Negue
75579a7c36 add previewMarkdown / click as popover-trigger / misc changes 2015-04-27 19:23:56 +02:00
Blade Barringer
a94aad7a22 Fix comment 2015-04-26 20:43:32 -05:00
Joy Clark
f214428411 Improved filter function as described in #5085 and added unit tests. 2015-04-26 17:50:53 +02:00
Joy Clark
0a2890d1eb #1866 changed parameter name for function so that it is no longer "item" 2015-04-25 21:24:56 +02:00
Negue
78dd949f20 copy chat messages as todo 2015-04-25 18:30:11 +02:00
Joy Clark
94c5da32d6 a proposed solution to issue #1866 Redefined the filter function to match based on prefix 2015-04-25 16:23:57 +02:00
Kevin Gisi
65e42345f2 Ensure correct join/leave button for parties 2015-04-24 11:54:00 -04:00
Kevin Gisi
705f9016c5 Use minification-friendly syntax 2015-04-22 12:04:04 -04:00
Alys
7c36e49243 Merge pull request #5022 from gisikw/dated-tasks-correct-impl
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
Kevin Gisi
a05714405a Inject RootCtrl into MemberModalCtrl to expose shared methods 2015-04-21 05:17:15 -04:00
Tyler Renelle
cfc8ff96e6 feat(tour): tmp set variant=2 to (counter + finish button) until we can
get google experiment working
2015-04-16 20:17:13 -06:00
Blade Barringer
1d95784dde refactor isMemberOfGroup and tests 2015-04-16 07:58:35 -05:00
Blade Barringer
4853c0814d Corrected function 2015-04-16 07:39:55 -05:00
Kevin Gisi
160982df33 Simplify group detection logic for guilds 2015-04-15 23:10:12 -04:00
Kevin Gisi
d455666650 Join/Leave buttons on guild detail page. Addresses #4427 2015-04-15 06:15:11 -04:00
Kevin Gisi
b503a0fd64 Repaired task reordering issue
* Created `conditionalOrderBy` filter with a similar signature to `orderBy`,
  using a single conditional argument that when false, causes the filter to
  return the array unchanged

* Updated task view to use `conditionalOrderBy`

* Added karma specs for `conditionalOrderBy` filter
2015-04-13 08:51:08 -04:00
Kevin Gisi
02838214c7 Reimplement (broken) task ordering 2015-04-13 07:47:56 -04:00
Alys
8af1f0538b revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996 2015-04-13 20:16:24 +10:00