Blade Barringer
4abd7f85f8
Adjustments to PR#5494
...
* Update filter name to be more accurate
* Add additional tests
* Simplify checklist checking logic
* Prevent errors from multiple matches in checklist
2015-06-27 22:21:50 -05:00
Blade Barringer
3ab27f32d2
Refactored editTask into TaskService
2015-06-16 23:11:04 -05:00
Blade Barringer
831f5b89bd
Merge branch 'develop' into nthomsn-develop
2015-06-14 01:27:35 -05:00
Blade Barringer
0eb8caec23
Various task ui improvements
...
* Use bootstrap form-control class for text and notes
* Can't edit start date or days of the week in challenge dailies from website
* Refactor dailies
2015-06-13 22:29:06 -05:00
Blade Barringer
9d4713bdf3
Merge pull request #5392 from GitHubSphinx/Sphinx-entry1
...
Still addressing #5202 - making Click for help button translatable
2015-06-13 18:01:57 -05:00
Blade Barringer
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
GihHubSphinx
fc5cb5d228
Still addressing #5202
...
The last thing left as it seems is Click for help toolbar
2015-06-12 17:42:40 +05:00
Blade Barringer
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -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
Nicholas Thomson
867308975f
Merge https://github.com/HabitRPG/habitrpg into develop
2015-06-11 08:40:36 -07: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
f72ed18a77
Merge pull request #5350 from hairlessbear/task_links_fix
...
Added links to multiple task help phrases (fixes #5349 )
2015-06-10 17:46:15 -05: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
Sabe Jones
973e7cb8ef
fix(new-task): Novalidate
...
Adds the "novalidate" flag to the task-add form so browser-level form validations don't act on our field. Fixes #3705 .
2015-06-08 14:15:45 -05:00
hairlessbear
b1b8dc18af
Made links translatable
2015-06-07 13:17:57 -04:00
Blade Barringer
c8ed73f685
Added help text for startDate
2015-06-07 00:06:31 -05:00
Blade Barringer
e6ed0c961d
Simplify datepickers
2015-06-06 23:27:03 -05:00
Blade Barringer
91390138bb
Make reward price required
2015-06-06 23:17:10 -05:00
Blade Barringer
41d0f505f3
Simplify datepicker
2015-06-06 22:34:02 -05:00
Blade Barringer
047902ac62
Use input type date for datepicker
2015-06-06 17:55:36 -05:00
Blade Barringer
bf48671c7a
Add validation to everyX
2015-06-06 17:55:21 -05:00
Blade Barringer
ae1d10ed30
Merge branch 'blade-Finish_weeklies_pr' into refactor-tasks-jade
2015-06-05 17:37:46 -05:00
Blade Barringer
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
hairlessbear
16f0ece2f8
Removed ! from 'env.t' that don't have html characters
2015-06-05 09:44:19 -04:00
hairlessbear
d26e4780fd
Added links to multiple task help phrases
2015-06-05 09:26:33 -04:00
Blade Barringer
dc9bb35244
Add ng-form
2015-06-05 07:40:48 -05:00
Blade Barringer
403075262d
Remove bindonce symbol from ng-repeat
2015-06-05 07:26:03 -05:00
Blade Barringer
099e0abeed
Restore restore streaks functionality
2015-06-05 07:20:59 -05:00
Blade Barringer
701fa2455f
Refactor task views
2015-06-04 21:37:01 -05:00
Blade Barringer
b132b3c4fa
Make advanced options a button
2015-06-04 17:48:59 -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
076f7f0db9
Create translatable strings for dailies
2015-06-03 21:48:38 -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
Blade Barringer
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -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
dc4359ab6f
Remove monthly option
2015-05-27 12:32:14 -05:00
Blade Barringer
8b347bca8b
Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI
2015-05-26 17:59:11 -05:00
Blade Barringer
664bf491d2
Adjust fallenPanda's PR
...
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
2015-05-22 22:14:58 -07: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
Blade Barringer
f7f126c352
Add alert box to dailies resting in the inn message
2015-05-13 07:29:17 -05:00
Alys
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
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
Negue
b2bad4d77f
Update todo preview in dialog
2015-05-03 17:12:08 +02:00
Blade Barringer
1f85b5bf67
add hack to have both mouseover and persisten click behavior
2015-05-01 22:12:00 -05:00
Negue
75579a7c36
add previewMarkdown / click as popover-trigger / misc changes
2015-04-27 19:23:56 +02: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
Alys
9aaf252628
Merge pull request #5016 from hairlessbear/develop
...
Changed Difficulty link from Trello to Wiki
2015-04-14 22:32:14 +10:00