4e73c8513e
Hide progress if user is not on quest ( #9597 )
2017-11-30 12:37:31 -06:00
6f9cbf9ca1
Only update the user when editing profile ( #9601 )
2017-11-30 08:19:03 -06:00
77f71b5415
Fixed saving in progress tag when clicking save ( #9598 )
2017-11-30 08:16:54 -06:00
ced3621dea
Fixed leaving from guild list item ( #9599 )
2017-11-30 08:16:00 -06:00
e321d85b3c
Donate buy modal fix ( #9604 )
...
* Added donate back and buy modal
* Fixed login check
* Added ability to remove mustache
2017-11-30 08:15:28 -06:00
d72b40d5b0
Merge branch 'release' into develop
2017-11-29 05:07:42 +00:00
00dc990974
chore(event): end Thanksgiving, add Bailey
2017-11-29 05:03:01 +00:00
3737aa045d
Fixed text when cloning ( #9594 )
2017-11-28 19:18:04 -06:00
4ab89fd3e0
Bug fixes on Subscription termination date format [Fixes Issues #9186 ] ( #9583 )
...
* Fixed date.
* Got rid of the filter and returned moment.
* fix the return value
* Stupid typo.
2017-11-28 09:19:29 +01:00
f1e200c0f5
autofix pinned seasonal gear - fixes #9448 ( #9570 )
...
* auto-remove officialPinned item from userPinned-array on pinning
* hide event limited message if an item was already owned by the user
2017-11-28 09:11:40 +01:00
218664dfcc
(ISSUE-9353) Fix pinned item alignment ( #9358 )
...
* (ISSUE-9353) Fix pinned item alignment
- Get rid of justify-content: space-between to allow flex-start default to be used
- Add margin to direct children (item-wrappers)
* Issue-9353: Change selector to & > div instead of just > for more explicit selection of direct child divs
* Fix rewards item spacing to match Zeplin mockups
- Make sure horizontal/vertical spacing between items is 16px
- Add use of grid if supported, else use flex
2017-11-27 20:54:03 -06:00
a0f29e970d
fix Stable sidebar width and center inventory drawer ( fixes #9263 ) ( #9419 )
...
* fix Stable sidebar width and center inventory drawer (fixes #9263 )
* hide all .standard-sidebars on small/mobile devices
2017-11-27 20:48:52 -06:00
dd05a8d608
Contributor Title tooltip ( #9413 )
...
* Remove usage of cachedProfileData when determining contributor level
* Add tooltip
* Remove directive import
* /s/msg.contributor.title/msg.contributor.text
* move tooltip placement
* update tooltip position
2017-11-27 20:37:36 -06:00
26bde1f766
Character Create Modal - Prevent Options From Jumping When Selected ( #9252 )
...
* Prevent options from jumping when selected due to border being added/removed based on active option. Instead, always have a border on the option but set its color when active
* Use gray instead of white border in order to match background so that it isn't visible while unselected. Add margin-bottom back
* Make sure the locked option style remains unchanged
- Nest .locked in .customize-options .option to get specificity
- Override border, border-radius, and margin-top for .locked
- Set the override values to what would be applied without other style changes
2017-11-27 20:11:15 -06:00
d95836b881
Translator minor changes fixes #8917 ( #9297 )
...
* Updated userItemsNotEnough string
* Added a variable to be passed to the deleteSocialAccountText string. This variable name is `magic_word` and is set as DELETE where used
* modified incorrectDeletePhrase to use a variable rather than translatable string for the word DELETE. Updated the DELETE-user test and the user api
* Changed noSudoAccess from translatable string to static
* Changed enterprisePlansEmailSubject from a translatable string to a static string within groupPlans.vue
* Fixed test problems with translation fixes
* Added no sudo access string to api messages
* changed plain string to apiMessage for no sudo access messages
2017-11-27 20:08:39 -06:00
fac81bb9ee
Long names overflow task box fixes #9403 ( #9404 )
...
* Issue 9403 Long names overflow task box
* Added padding
* Enabled overflow-wrap: break-word;
Added min width to allow overflow-wrap to actually break content
2017-11-27 20:07:13 -06:00
b323abd225
Added confirmation step at begin button for quest ( #9199 )
...
* Added confirmation step at begin button for quest
* Fixed the 3 errors caused by questConfirm method in travis-ci
2017-11-27 20:05:05 -06:00
b3870e5f34
multiple market fixes ( #9468 )
...
* show `selectMemberModal` to send a card, even if the user doesn't have a party yet
* market - prevent filter reset on pinning items
* hide buy amount for gear, backgrounds, mystery_set, card, rebirth_orb, fortify, armoire - fix mystery set preview in timetravelers
* purchase confirmation on gem / hourglass purchases
* fix lint
2017-11-27 19:54:55 -06:00
29dc56c12f
Party roster sorter: Member Modal Component ( #9472 )
...
* modify sort options for party members
* add unittest for membersModalComponent sort
* updates as requested in PR
* removed duplicates for `class` and `background` from flavour text
* fix linting error thrown by travis ci
2017-11-27 19:54:13 -06:00
b62f08d500
Misc. bug fixes from lgtm.com (2) ( #9474 )
...
* Remove dead branch of ternary: `gift` is always truthy here
Problem found here:
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/server/libs/amazonPayments.js?sort=name&dir=ASC&mode=heatmap&excluded=false#x5a22f31110a55091:1
* Remove superfluous argument, preenUserHistory only takes two args
Problem found here:
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/server/libs/cron.js?sort=name&dir=ASC&mode=heatmap&excluded=false#xf16a045ecabb07f6:1
* Cleanup: remove useless assignments
Problems found here:
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/store/actions/shops.js?sort=name&dir=ASC&mode=heatmap&excluded=false#xf782ed2cf920441%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/app.vue?sort=name&dir=ASC&mode=heatmap&excluded=false#x172c1dda85e84dc8%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/components/settings/site.vue#x9b3afee802a3a8f8%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/components/selectMembersModal.vue?sort=name&dir=ASC&mode=heatmap&excluded=false#x1fbc2a3d62facd70:1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/common/script/libs/taskClasses.js?sort=name&dir=ASC&mode=heatmap&excluded=false#x41ce0e121a4defee:1
* Fix online editor whitespace change.
2017-11-27 19:51:25 -06:00
885f2998ae
System messages flaggable ( #9408 )
...
* Remove flag from system messages, throw an error if system messages are flagged
* Modify unflag system message test to check if flagging a system message throws an error
* Move email from nconf to top
2017-11-27 19:45:04 -06:00
2afd96e11c
Remove spaces from filters ( #9524 )
2017-11-27 19:44:33 -06:00
cd92f44365
Fix difficult to edit checklists in Firefox ( #9525 )
...
* Change checklist item hover from move to text
* Add vue draggable
* Add vue draggable
* Replace sortablejs directive with Vue Draggable component
* Indent draggable properties
2017-11-27 19:43:24 -06:00
863177902a
Remove extra 'to' paramater from router link ( #9529 )
2017-11-27 19:42:53 -06:00
8895b70ffa
Adjust left positioning of the left-panel to unobscure sroll-bar, change left panel overflow to overflow-y ( #9544 )
2017-11-27 19:35:30 -06:00
9b8676f02e
Changed "Donate" button to "Contribute" button ( #9581 )
...
* Changed functionality of "donate"-button on static pages
* Changed strings to reflect change from "donate" to "contribute"
2017-11-27 19:29:45 -06:00
3e7738b5b1
Added keys to for loops ( #9584 )
2017-11-27 12:46:25 -06:00
33a235b46c
Fixed equiping glasses and ears ( #9585 )
2017-11-27 12:19:36 -06:00
137d6c1f9d
Set default empty array when party members haven't loaded ( #9579 )
...
* Set default empty array when party members haven't loaded
* Corrected variable usage
2017-11-27 11:59:42 -06:00
3e6b3ce3ff
Added habitica event for profile display ( #9576 )
2017-11-27 10:29:20 -06:00
ea5ba965e7
Fixed promoting group leader ( #9574 )
2017-11-27 10:27:30 -06:00
7215a550b5
Added page increment when page is loaded to prevent scroll stopping ( #9573 )
2017-11-27 10:23:04 -06:00
3235dfa236
Added equipment filter ( #9572 )
2017-11-27 10:22:34 -06:00
53c83c585a
fix navbar not showing up in homepage
2017-11-23 16:07:58 +01:00
9eaa531f66
Amazon payment fixes ( #9562 )
...
* Added custom amazon event, removed redundency, fixed variable names
* Fixed more variables and group plan data
2017-11-21 14:02:40 -06:00
3ffea4332e
Added extra confirmation incase the class modal shows multiple times ( #9557 )
2017-11-20 15:57:33 -06:00
4618fd8954
Merge branch 'release' into develop
2017-11-20 19:21:17 +00:00
1845bd1e35
Fixed display of RYA behind bailey ( #9555 )
2017-11-20 12:38:26 -06:00
9c2f5213cb
Challenge fixes ( #9528 )
...
* Added challenge member search to progress dropdown
* Added leave challenge modal
* Allowed editing for challenge leader only
* Pevented users from editing challenge task info
* Set default progress default to daily
* Removed reward filters from user challenge progress
2017-11-17 17:13:07 -06:00
c06d5107ac
Merge branch 'release' into develop
2017-11-17 22:50:27 +00:00
2a5e9c0780
feat(event): Turkey Day 2017
...
and (content) November Subscriber Items
2017-11-17 22:21:05 +00:00
c8ca67aa64
fix(seasonal-shop): short circuit if categories empty
2017-11-17 18:32:55 +00:00
89e4cbcffe
Disable immutable inputs when editing a challenge ( #9412 )
...
* Disable uneditable inputs when editing a challenge
* Revert prize display when creating
2017-11-17 23:45:38 +11:00
67564317fb
Group plan fixes ( #9518 )
...
* Fixed group plan editing
* Added translations
* Abstracted query for group or challenge tasks
2017-11-17 20:31:39 +11:00
dc2269a307
Hot fixes nov 15 ( #9519 )
...
* Added fortify sync. Removed multiple buy
* Added yesterdaily check
* Fixed checks for running yesterdailies
2017-11-17 20:31:29 +11:00
b0051c45b4
fix(group-plans): more claim/unclaim alignment
2017-11-16 21:21:39 +00:00
b82044e07b
fix Remove Claim positioning
2017-11-16 22:05:35 +01:00
b4c4769208
fix: correctly handle bootstrap variables
2017-11-16 21:59:55 +01:00
42a05446c0
fix(notifications): extend snackbar duration
2017-11-16 20:32:57 +00:00
9f7c0b4861
Fix regex for message highlighting ( #9516 )
2017-11-16 14:12:26 -06:00
Keith Holliday