 Matteo Pagliazzi
|
ad6be153f4
|
Revert "use lowercase only emails - register phase"
This reverts commit 69fdff615a.
|
2015-10-19 19:42:25 +02:00 |
|
|
Matteo Pagliazzi
|
7a2d2fd3dc
|
Revert 215ca0371c
|
2015-10-19 19:42:13 +02:00 |
|
|
Amin Arria
|
3bd809f7c2
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages
|
2015-10-19 12:14:38 -04:30 |
|
|
Amin Arria
|
038039dbee
|
Fixes #5550, change message according to rebirthLevel
|
2015-10-19 12:10:27 -04:30 |
|
|
Blade Barringer
|
2883dc6c85
|
Merge branch 'ksami-develop' into develop
|
2015-10-19 08:14:48 -05:00 |
|
|
Blade Barringer
|
9ad1dbd8ce
|
Adjust mystic hourglass string to take in interpolation
|
2015-10-19 08:10:37 -05:00 |
|
|
Blade Barringer
|
d9de32f2dc
|
Add todo to investigate magic numbers
|
2015-10-19 08:04:47 -05:00 |
|
|
Blade Barringer
|
1a2510e4da
|
Adjsut string to take in interpolation
|
2015-10-19 08:03:27 -05:00 |
|
|
Blade Barringer
|
931d688637
|
Use Content service
|
2015-10-19 08:03:14 -05:00 |
|
|
Blade Barringer
|
f03be07595
|
Add extra line breaks
|
2015-10-19 08:02:35 -05:00 |
|
|
Blade Barringer
|
4a3e60d0d7
|
Merge branch 'develop' into ksami-develop
|
2015-10-19 06:26:34 -05:00 |
|
|
Phillip Thelen
|
2fde3c771f
|
remove empty line
|
2015-10-19 12:50:30 +02:00 |
|
|
Phillip Thelen
|
3a42711427
|
nicer style for default gem value
|
2015-10-19 12:48:50 +02:00 |
|
|
Ricardo Mendes
|
6e68450309
|
Tweaks tests to account for autoEquip user preference.
|
2015-10-19 08:26:15 +00:00 |
|
|
Ricardo Mendes
|
5e3f46d786
|
Checks user auto-equip preference in buy function
|
2015-10-19 05:52:46 +00:00 |
|
|
Ricardo Mendes
|
73924df241
|
Adds auto-equip UI to equipment view
|
2015-10-19 05:20:11 +00:00 |
|
|
Ricardo Mendes
|
e79863e134
|
Adds auto-equip boolean to user preferences
|
2015-10-19 05:20:10 +00:00 |
|
|
Ricardo Mendes
|
860abce1d7
|
Adds auto-equip string to locales/en
|
2015-10-19 05:20:10 +00:00 |
|
|
Blade Barringer
|
fcec018616
|
Merge pull request #6009 from locks/patch-2
Typo in test description string
|
2015-10-18 21:35:51 -05:00 |
|
|
Blade Barringer
|
dbc9c5a48c
|
Merge pull request #6008 from locks/patch-1
Typo in comment string
|
2015-10-18 15:29:29 -05:00 |
|
|
Phillip Thelen
|
7a7d038602
|
Split up tutorial parts
|
2015-10-18 17:29:06 +02:00 |
|
|
Blade Barringer
|
1417d643e4
|
Comment out content test until we know for sure what we're doing with the content files
|
2015-10-18 10:14:54 -05:00 |
|
|
Blade Barringer
|
b2350f10f1
|
Create get groups test
|
2015-10-18 10:01:55 -05:00 |
|
|
Blade Barringer
|
cd224ac8d8
|
Add members attribute to tavern
|
2015-10-18 09:59:39 -05:00 |
|
|
Blade Barringer
|
63b17f0173
|
Create method to reset habitica db
|
2015-10-18 08:47:14 -05:00 |
|
|
Blade Barringer
|
ece2985eb0
|
Return better error when connection can't be established
|
2015-10-18 08:46:47 -05:00 |
|
|
Blade Barringer
|
bab093b7ab
|
Write get group tests
|
2015-10-18 07:15:35 -05:00 |
|
|
Blade Barringer
|
4fa82ba196
|
Update generated document with update object
|
2015-10-18 07:00:48 -05:00 |
|
|
Blade Barringer
|
9b2da51991
|
Create pending tests for unhandled behavior
|
2015-10-18 06:48:43 -05:00 |
|
|
Blade Barringer
|
82b133e8fc
|
Add tests for creating groups
|
2015-10-18 06:38:22 -05:00 |
|
|
Blade Barringer
|
24001c5c66
|
Create generate group function
|
2015-10-18 06:15:38 -05:00 |
|
|
Blade Barringer
|
8f7ecf7d7c
|
Rename uuid function
|
2015-10-18 06:03:22 -05:00 |
|
|
Blade Barringer
|
ab2b564a03
|
Update error check
|
2015-10-17 21:24:46 -05:00 |
|
|
Blade Barringer
|
477fb8edcb
|
Add missing semicolon
|
2015-10-17 20:38:18 -05:00 |
|
|
Blade Barringer
|
7f5c556654
|
Add pending tests
|
2015-10-17 20:23:29 -05:00 |
|
|
Blade Barringer
|
680be3a641
|
Add delete user test
|
2015-10-17 20:18:44 -05:00 |
|
|
Blade Barringer
|
416f82ade7
|
Clean up user test
|
2015-10-17 20:18:37 -05:00 |
|
|
Blade Barringer
|
1d22382c16
|
Remove get user test from legacy script
|
2015-10-17 20:15:34 -05:00 |
|
|
Blade Barringer
|
75f63b1367
|
Add functionality to generate user to update user
|
2015-10-17 19:19:40 -05:00 |
|
|
Blade Barringer
|
7f6b392511
|
Add gulp watch task for api tests
|
2015-10-17 19:17:23 -05:00 |
|
|
Blade Barringer
|
c51caa0664
|
Add generate new user helper
|
2015-10-17 18:27:19 -05:00 |
|
|
Blade Barringer
|
5291d1a4e9
|
Add test for registering a user
|
2015-10-17 18:13:38 -05:00 |
|
|
Blade Barringer
|
de6a853aaf
|
Adjust api helper
|
2015-10-17 18:05:44 -05:00 |
|
|
Blade Barringer
|
5d268c58de
|
Adjust api test commands
|
2015-10-17 18:04:32 -05:00 |
|
|
Blade Barringer
|
0444a7d713
|
Move status test to own folder
|
2015-10-17 15:51:00 -05:00 |
|
|
Blade Barringer
|
ddf2ceeccd
|
Change name of test
|
2015-10-17 15:05:32 -05:00 |
|
|
Blade Barringer
|
4a69dcbdf1
|
Remove status test from legacy infrastructure
|
2015-10-17 12:40:00 -05:00 |
|
|
Blade Barringer
|
5b729bf776
|
Merge branch 'develop' into new_api_test_infrastructure
|
2015-10-17 12:39:24 -05:00 |
|
|
Blade Barringer
|
02e9775ba7
|
Set up new api test structure
|
2015-10-17 12:37:17 -05:00 |
|
|
Blade Barringer
|
59e2b92dae
|
Kill mocha test if not set to watch
|
2015-10-17 12:23:04 -05:00 |
|