462bc416de
Starting e2e testing
2014-01-01 14:01:23 -03:00
0f3202f964
#2200 change-password is showing for facebook-registered users for some reason
2013-12-31 20:00:15 -07:00
0ecc013a00
Allow lastpass users to autofill their credentials
2014-01-01 13:52:12 +11:00
dfe6d9ff88
tasks: dbl-click saves a task when previously in edit-mode. @sabrecat
...
@wc8 it used to be it just closes the edit dialog, but I find myself
wanting to dblclick to save each time. Let me know if you think this is
a bad idea
2013-12-31 18:11:20 -07:00
56613910f0
prevent popover shadows from being clipped/overlapped
2013-12-31 14:58:47 -08:00
32d1ff68b4
fix apparent misalignment of paws on pets/mounts grids
2013-12-31 14:34:24 -08:00
962d509405
checklists #2198 don't collapse when in edit mode (that what you mean @sabrecat?)
2013-12-31 14:05:39 -07:00
09eddd3eb2
checklists #2198 click badge to collapse checklist @sabrecat
2013-12-31 14:03:16 -07:00
77c6777506
checklists: collapse individually
2013-12-31 13:50:14 -07:00
f6dec231f5
fix #2064 - user.stats.buffs.int in UserSchema (woops, @sabrecat we were
...
looking in the wrong place!)
2013-12-31 13:36:52 -07:00
d75d96fc4a
Merge pull request #2203 from HabitRPG/sabe/tweak
...
Extend notification time, fix MP alerts
2013-12-31 08:54:58 -08:00
3aa2470b33
Merge pull request #2201 from aughr/seed_working
...
Fix seed file
2013-12-31 08:53:03 -08:00
be38029015
Extend notification time, fix MP alerts
2013-12-31 10:29:48 -06:00
bde22636cf
checklsits: package & bower use habitrpg-shared#develop
2013-12-31 09:15:25 -07:00
1dda9254f3
bailey: notif on task icons & markdown
2013-12-31 09:15:06 -07:00
80e593d49f
new years eve: bailey
2013-12-31 08:43:29 -07:00
928f7cfdd7
Merge remote-tracking branch 'origin/sabe/rebirth' into develop
...
Conflicts:
src/models/user.js
views/shared/modals/index.jade
2013-12-31 08:04:51 -07:00
8de5206f1b
Add attribute training to user model
2013-12-31 09:04:02 -06:00
01ecc616f6
Merge branch 'checklists' into develop
2013-12-31 07:53:34 -07:00
dc77360d66
Fix seed file
...
It needs to configure nconf so it can start and disconnect from mongo so it can
end.
2013-12-30 23:44:24 -08:00
9c5f1c2150
Add debug button to hand out levels one at a time
2013-12-30 22:56:01 -06:00
cc02d3f042
Edit comma before }
2013-12-31 00:19:13 -02:00
eb71a2341f
Merge branch 'develop' of https://github.com/Sinza-/habitrpg into develop
...
Replace hard coded strings for env.t on views/shared/.
2013-12-31 00:17:30 -02:00
ff5a42e3df
Replace hard coded strings for env.t on views/shared/ folder.
2013-12-31 00:15:53 -02:00
3aa64a2923
Merge pull request #2194 from katfang/develop
...
Minor Text Update to Class Tour
2013-12-30 15:48:03 -08:00
85657f40d3
Fix placement of "Restore Streak" caption on Firefox
2013-12-30 17:25:13 -06:00
7205221b86
Minor Text Update to Class Tour
...
Spells now happen at level 11 rather than 6.
Reflects change from https://github.com/HabitRPG/habitrpg/issues/2096
2013-12-30 17:26:44 -05:00
4fcee66c3b
checklists: inline by default, add help popover
2013-12-30 14:40:07 -07:00
c7dde3cde1
checklists: add CL up/down keyboard nav
2013-12-30 13:42:19 -07:00
26b83b4d40
Update main.json
...
Remove comma at the end.
2013-12-30 18:33:47 -02:00
1110338b9b
checklists: handle backspacing an empty CL item
2013-12-30 13:19:42 -07:00
ebc7cf6bcb
checklists: better handling of saveTask, keypress:13, and remove-blur
2013-12-30 12:56:26 -07:00
0fe2804c3c
fix #2184 put dbl-click for task._editing on the correct element
2013-12-30 11:17:19 -07:00
a854109fcd
Get attributes layout up-to-date with develop changes
2013-12-30 11:38:27 -06:00
63541ad268
checklists: add inline-checklists user preference, and hide inlines when
...
editing
2013-12-30 10:33:48 -07:00
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
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
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
74c905f1e1
checklists WIP
2013-12-30 10:33:17 -07:00
ea31cc6926
Merge branch 'task-li-notes' into develop
...
Conflicts:
views/shared/tasks/task.jade
2013-12-30 10:31:17 -07:00
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
39396afba8
Merge pull request #2177 from HabitRPG/sabe/tweak
...
RPG demystification, cont'd
2013-12-30 08:42:19 -08:00
96b3c2b7f5
Merge pull request #2185 from HabitRPG/sabe/tweak2
...
Remove extraneous techy characters from chat notifications
2013-12-30 08:32:58 -08:00
d3a6191a5e
Merge branch 'develop' into sabe/attributes
2013-12-30 10:25:08 -06:00
5538bcc6a9
Advanced Options default to being shown
2013-12-30 08:57:41 -06:00
9a32cfd7e1
Remove extraneous techy characters from boss fight and spellcasting chat notifications
2013-12-30 08:46:40 -06:00
2aa1e91b8a
Merge pull request #2175 from HabitRPG/sabe/tweak2
...
Put ignores in .nodemonignore as well
2013-12-30 05:40:06 -08:00
199a74d8a9
Fix #2181 (allocated points showing up in Class Equip Bonus)
2013-12-30 07:33:17 -06:00
6f4f04a5af
Delete locales/en/secondary.json
2013-12-30 10:39:28 -02:00
55fbd7d439
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
locales/en/app.json
2013-12-30 10:33:08 -02:00
Dušan Juretić