Sabe Jones
|
9f4efc31ed
|
Break out autoAllocate to its own function
|
2013-12-30 11:39:53 -06:00 |
|
Sabe Jones
|
a854109fcd
|
Get attributes layout up-to-date with develop changes
|
2013-12-30 11:38:27 -06:00 |
|
Tyler Renelle
|
63541ad268
|
checklists: add inline-checklists user preference, and hide inlines when
editing
|
2013-12-30 10:33:48 -07:00 |
|
Tyler Renelle
|
bb3bec520e
|
checklists: tmp commit to showcase how inline checklists look on
tasks (only for todos for comparison)
|
2013-12-30 10:33:48 -07:00 |
|
Tyler Renelle
|
968b091ccd
|
checklists: checklist as <li> instead of <label>, so that inline-editing
doesn't trigger checkmark. Unfortunately means we need to replicate some
bootstrap css
|
2013-12-30 10:33:48 -07:00 |
|
Tyler Renelle
|
1ace999cb7
|
Tasks: add double-click to edit, and date-picker-popup for
due-dates. Show red dates when overdue (basic)
|
2013-12-30 10:33:48 -07:00 |
|
Tyler Renelle
|
74c905f1e1
|
checklists WIP
|
2013-12-30 10:33:17 -07:00 |
|
Tyler Renelle
|
ea31cc6926
|
Merge branch 'task-li-notes' into develop
Conflicts:
views/shared/tasks/task.jade
|
2013-12-30 10:31:17 -07:00 |
|
Tyler Renelle
|
6f0046dffc
|
Revert b4ff7d4 b20a3b7 . Temporarily remove
todo-filter. This brings back the big performance issue of always
displaying completed-todos, but fixes #2180 #2189. See #2180 for
discussion.
|
2013-12-30 10:19:57 -07:00 |
|
Tyler Renelle
|
39396afba8
|
Merge pull request #2177 from HabitRPG/sabe/tweak
RPG demystification, cont'd
|
2013-12-30 08:42:19 -08:00 |
|
Tyler Renelle
|
96b3c2b7f5
|
Merge pull request #2185 from HabitRPG/sabe/tweak2
Remove extraneous techy characters from chat notifications
|
2013-12-30 08:32:58 -08:00 |
|
Sabe Jones
|
958ec99f1a
|
Merge branch 'develop' into sabe/attributes
|
2013-12-30 10:27:58 -06:00 |
|
Sabe Jones
|
d3a6191a5e
|
Merge branch 'develop' into sabe/attributes
|
2013-12-30 10:25:08 -06:00 |
|
Sabe Jones
|
5538bcc6a9
|
Advanced Options default to being shown
|
2013-12-30 08:57:41 -06:00 |
|
Sabe Jones
|
9a32cfd7e1
|
Remove extraneous techy characters from boss fight and spellcasting chat notifications
|
2013-12-30 08:46:40 -06:00 |
|
Sabe Jones
|
2aa1e91b8a
|
Merge pull request #2175 from HabitRPG/sabe/tweak2
Put ignores in .nodemonignore as well
|
2013-12-30 05:40:06 -08:00 |
|
Sabe Jones
|
199a74d8a9
|
Fix #2181 (allocated points showing up in Class Equip Bonus)
|
2013-12-30 07:33:17 -06:00 |
|
Marcelo Sizer
|
6f4f04a5af
|
Delete locales/en/secondary.json
|
2013-12-30 10:39:28 -02:00 |
|
Marcelo Sizer
|
55fbd7d439
|
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
locales/en/app.json
|
2013-12-30 10:33:08 -02:00 |
|
Matteo Pagliazzi
|
c7e93f7793
|
remove console.log
|
2013-12-30 12:28:30 +01:00 |
|
Matteo Pagliazzi
|
34319bdcd3
|
improved multiple files translations
|
2013-12-30 12:23:23 +01:00 |
|
Matteo Pagliazzi
|
cb07bc9229
|
allow multiple files for translations
|
2013-12-30 12:16:42 +01:00 |
|
Tyler Renelle
|
bb80176920
|
checklists WIP
|
2013-12-29 22:37:12 -07:00 |
|
Sabe Jones
|
c3aed6fb28
|
RPG demystification, cont'd
|
2013-12-29 20:58:35 -06:00 |
|
Marcelo Sizer
|
57ac0239c5
|
Replaced hard-coded strings with env.t on views/static folder and en/app.json contains it all.
|
2013-12-30 00:14:55 -02:00 |
|
Sabe Jones
|
9cdf567872
|
Put ignores in .nodemonignore as well
|
2013-12-29 19:22:37 -06:00 |
|
Tyler Renelle
|
6299415d6e
|
Merge pull request #2173 from HabitRPG/sabe/tweak2
Add .idea and .git to nodemon ignore list
|
2013-12-29 17:19:50 -08:00 |
|
Sabe Jones
|
1036f0549e
|
Add .idea and .git to nodemon ignore list, to reduce unnecessary server bounces during dev
|
2013-12-29 19:11:32 -06:00 |
|
Tyler Renelle
|
50d241e2c8
|
#2083 add list-item notes at top-level element
|
2013-12-29 17:34:21 -07:00 |
|
Tyler Renelle
|
61dfb8d129
|
Merge pull request #2086 from HabitRPG/sabe/tweak2
Remove sliding effect on avatar mouseover
|
2013-12-29 16:19:09 -08:00 |
|
Tyler Renelle
|
2f4fd2faca
|
fix #2163 add stats.maxMP in GET /api/v2/user. @russtaylor let me know
if you need it in other locations
|
2013-12-29 17:13:39 -07:00 |
|
Tyler Renelle
|
bb5fe9c6e5
|
classes: temporary stopgap for
https://github.com/HabitRPG/habitrpg/issues/2150 , burst-of-flames being
too powerful. This isn't the real solution we need something better
|
2013-12-29 16:58:45 -07:00 |
|
Tyler Renelle
|
af499a0663
|
fix https://github.com/HabitRPG/habitrpg/issues/2172 save task.tags
|
2013-12-29 16:46:25 -07:00 |
|
Tyler Renelle
|
fd324fc220
|
classes: fix class-modal heads. Also, little class title display trick
@sabrecat (tiny perf bonus)
|
2013-12-29 12:21:56 -07:00 |
|
Tyler Renelle
|
be4e29faba
|
Merge pull request #2162 from HabitRPG/sabe/tweak3
Some work on demystification of RPG elements
|
2013-12-29 11:12:52 -08:00 |
|
Sabe Jones
|
2f79472439
|
Some work on demystification of RPG elements
|
2013-12-29 11:04:31 -06:00 |
|
Tyler Renelle
|
e9cb9b8a9f
|
task-icons: larger emoji in task text than chat
|
2013-12-29 01:24:02 -07:00 |
|
Tyler Renelle
|
c14e4c8fec
|
display profile.stats.class in modal
|
2013-12-29 00:47:39 -07:00 |
|
Tyler Renelle
|
585f736305
|
add markdown support for task.text so we can use icons in task
titles. @wc8 does this satisfy
https://trello.com/c/FCVdjdUd/102-task-reward-icons sufficiently? @lemoness
|
2013-12-29 00:46:08 -07:00 |
|
Tyler Renelle
|
b4ff7d4be4
|
#1499 check that task[0] exists first
|
2013-12-29 00:33:58 -07:00 |
|
Tyler Renelle
|
d966833782
|
#1499 ng-if to hide/show task editing (fewer watchers)
|
2013-12-29 00:14:55 -07:00 |
|
Tyler Renelle
|
b20a3b7381
|
#1499 add list filter on tasks to not display completed todos at all
until "completed" tab clicked
|
2013-12-29 00:14:46 -07:00 |
|
Tyler Renelle
|
34a955665c
|
Merge pull request #1986 from Magnilucent/develop
Fixes #1959: petCount was only being updated...
|
2013-12-28 21:15:32 -08:00 |
|
Tyler Renelle
|
46f772581d
|
Merge pull request #2153 from HabitRPG/sabe/tweak3
Don't need angle brackets anymore for party cast notifications
|
2013-12-28 21:14:48 -08:00 |
|
Tyler Renelle
|
8ed891db83
|
Merge pull request #1984 from SyntaxPickax/patch-2
Fixed challenge prize logic to avoid double paying
|
2013-12-28 21:09:48 -08:00 |
|
Tyler Renelle
|
dfa25c6f3a
|
fix https://github.com/HabitRPG/habitrpg/issues/2156 stack stealth
|
2013-12-28 22:01:44 -07:00 |
|
Tyler Renelle
|
57cd53cfc9
|
fix #2155 . Since quest.leader is new, doesn't apply to quests started
before today. Show abort/begin for all quest members if quest.leader
doesn't exist, otherwise only show those options to the leader
|
2013-12-28 21:54:25 -07:00 |
|
Tyler Renelle
|
d3a4d35d5d
|
quest: when new user joins party, invite to pending-invite quests. When
user in quest leaves party, knock user from group.quest.members & quest
from user.party.quest
|
2013-12-28 21:50:27 -07:00 |
|
Sabe Jones
|
47c4b1dbe5
|
Don't need angle brackets anymore for party cast notifications
|
2013-12-28 17:46:18 -06:00 |
|
Tyler Renelle
|
ea0b5b9291
|
quest: add quest leader. only quest-leader can begin/abort. Abort
restores quest scroll to leader. Bug fixes on clearing quest
data (completion, abort, etc)
|
2013-12-28 16:36:16 -07:00 |
|