2aa3a3175f
Merge branch 'develop' into kelsin-develop
2016-04-27 19:11:56 -05:00
a326873935
chore: Add emoji lib back in
...
The 3rd party chat extension was breaking because this library was
missing. Remove this after the chat extension is updated
https://github.com/Horacious/HabitRPG-Chat-Extension/pull/40
2016-04-26 23:07:15 -05:00
4f1a4393e1
fix: Adjust spacing of emoji in tags
2016-04-26 12:50:37 -05:00
e7315253dd
feat: Switch out js-emoji for habtiica-markdown
2016-04-26 08:19:47 -05:00
ad57dedecb
refactor: Swap out remarkable for habitica flavored markdown-it
2016-04-25 07:36:02 -05:00
867146dc19
fix(xss): Update site to use remarkable instead of marked
...
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
2016-04-21 13:23:53 -05:00
10936d9a4d
chore: Switch to custom eslint-config
2016-04-15 09:03:59 -05:00
59749acf50
Fixed reward sound playing after gold subtracted
...
(cherry picked from commit 2508b5ac18closes #7058
fixes #6963
2016-04-12 07:36:44 -05:00
ae14d405cb
fix(css): Scope textarea z-index to just task boxes
2016-04-05 20:07:11 -05:00
c7d058f2bc
Add z-index to notes textarea
2016-04-04 20:48:54 -05:00
01a7132b0b
refactor: Extract play reward sound logic into function
2016-03-23 17:55:44 -05:00
7b708f51ba
Proposed bug fix, issue #6668 - erroneous reward purchase sound
2016-03-23 17:55:41 -05:00
86516b5e20
Update presskit
2016-03-22 08:41:02 -05:00
9f0704aa94
modal explaining new class gear is now class-agnostic
2016-03-18 23:23:12 -04:00
8447259016
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
...
Spring Fling 2016
2016-03-18 16:08:46 -05:00
ccdbdb2969
fix(seasonal-shop): choose quest more precisely
2016-03-17 13:13:21 -04:00
10a8476aaf
WIP(event): Spring Fling cont'd
2016-03-17 13:10:05 -04:00
ced0b44b2f
fix: Remove name from sortable inventory
2016-03-17 08:47:56 -05:00
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
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
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
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
792e8d8094
fix awarding of party {up,on} achievs to update server
2016-03-10 20:38:53 -05:00
d2d3b9deab
award party {up,on} achiev when party reaches {2,4} members
2016-03-08 20:55:18 -05:00
f5ea9c5524
fix(analytics): don't log chat messages
2016-03-08 15:19:39 -05:00
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
87bd55cca1
Merge pull request #6780 from colwem/issue6774
...
Improve styling of markdown blockquotes - fixes #6774
2016-03-06 19:59:30 +10:00
edce3d01a9
Resizing image to remove aliasing
2016-03-05 11:13:20 -08:00
82cfd8afc8
Moving to new purple logo.png
2016-03-05 11:06:01 -08:00
4f4ea8416c
Closed issue #6758
...
After some discussion on the thread, this is probably the neatest
solution to issue #6758 . I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
2016-03-04 13:16:37 -03:00
8d7c46d79f
Merge branch 'develop' into use-level-style-in-modals
2016-02-28 10:13:10 -08:00
93410c4f7a
issue(6774): add support for markdown blockquote
2016-02-26 20:07:12 -05:00
c107e42978
Change userLevelStyle to a root scope so it can be used in modals.
2016-02-25 15:59:04 -08:00
896773f9ef
Adding android app banners
...
Fixes #6692
2016-02-20 11:56:39 -08:00
ffb5cfd46e
Merge pull request #6582 from tylerxo/remove_modal_username
...
Adds user details to the removal modal
2016-02-18 06:39:31 +10:00
065238525c
Removing extra class in favor of .lead
2016-02-02 10:22:17 -08:00
f7163519c1
Make task help icons consistent across browsers
...
The zoom CSS property isn't supported by Firefox, and nor is
vertical-align: -webkit-baseline-middle. font-size: 1.5em has the same
effect, and vertical-align: middle ensures that the tooltip doesn't
overlap with the icon.
2016-01-31 15:41:00 +00:00
91c6ce27c5
feat(event): Habit Birthday 2016
...
Also adds AWS Elastic Beanstalk local config file to .gitignore.
2016-01-28 17:16:01 -05:00
77cfc99b59
Adding user details to the removal modal
2016-01-25 17:37:18 -08:00
7d0ad86c43
Color code quest accepted/rejected text
2016-01-22 21:56:39 +00:00
274157d21d
Merge branch 'tylerxo/menu-error-fix' into develop
2016-01-20 14:34:55 -05:00
016b080836
Merge branch 'anowlcalledjosh/add-task-fix' into develop
2016-01-20 14:27:21 -05:00
af53285e01
Merge branch 'proarunas/fix-css-bugs' into develop
2016-01-20 14:17:39 -05:00
f3d6c62484
More closely matching coding style within the file
2016-01-19 19:57:11 -08:00
b5b3a1545b
Adding conditional to prevent undefined object error
2016-01-19 19:53:20 -08:00
77342e5790
Fix 'add task' button jumping around
2016-01-19 20:56:06 +00:00
c4acd262eb
Merge pull request #6476 from Sighne/sighne/upgrade-amount-users
...
#6460 : upgrade amount of users
2016-01-19 13:41:03 -06:00
3a300cb93e
add new emails images
2016-01-19 18:30:57 +01:00
2989057dd3
Fix for issue #5182 : Allow cancel editing group infobox
2016-01-18 22:39:06 -06:00
Blade Barringer