469ece70c3
clean up party {up,on} tests, add calls to $controller after setup
2016-03-16 22:32:24 -04:00
a150dbc9ca
chore(i18n): update locales
2016-03-16 20:32:15 -05:00
a0f65f8b25
emojis now properly displayed in challenge won modal
2016-03-16 20:12:52 -05:00
ae92a98037
challenge title on challenge winner's profile supports markdown w/o emojis
2016-03-16 20:12:49 -05:00
51f3008a20
Note about weekly progress update ( fixes #6884 )
2016-03-16 22:11:01 +01:00
ee09bee1e2
use sandbox.stub instead of sandbox.spy
2016-03-16 00:55:20 -04:00
be0bcad24b
chore(i18n): update locales
2016-03-15 19:51:47 -05:00
1c811dbc82
refactor: Extract orderBy equipment button into mixin
2016-03-15 19:41:24 -05:00
146810a3e9
feat: Add set property to content
2016-03-15 19:41:19 -05:00
9508ed45df
refactor: Move order by equipmentment button to top of view
2016-03-15 19:41:11 -05:00
a6fb945120
inventory sorting
...
Add inventory sorting buttons based on name, attribute, and set (armoire):
- Each gear[klass] has its own sorting buttons and sorting state including costume classes
- The attributes sort descending when selected, then by sum of all attributes
- There is no default sort
- The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
- Name sorts by .text() ascending
2016-03-15 19:41:11 -05:00
68c3c2973b
cannot spy on an undefined function
2016-03-15 19:49:33 -04:00
c0e636dba0
fix spy?
2016-03-15 18:36:36 -04:00
979acded92
Merge branch 'develop' into new_party_badges
2016-03-15 16:17:25 -04:00
93c5cc0385
add tests for awarding party {up,on} achievs
2016-03-15 16:03:36 -04:00
a9e0a4dfaf
chore(news): announce badges and Spring Plot
2016-03-15 15:42:15 -04:00
beb86ea4bd
Merge branch 'khipkin/party-badges' into develop
...
Conflicts:
common/dist/sprites/spritesmith-main-10.png
common/dist/sprites/spritesmith-main-11.png
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.png
2016-03-15 14:57:38 -04:00
3db06c6537
Merge branch 'develop' into api-v3
2016-03-15 19:23:23 +01:00
9a337ad15f
Merge pull request #6888 from HabitRPG/api-v3-allocate
...
[Api v3] Port shared.ops.allocate
2016-03-15 19:21:00 +01:00
67ef70db0f
remove constants tests
2016-03-15 19:10:00 +01:00
5b2584871e
increase sleep time when testing "allows user to delete challenge task after challenge task is broken"
2016-03-15 19:07:01 +01:00
d62807f760
feat: Add debug scripts to easilly get all pets/mounts/gear
2016-03-15 12:47:24 -05:00
219ec01ce9
port shared.ops.allocate
2016-03-15 18:41:23 +01:00
fb6c927ce9
Merge pull request #6886 from HabitRPG/api-v3-port-sleep
...
[API v3] Port sleep operation from shared code
2016-03-15 17:42:26 +01:00
73cb50b01a
Merge pull request #6872 from TheHollidayInn/api-v3-delete-challenge-tasks-tests
...
Added initial delete challenge tasks tests
2016-03-15 17:26:39 +01:00
b2b4340ee3
change response for shared.ops.sleep, save user in POST /user/sleep and add integration tests for it
2016-03-15 17:05:07 +01:00
490c6a9ae1
wip(shared): port sleep op
2016-03-15 16:33:44 +01:00
534ec07b6a
Added tests to ensure challenge member can not delete active challenge task and can delete broken or unlinked challenge task
2016-03-15 10:03:48 -05:00
fdeddc8631
pin stripe to specific version
2016-03-14 18:30:10 +01:00
ed013ee34d
Merge pull request #6878 from crookedneighbor/update_protractor
...
Update protractor
2016-03-13 22:24:59 -05:00
278b972c61
lint: Add missing semicolon to test helper
2016-03-13 22:06:09 -05:00
6ce0893edc
test: unpend registration test
2016-03-13 21:56:42 -05:00
3ffb84d890
test: Reset db before running e2e tests
2016-03-13 21:56:12 -05:00
88ef920a2f
fix: Update travis yaml to run protractor 3
2016-03-13 21:16:51 -05:00
f55df39fb7
Merge branch 'develop' into api-v3
2016-03-13 23:19:04 +01:00
e506864e00
Merge pull request #6877 from HabitRPG/v3-adapt-shared
...
Make shared code ready for API v3
2016-03-13 23:13:00 +01:00
f7c94ad854
Merge pull request #6875 from piousbox/api-v3-update-username-password-2
...
update username, password
2016-03-13 23:03:17 +01:00
f65a7321b7
fix common tests, explictly exclude tests from linting
2016-03-13 23:00:48 +01:00
17d2efb822
refactor: Organize protractor setup
2016-03-13 16:41:57 -05:00
70df1137a0
fix statsComputed getter
2016-03-13 22:39:14 +01:00
8e3284a4e3
wip(shared): adapt to v3
2016-03-13 22:26:32 +01:00
0b25720232
cleanup
2016-03-13 14:01:53 -07:00
b948fc031f
fix typo in common code
2016-03-13 21:12:19 +01:00
c61b10a6eb
resolve conflicts
2016-03-13 10:45:19 -07:00
c14f0c4247
update username, password
2016-03-13 10:42:59 -07:00
0b65292e4b
test: Update protractor to v3 and use mocha
2016-03-13 09:51:01 -05:00
46322cfd38
update username, password
2016-03-12 23:32:20 -08:00
c04e53b5a5
Added initial delete challenge tasks tests
2016-03-12 21:00:43 -06:00
13a86c3858
Merge pull request #6869 from TheHollidayInn/api-v3-remove-challenge-checklist-item
...
Added initial test for removing challenge checklist item
2016-03-12 18:08:27 +01:00
ce916e31bd
Merge pull request #6866 from TheHollidayInn/api-v3-updated-checklist-item
...
Added initial checklist item update tests
2016-03-12 18:07:50 +01:00
Kaitlin Hipkin