Josh Holland
952d9ec929
Quick allocation of attribute points from level-up modal
...
Resolves #6720 .
2016-03-16 22:06:54 -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
Blade Barringer
1c811dbc82
refactor: Extract orderBy equipment button into mixin
2016-03-15 19:41:24 -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
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
Matteo Pagliazzi
219ec01ce9
port shared.ops.allocate
2016-03-15 18:41:23 +01:00
Matteo Pagliazzi
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
Matteo Pagliazzi
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
Matteo Pagliazzi
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
Matteo Pagliazzi
490c6a9ae1
wip(shared): port sleep op
2016-03-15 16:33:44 +01:00
Keith Holliday
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
Matteo Pagliazzi
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
Matteo Pagliazzi
8e3284a4e3
wip(shared): adapt to v3
2016-03-13 22:26:32 +01:00
Victor Piousbox
0b25720232
cleanup
2016-03-13 14:01:53 -07:00
Victor Piousbox
c61b10a6eb
resolve conflicts
2016-03-13 10:45:19 -07:00
Victor Piousbox
c14f0c4247
update username, password
2016-03-13 10:42:59 -07:00
Victor Piousbox
46322cfd38
update username, password
2016-03-12 23:32:20 -08:00
Keith Holliday
c04e53b5a5
Added initial delete challenge tasks tests
2016-03-12 21:00:43 -06:00
Matteo Pagliazzi
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
Matteo Pagliazzi
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
Keith Holliday
152f7605cd
Added initial test for removing challenge checklist item
2016-03-12 10:55:12 -06:00
Keith Holliday
e4124f9e02
Added initial checklist item update tests
2016-03-12 10:38:40 -06:00
Matteo Pagliazzi
c02082a200
Merge branch 'develop' into api-v3
2016-03-12 16:00:24 +01:00
Matteo Pagliazzi
2fa361d9ea
Merge pull request #6865 from TheHollidayInn/api-v3-challenge-add-checklist-item
...
Add initial tests for add checklist item to challenge
2016-03-12 15:56:32 +01:00
Matteo Pagliazzi
8463abb830
Merge pull request #6853 from TheHollidayInn/api-v3-challenge-tasks-put
...
Added initial challenge task update tests
2016-03-12 14:52:54 +01:00
Keith Holliday
0af912bebb
Add initial tests for add checklist item to challenge
2016-03-11 14:19:46 -06:00
Matteo Pagliazzi
c6e5e3eb1f
Merge pull request #6787 from TheHollidayInn/api-v3-challenge-model-tests
...
Added initial challenge model tests
2016-03-11 19:17:09 +01:00
Matteo Pagliazzi
29b6e958c6
fix failing tests
2016-03-11 09:51:59 +01:00
Kaitlin Hipkin
792e8d8094
fix awarding of party {up,on} achievs to update server
2016-03-10 20:38:53 -05:00
Sabe Jones
d608fdb437
fix(news): Pfeffernusse typo
2016-03-10 16:59:39 -06:00
Keith Holliday
61e360a1d8
Added initial challenge task update tests
2016-03-10 15:30:22 -06:00
Blade Barringer
0f7a730a58
Add fix for running in dev and test mode
2016-03-10 12:16:19 -06:00
Matteo Pagliazzi
fbdbd8e006
Merge branch 'develop' into api-v3
2016-03-10 18:30:09 +01:00
Matteo Pagliazzi
ec13a34228
Merge pull request #6842 from TheHollidayInn/api-v3-challenge-tasks-get
...
Added initial get challenge task by id
2016-03-10 16:53:14 +01: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
d153df7805
feat(content): snail pet quest WIP
2016-03-09 15:34:57 -05:00
Kaitlin Hipkin
fe178a62d9
move party up/on achievs about beast/mount achievs on profile
2016-03-08 21:03:57 -05:00
Kaitlin Hipkin
2ade78fc34
show party up/on achievs on user's profile achievements section
2016-03-08 20:57:19 -05:00
Kaitlin Hipkin
d2d3b9deab
award party {up,on} achiev when party reaches {2,4} members
2016-03-08 20:55:18 -05:00
Blade Barringer
3fa9d17ad4
Merge branch 'develop' into api-v3
2016-03-08 19:25:50 -06:00
Matteo Pagliazzi
582ded4494
disable rate limiting middleware
2016-03-08 23:21:11 +01:00
Sabe Jones
f5ea9c5524
fix(analytics): don't log chat messages
2016-03-08 15:19:39 -05:00
Keith Holliday
22e64bb88e
Added initial get challenge task by id
2016-03-08 12:42:05 -06:00
Lucas Torroba
d502db71e5
Changed tavern tier 1 text icon
...
The icon for the text/description of the 1st tier contributor was
incorrect. It should be the boot icon, but the firefox icon was being
displayed.
2016-03-08 03:05:46 -03:00
Phillip Thelen
36790592c6
add tests for improvement categories
2016-03-06 17:56:51 +01:00
Alys
34057c375b
Merge pull request #6819 from zesme/develop
...
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
2016-03-06 20:28:47 +10:00
