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 |
|
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 |
|