TheHollidayInn
caec2d8476
Added editTask function back
2015-06-17 23:04:42 -05:00
TheHollidayInn
838c912906
Moved clone tasks function to task service
2015-06-17 22:22:55 -05:00
TheHollidayInn
e9269d332c
Removed dateCreated from being cloned in tasks
2015-06-17 21:08:33 -05:00
TheHollidayInn
b81024bdd6
Fixed task clone functionality and updated code organization/semantics
2015-06-17 21:08:33 -05:00
TheHollidayInn
9ed3fbf613
Clone gems, all task info, and spacing.
2015-06-17 21:08:33 -05:00
TheHollidayInn
7890abe31a
Added clone ability to challenges.
2015-06-17 21:08:03 -05:00
Blade Barringer
4da3018ad9
Simplify editTask
2015-06-17 07:51:07 -05:00
Blade Barringer
3ab27f32d2
Refactored editTask into TaskService
2015-06-16 23:11:04 -05:00
hairlessbear
18fe4b6166
Fix task advanced settings display setting ( fixes #5408 )
2015-06-16 00:52:48 -04:00
Blade Barringer
00c50f1212
Fixes #4816
2015-06-14 21:17:18 -05:00
Blade Barringer
bb73253e8e
Make party page sync the party automatically
2015-06-14 19:26:01 -05:00
Blade Barringer
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -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
3e32d4244f
Adjust formatting of task ordering filter
2015-06-13 12:39:20 -05:00
Blade Barringer
8faf96f5b9
Refactored filters
2015-06-13 12:39:11 -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
2c52829256
Implement filter tasks by text & notes
...
In order to be able to filter tasks by it's text or notes - we need an
extra filter to be implemented, because angular does not support OR
condition for it's default filter directive.
2015-06-11 20:39:29 +02: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
dabb6244e7
Merge pull request #5370 from gisikw/split-out-directives
...
Split out Angular directives
2015-06-09 07:42:12 -05:00
Kevin Gisi
23f62a9c40
Change idle refresh to every six hours
2015-06-09 04:24:58 -04:00
Kevin Gisi
ab968a4744
Refresh if idle > 60min
2015-06-09 03:09:31 -04:00
Kevin Gisi
e64d209992
Improve from-now directive (implement optimization from comments)
2015-06-08 10:02:45 -04:00
Kevin Gisi
7ef98ff7e2
Split directives into separate files
2015-06-08 10:02:44 -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
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
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
Sabe Jones
8074648c70
Merge branch 'develop' into tutorial
...
Conflicts:
common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
