Blade Barringer
fd10422e0c
tests: Add preliminary tests around send message and send gift
2016-03-22 21:49:27 -05:00
Blade Barringer
f5d4eba292
fix: Default message to '' when not passed in sendGift route
2016-03-22 21:49:27 -05:00
Brian Murray
eaea55687b
Make change regarding pluralization of gem gift message easier to read and not one long line
2016-03-22 21:49:27 -05:00
Brian Murray
369386e370
Only add an 's' to months of subscription or gems given if they are not 1.
2016-03-22 21:49:22 -05:00
Blade Barringer
9b9722a7b4
chore(i18n): update locales
2016-03-22 17:40:42 -05:00
Bleu
521195ab95
fix: Unify html in translation strings
...
Closes #6859
2016-03-22 17:34:29 -05:00
MathWhiz
86516b5e20
Update presskit
2016-03-22 08:41:02 -05:00
Blade Barringer
92ac703ecc
chore(i18n): update locales
2016-03-22 08:31:14 -05:00
Blade Barringer
3add287a85
Merge branch 'khipkin-fix_class_change_gear_modal' into develop
2016-03-22 08:10:55 -05:00
MathWhiz
c70b40e0a3
Add pull request instructions to CONTRIBUTING.MD
2016-03-22 07:59:13 -05:00
Blade Barringer
bbcef441bf
Adjust template instructions
2016-03-22 07:59:13 -05:00
mathwhiz
a5b7066358
Add templates for issues and pull requests
2016-03-22 07:59:06 -05:00
Kaitlin Hipkin
9f0704aa94
modal explaining new class gear is now class-agnostic
2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
...
Spring Fling 2016
2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f
feat(event): Spring Fling complete
2016-03-18 16:56:16 -04:00
Blade Barringer
cd6ab23106
Merge pull request #6900 from doyler/develop
...
Note about weekly progress update (fixes #6884 )
2016-03-18 07:37:32 -05:00
Blade Barringer
4cb652dca4
Merge pull request #6889 from crookedneighbor/add_debug_scripts
...
feat: Add debug scripts to easilly get all pets/mounts/gear
2016-03-18 07:36:27 -05:00
Blade Barringer
22c83c92c2
Merge pull request #6904 from HabitRPG/inventory_sorting_debug
...
Inventory sorting debug
2016-03-18 07:33:45 -05:00
Alys
fb338a00cb
prevent quests being started in guilds
2016-03-18 08:38:32 +10:00
Blade Barringer
de2f9eb28b
Update tests to us set by default
2016-03-17 17:28:46 -05:00
Sabe Jones
ccdbdb2969
fix(seasonal-shop): choose quest more precisely
2016-03-17 13:13:21 -04:00
Sabe Jones
10a8476aaf
WIP(event): Spring Fling cont'd
2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17
WIP(event): Spring Fling partial
2016-03-17 13:04:12 -04:00
Sabe Jones
816ef00378
Merge pull request #6890 from khipkin/new_party_badges
...
add tests for awarding party {up,on} achievs
2016-03-17 11:05:20 -05:00
Blade Barringer
ced0b44b2f
fix: Remove name from sortable inventory
2016-03-17 08:47:56 -05:00
Blade Barringer
d4d668a7aa
fix: Correct typo in equipment click
2016-03-17 08:09:37 -05:00
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
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
