f93e0ba6b9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
...
Conflicts:
views/shared/tasks/task.jade
2015-01-19 17:06:19 +00:00
2c88be85cf
fix(tasks): vertically align habit buttons
...
* When a task has + and - buttons, display the buttons vertically and
expand them to fill the full height of the task.
* Use glyphicons for + and - icons
2015-01-19 16:41:01 +00:00
57637d4271
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
ally if it merges an updated upstream into a topic branch.
2015-01-19 17:52:54 +10:00
b73518af5f
Removed $root from view
2015-01-18 22:54:07 -06:00
1c771fa4db
fixed bug where +habits would behave strangely when targeted by spells
2015-01-14 02:06:41 -05:00
7b9514dc5d
fix final bit of conflict
2015-01-11 14:54:41 +10:00
7660141365
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
Conflicts:
views/shared/tasks/lists.jade
views/shared/tasks/task.jade
2015-01-11 14:15:55 +10:00
22446a5ddb
apply active class to special spells too
2015-01-10 11:06:39 -05:00
d6dc2119cb
add active class to spell item when it is selected
2015-01-10 10:36:00 -05:00
8ba0bb5d88
Changed spellObj to skill to be more semantic, and match the text in the
...
rewards column
2015-01-06 15:31:07 -06:00
870d9d7e86
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-06 15:04:47 -06:00
9da000ec4e
Changed spell to spellObj in ng-repeat for class spells in order to
...
assist with applying an active class to current spell. (would collide
with $scope.spell in rootCtrl.js)
2015-01-06 15:03:54 -06:00
dd4e8d74c7
Fix for truncated dates on task due date. Closes #4482
2015-01-06 09:37:29 -06:00
b3ccdc2859
change markdown ngModel to text attribute
2015-01-01 20:57:57 +01:00
5d958b1456
Adjusted styles for snowball and spookDust so they would align like the coins
2014-12-31 09:31:56 -06:00
efba545147
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-12-29 15:44:06 -06:00
b3025c36b1
Fixed checklist not advancing to next input. Closes #4430
2014-12-29 15:43:20 -06:00
9b10081117
Removed useless comment in task.jade
2014-12-26 16:07:54 -05:00
7297429888
Make it possible to choose between MM/dd and dd/MM date format
2014-12-26 15:52:42 -05:00
e391fc04f0
Add variables for medium-length date display
2014-12-26 15:52:42 -05:00
13be267efb
added variable for date display and checking line ending issue
2014-12-26 15:52:41 -05:00
a8459c2f96
Changing button to a element fixed the delete on enter problem
2014-12-24 11:17:05 -06:00
0339bdf43f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-12-24 09:02:20 -06:00
fdcc22bde9
Closes #4361
2014-12-24 09:02:03 -06:00
118ba88d3d
fix(tasks): improve UI consistency and layout
...
* Match UI elements with rest of site
* Tidy up layout
2014-12-24 09:53:41 +00:00
073b338bde
fix(tasks): stop reward values overflowing
...
Fixes #1993
* Restyle reward cost area to fit three digit rewards into default view
* Apply custom styles to rewards with higher values to prevent them
from overflowing
2014-12-03 15:40:08 +00:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
6d0f2ed0bf
add tooltip to Dated To-Dos tab to explain that To-Dos aren't sorted
2014-11-02 05:49:49 +10:00
3451315ef6
add Dated tab for To-Dos
2014-11-01 20:34:36 +10:00
9ea0db88c1
remove previous method for hiding/showing remaining/completed To-Dos, and add new method
2014-11-01 19:54:41 +10:00
246fa799b7
remove unnecessary commented-out code
2014-11-01 19:52:58 +10:00
ff962b5959
allow To-Do add form to appear even when viewing completed To-Dos
2014-11-01 19:46:50 +10:00
8423de287e
Merge pull request #4142 from gjoyner/tasks
...
Popovers now disappear when clicking Save & Close
2014-10-29 14:22:21 -06:00
5e89d07e07
add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills)
2014-10-21 15:39:46 +10:00
9c6e303fe4
move Daily and To-Do tabs to mixin and put at top and bottom
2014-10-19 15:03:24 +10:00
4ab19ac225
Popovers now disappear when clicking Save and Close
2014-10-13 14:10:59 -07:00
56e2ec1bc4
Merge pull request #4140 from gjoyner/checklists
...
Adding checklist item drag and drop feature
2014-10-12 18:27:06 -06:00
67b341760e
stop spell casting on rewards
2014-10-12 22:01:12 +02:00
36bf09d984
Adding checklist item drag and drop feature
2014-10-12 01:48:51 -07:00
d7c8d48078
Merge pull request #4129 from Alys/Gaelan-hide_completed_dailies
...
Add ability to hide completed dailies (Gaelan's changes with fixes for merge conflicts etc)
2014-10-10 22:07:30 +10:00
264b16f76b
move Dailies "All" tab to the first position, to make it the default (I hope)
2014-10-09 21:08:46 +10:00
43d2d1355e
renamed Daily tabs to save space, removed To-Dos from new code because compled/all tabs were blank, decoupled To-Do code from Dailes code to allow future changes (e.g., "Dated" tab for To-Dos)
2014-10-09 20:04:03 +10:00
f0c3b3db4c
add pipes in front of plain text to prevent "Warning: missing space before text for line nn of jade file ..."
2014-10-09 15:56:06 +10:00
c4a2e720fd
Add ability to hide completed dailies.
...
While I was at it, I also did a bit of refactoring in general around the hiding
of completed todos/dailies.
2014-10-09 14:49:04 +10:00
80042a7a64
update jade
2014-10-07 21:30:00 +02:00
0841cafd1f
feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP
2014-10-02 23:18:13 -06:00
b1a34a25a8
- add popoverHtml to enable Markdown in Popovers
...
- add markdown filter to get Task Notes as Markdown
2014-10-01 20:30:13 +02:00
73f7f6605e
remove track by to fix https://github.com/HabitRPG/habitrpg/issues/4060
2014-09-22 20:23:37 +10:00
c501652194
- add popoverHtml to enable Markdown in Popovers
...
- add markdown filter to get Task Notes as Markdown
2014-09-20 12:13:36 +02:00
7e53eaf1ae
Revert "Revert "ngRepeat with track by""
...
This reverts commit c90c8f9a5f
2014-09-18 18:37:02 +02:00
benmanley