Commit Graph

92 Commits

Author SHA1 Message Date
Blade Barringer c941511d11 Merge branch 'barbourkd-develop' into develop 2015-07-11 00:11:23 -05:00
Blade Barringer 50a924e470 Add space 2015-07-11 00:11:02 -05:00
Kevin Barbour 5a57895077 Show Extra Notes icon regardless of task ownership.
fixes #5552
2015-07-08 20:48:42 -04:00
Kevin Barbour d6aef8ee24 Prevent "Resting in the Inn" message when viewing challenges.
fixes #5559
2015-07-08 20:22:23 -04:00
Blade Barringer e924157fdf Merge pull request #5508 from Alys/trivial-difficulty
add Trivial difficulty/priority setting to task Advanced Options
2015-07-03 10:08:46 -05:00
hairlessbear ebbc6666a6 Modified broken challenge icon to cause cursor to show item as clickable 2015-07-01 18:00:49 -04:00
hairlessbear 6e5f741e4a Changed task notes from 'span' to 'a' element to cause cursor to show item as clickable 2015-07-01 17:53:45 -04:00
Sabe Jones d248b74569 fix(event): Splash visual tweaks 2015-07-01 14:21:37 -05:00
Sabe Jones 25dd82ffa0 feat(event): Summer Splash cont'd
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
Alys 122920975d add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines) 2015-06-28 14:41:02 +10:00
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