Blade Barringer
c7310b97ec
Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."
...
This reverts commit 9d50201180
2016-03-17 08:09:18 -05:00
Alys
9d50201180
Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues.
...
This reverts commits 1c811dbc82146810a3e99508ed45dfa6fb945120
2016-03-17 21:47:29 +10:00
Christopher Giroir
cfae524579
Updating button text to GET instead of VIEW
2016-03-16 23:23:36 -07:00
Sabe Jones
b4b0d7e89c
chore(news): mobile updates Bailey
2016-03-17 00:09:42 -04:00
Kaitlin Hipkin
0ca949b1bb
pull initialization of controller into helper method and stub state
2016-03-16 23:50:16 -04:00
Blade Barringer
3f16cd4fbf
refactor: Adjust stat allocation modal
2016-03-16 22:07:00 -05:00
Josh Holland
a639038a41
Move stat allocation to a mixin to avoid code duplication
2016-03-16 22:07:00 -05:00
Josh Holland
952d9ec929
Quick allocation of attribute points from level-up modal
...
Resolves #6720 .
2016-03-16 22:06:54 -05:00
Kaitlin Hipkin
469ece70c3
clean up party {up,on} tests, add calls to $controller after setup
2016-03-16 22:32:24 -04:00
Blade Barringer
a150dbc9ca
chore(i18n): update locales
2016-03-16 20:32:15 -05:00
Kaitlin Hipkin
a0f65f8b25
emojis now properly displayed in challenge won modal
2016-03-16 20:12:52 -05:00
Kaitlin Hipkin
ae92a98037
challenge title on challenge winner's profile supports markdown w/o emojis
2016-03-16 20:12:49 -05:00
doyler
51f3008a20
Note about weekly progress update ( fixes #6884 )
2016-03-16 22:11:01 +01:00
Kaitlin Hipkin
ee09bee1e2
use sandbox.stub instead of sandbox.spy
2016-03-16 00:55:20 -04:00
Blade Barringer
be0bcad24b
chore(i18n): update locales
2016-03-15 19:51:47 -05:00
Blade Barringer
1c811dbc82
refactor: Extract orderBy equipment button into mixin
2016-03-15 19:41:24 -05:00
Blade Barringer
146810a3e9
feat: Add set property to content
2016-03-15 19:41:19 -05:00
Blade Barringer
9508ed45df
refactor: Move order by equipmentment button to top of view
2016-03-15 19:41:11 -05:00
Matt Harrington
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
Kaitlin Hipkin
68c3c2973b
cannot spy on an undefined function
2016-03-15 19:49:33 -04:00
Kaitlin Hipkin
c0e636dba0
fix spy?
2016-03-15 18:36:36 -04:00
Kaitlin Hipkin
979acded92
Merge branch 'develop' into new_party_badges
2016-03-15 16:17:25 -04:00
Kaitlin Hipkin
93c5cc0385
add tests for awarding party {up,on} achievs
2016-03-15 16:03:36 -04:00
Sabe Jones
a9e0a4dfaf
chore(news): announce badges and Spring Plot
2016-03-15 15:42:15 -04:00
Sabe Jones
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
Blade Barringer
d62807f760
feat: Add debug scripts to easilly get all pets/mounts/gear
2016-03-15 12:47:24 -05:00
Matteo Pagliazzi
fdeddc8631
pin stripe to specific version
2016-03-14 18:30:10 +01:00
Blade Barringer
ed013ee34d
Merge pull request #6878 from crookedneighbor/update_protractor
...
Update protractor
2016-03-13 22:24:59 -05:00
Blade Barringer
278b972c61
lint: Add missing semicolon to test helper
2016-03-13 22:06:09 -05:00
Blade Barringer
6ce0893edc
test: unpend registration test
2016-03-13 21:56:42 -05:00
Blade Barringer
3ffb84d890
test: Reset db before running e2e tests
2016-03-13 21:56:12 -05:00
Blade Barringer
88ef920a2f
fix: Update travis yaml to run protractor 3
2016-03-13 21:16:51 -05:00
Blade Barringer
17d2efb822
refactor: Organize protractor setup
2016-03-13 16:41:57 -05:00
Matteo Pagliazzi
b948fc031f
fix typo in common code
2016-03-13 21:12:19 +01:00
Blade Barringer
0b65292e4b
test: Update protractor to v3 and use mocha
2016-03-13 09:51:01 -05:00
Matteo Pagliazzi
6fa23ae49f
make sure to clone drop so original properties do not change
2016-03-11 19:11:46 +01:00
Kaitlin Hipkin
997fe155e2
fix blurry upscale of achievement-partyUp img
2016-03-10 20:49:54 -05:00
Kaitlin Hipkin
792e8d8094
fix awarding of party {up,on} achievs to update server
2016-03-10 20:38:53 -05:00
Sabe Jones
d28219e90d
fix(content): Pfeffernusse typo, again
2016-03-10 17:35:36 -06:00
Sabe Jones
d608fdb437
fix(news): Pfeffernusse typo
2016-03-10 16:59:39 -06:00
Matteo Pagliazzi
a9c9d6d1cc
Merge pull request #6834 from HabitRPG/split-shared
...
Split shared ops
2016-03-10 17:34:46 +01:00
Matteo Pagliazzi
05676d834e
remove git conflict data
2016-03-10 17:13:13 +01:00
Matteo Pagliazzi
c39967767c
Merge branch 'develop' into split-shared
2016-03-10 17:00:59 +01:00
Sabe Jones
2a5011b648
fix(content): don't be clever with quest names
2016-03-09 16:57:43 -06:00
Sabe Jones
d92614844a
Merge pull request #6849 from HabitRPG/sabrecat/pets-201603
...
Pet quest March 2016
2016-03-09 15:11:14 -06:00
Sabe Jones
cc53e6e9dc
Merge pull request #6733 from vIiRuS/mobileStorage
...
Store data for next mobile update
2016-03-09 14:56:15 -06:00
Sabe Jones
45b8dbc1a6
feat(content): snails complete
2016-03-09 15:55:22 -05:00
Sabe Jones
d153df7805
feat(content): snail pet quest WIP
2016-03-09 15:34:57 -05:00
Kaitlin Hipkin
b0fe5f4081
add 2x party up/on achieve images and recompile spritesheets
2016-03-09 12:43:54 -05:00
Kaitlin Hipkin
6642a8e131
add party up/on achiev images and recompile spritesheets
2016-03-09 12:02:43 -05:00
