Commit Graph

36 Commits

Author SHA1 Message Date
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
5d56bd02ef Merge branch 'develop' into blade-feature/search 2015-06-13 00:10:44 -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
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
dc9bb35244 Add ng-form 2015-06-05 07:40:48 -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
Blade Barringer
076f7f0db9 Create translatable strings for dailies 2015-06-03 21:48:38 -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
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
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
Alys
0083c3f881 Revert "Put list back into removeTask fn, update removal logic within challegeCtrl" 2015-04-13 19:34:59 +10:00
hairlessbear
91562c82b4 changed Difficulty link from Trello to Wiki 2015-04-11 23:23:25 -04:00
hairlessbear
54578366b2 Revert "Changed Difficulty link from Trello to Wiki"
This reverts commit 0f7ccca00b.
2015-04-11 21:53:20 -04:00
hairlessbear
0f7ccca00b Changed Difficulty link from Trello to Wiki
Changed the Difficulty link from the Trello feature request to the
appropriate wiki page
2015-04-11 21:49:57 -04:00
Kevin Gisi
860ca9fc16 Put list back into removeTask function, update removal logic within challengeCtrl 2015-04-08 23:03:45 -04:00
Kevin Gisi
f12d56e456 Revert "Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos"
This reverts commit 33f928b6d8, reversing
changes made to 76ef1fdd92.
2015-04-07 22:38:43 -04:00
Kevin Gisi
9bb2f46264 Modify removeTask to accept a task object. Update task view to reflect new method signature. 2015-04-07 22:38:20 -04:00
Blade Barringer
cc674f57cd Revert "Sorted dated todos by date." 2015-04-07 19:51:27 -05:00
Kevin Gisi
ac01d9ad8b Sorted dated todos by date. 2015-04-06 03:47:00 -04:00
Alys
6199e1d843 Merge branch 'remove-interactivity-challenge-tasks' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-remove-interactivity-challenge-tasks
Conflicts:
	website/public/css/tasks.styl
	website/views/shared/tasks/task.jade
2015-04-05 22:01:10 +10:00
kholliday
824561bb57 Removed delete function when user hits backspace/delete 2015-03-20 14:03:20 -05:00
Brian Chen
9bab79790c Change task's bo-id to id with angular's {{::}}. Fixes #4430 2015-03-19 10:16:53 +08:00
kholliday
67b38f71f9 Removed styles and sorting ability for locked tasks (Challenge tasks) 2015-03-18 14:39:23 -05:00
Blade Barringer
cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
2015-02-03 21:13:55 -06:00
Blade Barringer
8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00