Dušan Juretić
431622ce14
E2e tests: launch Selenium and node server and kill them after finishing the tests, using a test database
2014-01-01 14:01:51 -03:00
Dušan Juretić
69c4977511
Fix again e2e test
2014-01-01 14:01:51 -03:00
Dušan Juretić
c572a195aa
Take screenshot of failed e2e tests
2014-01-01 14:01:51 -03:00
Dušan Juretić
3c5f9d7f8b
Mute Selenium on Travis
2014-01-01 14:01:51 -03:00
Dušan Juretić
87e7b2ead6
Fix build by giving more time to Protractor
2014-01-01 14:01:51 -03:00
Dušan Juretić
a6443bceb8
Fix build
2014-01-01 14:01:51 -03:00
Dušan Juretić
91b0f3fb96
E2e testing: added tests for failed login and register new user
2014-01-01 14:01:51 -03:00
Dušan Juretić
462bc416de
Starting e2e testing
2014-01-01 14:01:23 -03:00
Tyler Renelle
0f3202f964
#2200 change-password is showing for facebook-registered users for some reason
2013-12-31 20:00:15 -07:00
Daniel Heath
0ecc013a00
Allow lastpass users to autofill their credentials
2014-01-01 13:52:12 +11:00
Tyler Renelle
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
Ben Blank
56613910f0
prevent popover shadows from being clipped/overlapped
2013-12-31 14:58:47 -08:00
Ben Blank
32d1ff68b4
fix apparent misalignment of paws on pets/mounts grids
2013-12-31 14:34:24 -08:00
Tyler Renelle
962d509405
checklists #2198 don't collapse when in edit mode (that what you mean @sabrecat?)
2013-12-31 14:05:39 -07:00
Tyler Renelle
09eddd3eb2
checklists #2198 click badge to collapse checklist @sabrecat
2013-12-31 14:03:16 -07:00
Tyler Renelle
77c6777506
checklists: collapse individually
2013-12-31 13:50:14 -07:00
Tyler Renelle
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
Tyler Renelle
d75d96fc4a
Merge pull request #2203 from HabitRPG/sabe/tweak
...
Extend notification time, fix MP alerts
2013-12-31 08:54:58 -08:00
Tyler Renelle
3aa2470b33
Merge pull request #2201 from aughr/seed_working
...
Fix seed file
2013-12-31 08:53:03 -08:00
Sabe Jones
be38029015
Extend notification time, fix MP alerts
2013-12-31 10:29:48 -06:00
Tyler Renelle
bde22636cf
checklsits: package & bower use habitrpg-shared#develop
2013-12-31 09:15:25 -07:00
Tyler Renelle
1dda9254f3
bailey: notif on task icons & markdown
2013-12-31 09:15:06 -07:00
Tyler Renelle
b76b275a7c
winter: party hat fix, big snowball in inventory (@lemoness). Still
...
small one in spells list, those are 32x22. I say we just leave it
2013-12-31 08:54:26 -07:00
Tyler Renelle
0285de5098
winter: use npc_ian from holiday-event pngs, disable gif for now (revert this later)
2013-12-31 08:47:10 -07:00
Tyler Renelle
549fd7bac0
new year's eve event: party hat, new NPCs
2013-12-31 08:44:01 -07:00
Tyler Renelle
80e593d49f
new years eve: bailey
2013-12-31 08:43:29 -07:00
Sabe Jones
4662fe151b
Implement "training" over the course of a level, for task-based attribute allocation
2013-12-31 09:05:03 -06:00
Tyler Renelle
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
Sabe Jones
8de5206f1b
Add attribute training to user model
2013-12-31 09:04:02 -06:00
Tyler Renelle
8cc55b1ee5
rebirth fix tests
2013-12-31 08:02:58 -07:00
Tyler Renelle
640da7aa54
rebirth: return user in response
2013-12-31 08:00:47 -07:00
Tyler Renelle
19f53c3675
Merge remote-tracking branch 'origin/sabe/rebirth' into develop
...
Conflicts:
dist/customizer.css
dist/habitrpg-shared.css
dist/spritesmith.css
dist/spritesmith.png
2013-12-31 07:56:35 -07:00
Tyler Renelle
01ecc616f6
Merge branch 'checklists' into develop
2013-12-31 07:53:34 -07:00
Andrew Bloomgarden
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
Sabe Jones
c4a82d4edd
Daily derp! Don't return PER when STR is suggested
2013-12-30 23:09:47 -06:00
Sabe Jones
9c5f1c2150
Add debug button to hand out levels one at a time
2013-12-30 22:56:01 -06:00
Marcelo Sizer
cc02d3f042
Edit comma before }
2013-12-31 00:19:13 -02:00
Marcelo Sizer
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
Marcelo Sizer
ff5a42e3df
Replace hard coded strings for env.t on views/shared/ folder.
2013-12-31 00:15:53 -02:00
Tyler Renelle
3aa64a2923
Merge pull request #2194 from katfang/develop
...
Minor Text Update to Class Tour
2013-12-30 15:48:03 -08:00
Sabe Jones
85657f40d3
Fix placement of "Restore Streak" caption on Firefox
2013-12-30 17:25:13 -06:00
katfang
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
Tyler Renelle
eb016649e1
checklists: grant GP bonus for CLIs on To-Dos
2013-12-30 14:51:49 -07:00
Tyler Renelle
4fcee66c3b
checklists: inline by default, add help popover
2013-12-30 14:40:07 -07:00
Tyler Renelle
c7dde3cde1
checklists: add CL up/down keyboard nav
2013-12-30 13:42:19 -07:00
Marcelo Sizer
26b83b4d40
Update main.json
...
Remove comma at the end.
2013-12-30 18:33:47 -02:00
Tyler Renelle
85c96886a3
checklists: point-match TDs for each CL-item. Bug fix on resetting CLs
...
on cron
2013-12-30 13:23:48 -07:00
Tyler Renelle
1110338b9b
checklists: handle backspacing an empty CL item
2013-12-30 13:19:42 -07:00
Tyler Renelle
ebc7cf6bcb
checklists: better handling of saveTask, keypress:13, and remove-blur
2013-12-30 12:56:26 -07:00
Tyler Renelle
0fe2804c3c
fix #2184 put dbl-click for task._editing on the correct element
2013-12-30 11:17:19 -07:00