Blade Barringer
3ab27f32d2
Refactored editTask into TaskService
2015-06-16 23:11:04 -05:00
Blade Barringer
2134465a75
Impliment check for leader object's existence in challenge search
2015-06-13 20:50:32 -05:00
Blade Barringer
6513527d8b
Refactor challenges filter
2015-06-13 19:41:41 -05:00
Blade Barringer
ddb28c0305
Merge branch 'develop' into TheHollidayInn-challenges-owner-filter
2015-06-13 18:23:51 -05:00
Blade Barringer
b052f803e4
Initialize user.filterQuery as undefined
2015-06-13 14:09:08 -05:00
Blade Barringer
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
Blade Barringer
2f1111522c
Adjust PR #5389
...
* Convert $watch to ng-change and re-wrote test
* Removed unnecessary styles
* Use .form-control instead of class='form-control'
2015-06-12 09:05:06 -05:00
Jiri Chara
0b74736cf2
Remove unused dependency
2015-06-11 09:18:20 +02:00
Jiri Chara
df7d36923c
Enable filtering for tasks and custom rewards
...
Add search input box next to the tags. When user changes the value of
the input box then it's propagated to the user service as filterQuery
string. filterQuery string is then used in the tasks template to filter
tasks by text.
2015-06-11 09:10:31 +02:00
Blade Barringer
1d18f53a67
Merge branch 'develop' into blade-Finish_weeklies_pr
...
Added Sabe's novalidate change to adding a new task
2015-06-10 07:53:37 -05:00
Kevin Gisi
ad6443c5b8
Ensure reload on transition from challeng edit -> detail
2015-06-09 09:28:38 -04:00
Kevin Gisi
50bbe5b2f5
Fixes #5001
...
Singleton challenge edit -> detail on save
2015-06-09 09:28:38 -04:00
Blade Barringer
41d0f505f3
Simplify datepicker
2015-06-06 22:34:02 -05:00
Blade Barringer
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
Sabe Jones
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
Sabe Jones
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
Blade Barringer
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
Blade Barringer
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
Blade Barringer
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
Sabe Jones
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
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
Blade Barringer
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
Sabe Jones
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
Blade Barringer
24c299783a
Merge branch 'TheHollidayInn-markdown-for-spells' into develop
2015-06-02 07:58:29 -05:00
TheHollidayInn
e3f5c22fe8
Added start party option, locales, and plus button
2015-06-01 21:07:53 -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
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
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
Allen Pan
a763a3a3da
Cleaned up task.jade file:
...
- moved ugly html newlines into the stylesheet
- renamed temporary var for datePicker’s ngmodel from _dateString to _tempDateForPicker
- renamed open -> openDatePicker, and have the function track datePicker’s open/closed state on a per task instead of global basis
2015-05-15 20:24:47 -07:00
Allen Pan
1ecf608408
Added support in daily tasks for specifying ’every X days’ and ‘every X weeks on specific days of the week’.
...
- shouldDo() now takes the entire task as an input instead of just the ‘repeat’ (days of the week) dictionary.
- the ‘start’ date for a task can be specified (and can also be in the future, in which case it will be greyed out until then.) ‘start’ date also affects ‘every X days’ and ‘every X weeks’.
- no migration code yet.
2015-05-15 20:24:46 -07: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
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
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
