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 33f928b6d876ef1fdd92
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
Sabe Jones
f0e7f0464c
fix(seasonal): NO FLOWERS
...
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
2015-04-01 23:07:36 -05:00
Sabe Jones
b6a4d65d8c
feat(seasonal): Shiny Seed
2015-04-01 22:36:07 -05:00
Alys
0fc158be2e
Merge pull request #4893 from TheHollidayInn/checklist-removed-backspace-delete
...
Removed delete function when user hits backspace/delete
2015-03-25 18:00:31 +10:00
kholliday
e5cd319ef5
Changed empty task messageand added style.
2015-03-23 20:18:14 -05:00
kholliday
9a157eea8c
Added tooltip for when a task is empty
2015-03-23 19:36:37 -05:00
kholliday
824561bb57
Removed delete function when user hits backspace/delete
2015-03-20 14:03:20 -05:00
Tyler Renelle
84a77695ea
feat(ads): remove ads completely
2015-03-19 11:39:17 -06: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
Tyler Renelle
d84549e239
feat(interactive-tour): disable ads till lvl 2
2015-03-10 15:40:18 -06:00
Tyler Renelle
812493fec5
feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides
2015-03-10 15:40:18 -06:00
Bill Parrott
98c6526cf7
add auto-focus when single/multiple is toggled
2015-02-19 08:46:45 -06:00
Bill Parrott
4563d22bf0
minor updates from code review
2015-02-17 14:05:09 -06:00
Bill Parrott
2de3a5dd55
first draft of bulk add
2015-02-17 00:25:56 -06: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
