Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge development into marketplace #2529

Merged
merged 116 commits into from
Jul 11, 2017
Merged
Show file tree
Hide file tree
Changes from 113 commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
b9a5237
Allow customer to move past validation after one pass
brent-hoover Apr 17, 2017
6917f5c
Silencing needless warning
brent-hoover Apr 17, 2017
cca678a
Add missing imports
brent-hoover Apr 17, 2017
433bef6
When we get a "GetTax" error, revert to addressbook
brent-hoover Apr 17, 2017
5b64575
Capture and parse errors
brent-hoover Apr 17, 2017
564dfdf
Creating a "review and fix" address review screen
brent-hoover Apr 20, 2017
7f7a02a
Show highlited diff. Copy over values on click.
brent-hoover Apr 21, 2017
9a56646
Removing "debug" HTML
brent-hoover Apr 21, 2017
28db441
Add "review address" translation
brent-hoover Apr 21, 2017
f5c7c9e
Basic "review address" flow working
brent-hoover Apr 21, 2017
c5c79a4
Remove console.log
brent-hoover Apr 21, 2017
540c24e
Merge branch 'development' into brent-fix-issue-2104
brent-hoover Apr 25, 2017
9393e16
Fix missing import
brent-hoover Apr 25, 2017
9218f31
Fix import error
brent-hoover Apr 25, 2017
4ac11b2
Return to edit and refresh address when you cancel out of review
brent-hoover Apr 25, 2017
9f8da99
Make edit behave the same as add
brent-hoover Apr 25, 2017
3d972d0
Tweak styling
brent-hoover Apr 25, 2017
5ce8394
Merge branch 'development' into brent-fix-issue-2104
brent-hoover May 14, 2017
de48f0b
Merge branch 'development' into brent-fix-issue-2104
brent-hoover May 24, 2017
7e330d9
More and more style changes
brent-hoover May 24, 2017
4729320
Use proper color variables
brent-hoover May 25, 2017
31c0349
Create proper behaviors
brent-hoover May 25, 2017
62b9c45
Merge branch 'development' into brent-fix-issue-2104
brent-hoover May 25, 2017
1de63a3
Fix bad evaluation
brent-hoover May 25, 2017
e263769
Fix import order
brent-hoover May 25, 2017
239680d
Add i18n
brent-hoover May 25, 2017
c72247a
Don't throwback a step if tax fails
brent-hoover May 25, 2017
0d069d7
Make this more of an "exception" flag
brent-hoover May 26, 2017
c1c4b3f
Adding the license description with link on README (#2365)
rafaelstz May 30, 2017
df6739d
added Nigerian Naira to currency list in (#2366)
casoetan May 31, 2017
5b446c7
CollectionFS cfs:tempstore and cfs:worker to fix concurrency issues …
lcampanis Jun 4, 2017
eef7f18
Correct the way we record tax overrides
brent-hoover Jun 5, 2017
9cfe6e8
[WIP] Meteor 1.5 (#2371)
Jun 7, 2017
6d88f3c
Declare variable (#2401)
brent-hoover Jun 8, 2017
133e764
Implement missing router functions (#2393)
mikemurray Jun 8, 2017
ea5aa34
2332 Fix Improper Cart Merge (#2387)
abdulsemiu-atanda Jun 8, 2017
278756a
Change line width to match GH PR review width (#2407)
brent-hoover Jun 8, 2017
bcd7d1d
Orders updates (#2400)
kieckhafer Jun 8, 2017
f3ca0d4
use route permissions in register.js files (#2388)
Jun 8, 2017
1e4d7fc
Milestone 54 / Convert Navbar to React (#2306)
brent-hoover Jun 8, 2017
6e45ad6
Merge branch 'development' into brent-fix-issue-2104
brent-hoover Jun 8, 2017
a0b44da
import order
kieckhafer Jun 8, 2017
d202a0a
Merge pull request #2162 from reactioncommerce/brent-fix-issue-2104
kieckhafer Jun 8, 2017
18d45a2
remove duplicate babel preset packages
jshimko Jun 9, 2017
42ffc56
Merge pull request #2415 from reactioncommerce/fix-duplicate-packages
kieckhafer Jun 9, 2017
73274c9
Updated yarn.lock and removed npm-shrinkwrap.json
Jun 9, 2017
da41bc0
Admin should be able to invite a user with the same name (#2386)
Jun 12, 2017
754e66b
Merge branch 'master' into development
Jun 12, 2017
c8409ff
Update version
Jun 13, 2017
9858361
switch to Reaction’s new fork of Nodemailer (#2427)
jshimko Jun 13, 2017
4512d75
Added module aliases (#2436)
mikemurray Jun 15, 2017
352c98d
LingoHub Update :rocket: (#2420)
Jun 16, 2017
43e0a60
Add css style to differentiate read from unread notifications (#2442)
Jun 16, 2017
b2b8e7f
Remove acceptance tests (#2430)
brent-hoover Jun 16, 2017
5d0fc79
Fixed console error when dragging product images (#2443)
rhenshaw56 Jun 16, 2017
e4bade3
Add closeOnClick option to DropDownMenu component (#2418)
spencern Jun 16, 2017
6d50cea
add missing "orders not found" text (#2424)
kieckhafer Jun 17, 2017
c5ee98a
Merge branch 'development' into Release-1.3.0
Jun 17, 2017
f7aa04b
Updated chai package
Jun 17, 2017
4efb14e
Merge branch 'Release-1.3.0' into development
Jun 17, 2017
dd0a77b
Bunyan and Loggly updates (#2425)
jshimko Jun 19, 2017
b64ee84
refactor default admin user creation (#2453)
jshimko Jun 19, 2017
72d1ad3
update memory usage in CircleCI build (#2462)
jshimko Jun 19, 2017
25e8942
Navbar hover issue (#2451)
rhenshaw56 Jun 20, 2017
cea9557
set css property overflow on horizontal to hidden (#2458)
rhenshaw56 Jun 20, 2017
1d0fd64
[WIP] 2452 fix on UI icon toolbar (#2460)
rhenshaw56 Jun 20, 2017
1a6a8f3
[WIP] 2356 fix on tag menu-sidebar glitch (#2472)
rhenshaw56 Jun 20, 2017
b59263b
update media gallery new / deleted image indicators (#2469)
kieckhafer Jun 20, 2017
c9a0b28
Remove random regex checks on names. Fixes #2461 (#2471)
brent-hoover Jun 20, 2017
670ee6b
remove older Blaze based launchdock plugin (#2467)
jshimko Jun 20, 2017
e87ea72
2459 router range error fix (#2476)
prosf Jun 20, 2017
c737ac9
2422 Fix on email invite link leading to blank screen (#2437)
rhenshaw56 Jun 21, 2017
c27f70e
Update current user's name on Navbar and profile page when address is…
Jun 21, 2017
3144dc3
Updated dependencies (#2463)
Jun 21, 2017
3f252fe
Revert minifier to abernix fork (#2486)
jshimko Jun 22, 2017
db4e8d2
Release 1.3.0 (#2417)
Jun 22, 2017
543ddc0
Fix error when inviting already invited user (#2433)
Jun 22, 2017
b2460bd
Updated timeout time. (#2492)
rymorgan Jun 22, 2017
075defe
Fixed product images not displaying on order completed page (#2490)
Jun 23, 2017
f7e1c4c
Fix hard refresh on clicking tag link on product detail page (#2489)
Jun 23, 2017
34162e0
Remove redundant risul:moment-timezone (#2491)
Jun 23, 2017
6e05c46
Merge 1.3.0 master into development
Jun 23, 2017
b277f14
Fix ESLint4 errors correct eslint config errors (#2450)
brent-hoover Jun 28, 2017
f3d29d4
New SortableTable component to replace MeteorGriddle (#2416)
kieckhafer Jun 28, 2017
f6438c7
Fix linting problems introduced in new SortableTable (#2505)
brent-hoover Jun 28, 2017
e7f7365
Show proper error messages when Stripe payments fail (#2499)
brent-hoover Jun 28, 2017
44d7ffc
Fix missing reference (#2507)
brent-hoover Jun 29, 2017
38abcca
Default to using shop country code or GeoIP result for new addresses …
spencern Jul 2, 2017
8561bd4
Add Tunisian Dinar currency (#2517)
stoufa88 Jul 4, 2017
e89d09e
Fix issue dragging images in PDP when settings drawer is open (#2506)
Jul 5, 2017
dbcc10f
Fix send sms method to read settings of shop and buyer userId (#2508)
Jul 5, 2017
25a5ecd
Fix Errors importing exported product data (#2513)
Jul 5, 2017
ef02537
Convert product grid to React: Milestone 57 (#2402)
joykare Jul 5, 2017
9d6c0d4
Fix for no scrollbar in Dashboard (#2511)
Jul 6, 2017
2f0330c
Merge branch 'development' into spencer-merge-dev-marketplace
spencern Jul 6, 2017
4eb467b
Remove duplicate declaration
brent-hoover Jul 6, 2017
8b0a0f0
Eslint autofix indentation
brent-hoover Jul 6, 2017
3e02577
Fix missing imports
brent-hoover Jul 6, 2017
9c9be26
Remove errant `only`
brent-hoover Jul 6, 2017
50e79e1
Restore marketplace core methods
spencern Jul 6, 2017
2f9de9b
This test sometimes returns an empty array and sometimes returns unde…
spencern Jul 6, 2017
07fd0fc
Restore missing marketplace helpers in profile.js
spencern Jul 6, 2017
9927e85
Fix for issue #1993 (#2518)
prinzdezibel Jul 6, 2017
ea05907
Fix unable to open fulfill order action view (#2530)
Jul 7, 2017
a1fd03b
Fix sneaky bug - someone changed `name` to `packageName` - caused sho…
spencern Jul 7, 2017
16d83b1
Fix Exception in delivering result of invoking 'email/verifySettings'…
Jul 7, 2017
a681f47
Merge branch 'marketplace' into spencer-merge-dev-marketplace
spencern Jul 7, 2017
ccc9cda
Fix permissions issue blocking shop owners from updating their shop.
spencern Jul 7, 2017
442aef4
Remove leftover console.log
spencern Jul 7, 2017
b1fae31
update Docker base to v2.0.2 (#2537)
jshimko Jul 8, 2017
ce7d8a1
Fix order action button reverting status to processing (#2541)
nbaldwin Jul 9, 2017
0bc04f0
Update eslint to v4 (#2542)
brent-hoover Jul 10, 2017
9568cf2
Merge branch 'development' into spencer-merge-dev-marketplace
spencern Jul 10, 2017
96f40ab
Fix publish-counts module name map for jest
spencern Jul 11, 2017
044a647
Fixes typo
spencern Jul 11, 2017
198e694
Fix more typos
spencern Jul 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 33 additions & 21 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,44 @@
"env": {
"browser": true,
"node": true,
"es6": true
"es6": true,
"mocha": true
},
"globals": {
"browser": true,
"Assets": true, // Meteor global
"Package": true, // Meteor global
"FS": true, // gridFS,
"Alerts": true, // this needs to get cleaned up, but ignoring for now
"jest": true,
"expect": true,
"test": true
},
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"classes": true,
"defaultParams": true,
"destructuring": true,
"forOf": true,
"generators": false,
"modules": true,
"objectLiteralComputedProperties": true,
"objectLiteralDuplicateProperties": false,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"spread": true,
"superInFunctions": true,
"templateStrings": true,
"jsx": true
},
"allowImportExportEverywhere": true
},
"plugins": ["react"],
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"classes": true,
"defaultParams": true,
"destructuring": true,
"forOf": true,
"generators": false,
"modules": true,
"objectLiteralComputedProperties": true,
"objectLiteralDuplicateProperties": false,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"spread": true,
"superInFunctions": true,
"templateStrings": true,
"jsx": true
},
// NOTE: We're now using eslint-3
// NOTE: We're now using eslint-4
"rules": {
/**
* Strict mode
Expand Down Expand Up @@ -160,7 +171,8 @@
"no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
"no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
"no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
"no-with": 2, // http://eslint.org/docs/rules/no-with
"no-with": 2, // http://eslint.org/docs/rules/no-with,
"no-undef": 2,
"radix": 2, // http://eslint.org/docs/rules/radix
"vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top
"wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife
Expand Down
1 change: 0 additions & 1 deletion .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ [email protected]
[email protected]
[email protected]
[email protected]
amplify
mdg:validated-method
[email protected]
dynamic-import
Expand Down
1 change: 0 additions & 1 deletion .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM reactioncommerce/base:v2.0.0
FROM reactioncommerce/base:v2.0.2

# Default environment variables
ENV ROOT_URL "http://localhost"
Expand Down
1 change: 1 addition & 0 deletions client/config/defaults.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Session } from "meteor/session";
import { AutoForm } from "meteor/aldeed:autoform";

/**
* Misc. App. Configuration
Expand Down
2 changes: 1 addition & 1 deletion client/modules/accounts/components/auth/loginButtons.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class LoginButtons extends Component {
 
<Translation defaultValue={this.props.capitalizeName(service.name)} i18nKey={`social.${service.name}`} />
</span>
</Button>
</Button>
))
}
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/modules/accounts/components/auth/signIn.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class SignIn extends Component {
value={this.state.email}
onChange={this.handleFieldChange}
/>
{this.renderEmailErrors()}
{this.renderEmailErrors()}
</div>

<div className={passwordClasses}>
Expand All @@ -149,7 +149,7 @@ class SignIn extends Component {
value={this.state.password}
onChange={this.handleFieldChange}
/>
{this.renderPasswordErrors()}
{this.renderPasswordErrors()}
</div>

<div className="form-group">
Expand Down
14 changes: 7 additions & 7 deletions client/modules/accounts/components/auth/signUp.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class SignUp extends Component {
value={this.state.password}
onChange={this.handleFieldChange}
/>
{this.renderPasswordErrors()}
{this.renderPasswordErrors()}
</div>

<div className="form-group">
Expand Down Expand Up @@ -170,14 +170,14 @@ class SignUp extends Component {
return (
<div>
<div className="loginForm-title">
<h2>
<Translation defaultValue="Create an Account" i18nKey="accountsUI.createAccount" />
</h2>
</div>
<h2>
<Translation defaultValue="Create an Account" i18nKey="accountsUI.createAccount" />
</h2>
</div>

{this.renderForm(emailClasses, passwordClasses)}
{this.renderForm(emailClasses, passwordClasses)}

</div>
</div>
);
}
}
Expand Down
16 changes: 8 additions & 8 deletions client/modules/accounts/components/dropdown/mainDropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ class MainDropdown extends Component {
<div>
{this.props.currentUser ?
<div style={{ paddingRight: 5 }}>
<DropDownMenu
buttonElement={this.buttonElement()}
attachment="bottom right"
targetAttachment="top right"
menuStyle={menuStyle}
className="accounts-li-tag"
onChange={this.props.handleChange}
>
<DropDownMenu
buttonElement={this.buttonElement()}
attachment="bottom right"
targetAttachment="top right"
menuStyle={menuStyle}
className="accounts-li-tag"
onChange={this.props.handleChange}
>

{this.renderUserIcons()}
{this.renderAdminIcons()}
Expand Down
2 changes: 1 addition & 1 deletion client/modules/accounts/components/passwordReset/forgot.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class Forgot extends Component {
data-event-category="accounts"
onClick={this.props.onSignInClick}
>
<Translation defaultValue="Sign In" i18nKey="accountsUI.signIn" />
<Translation defaultValue="Sign In" i18nKey="accountsUI.signIn" />
</a>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ class UpdatePasswordOverlay extends Component {
return (
<span className="help-block">
{this.props.onError(this.props.messages.errors && this.props.messages.errors.password) &&
this.props.messages.errors.password.map((error, i) => (
<Translation
key={i}
defaultValue={error.reason}
i18nKey={error.i18nKeyReason}
/>
))
this.props.messages.errors.password.map((error, i) => (
<Translation
key={i}
defaultValue={error.reason}
i18nKey={error.i18nKeyReason}
/>
))
}
</span>
);
Expand All @@ -80,7 +80,7 @@ class UpdatePasswordOverlay extends Component {
if (this.props.isDisabled === true) {
return (
<div className="col-sm-6" style={{ textAlign: "center" }}>
<i className="fa fa-spinner fa-spin" />
<i className="fa fa-spinner fa-spin"/>
</div>
);
}
Expand All @@ -100,9 +100,9 @@ class UpdatePasswordOverlay extends Component {

renderSpinnerOnLoad() {
return (
<div className="spinner-container">
<div className="spinner" />
</div>
<div className="spinner-container">
<div className="spinner"/>
</div>
);
}

Expand All @@ -114,17 +114,17 @@ class UpdatePasswordOverlay extends Component {
const { showSpinner } = this.state;

return (
<div>
<div>
{this.props.isOpen === true &&
<div>
<div className="modal-backdrop fade in" id={`modal-backdrop-${this.props.uniqueId}`} />
<div className="modal fade in" id={`modal-${this.props.uniqueId}`} style={{ display: "block" }}>
<div className="modal-dialog">
{showSpinner ? this.renderSpinnerOnLoad() :
<div>
<div className="modal-backdrop fade in" id={`modal-backdrop-${this.props.uniqueId}`}/>
<div className="modal fade in" id={`modal-${this.props.uniqueId}`} style={{ display: "block" }}>
<div className="modal-dialog">
{showSpinner ? this.renderSpinnerOnLoad() :
<form className="modal-content" onSubmit={this.handleSubmit}>
<div className="modal-header">
<h4 className="modal-title">
<Translation defaultValue="Update Your Password" i18nKey="accountsUI.updateYourPassword" />
<Translation defaultValue="Update Your Password" i18nKey="accountsUI.updateYourPassword"/>
</h4>
</div>

Expand All @@ -134,15 +134,15 @@ class UpdatePasswordOverlay extends Component {
{this.renderFormMessages()}

<div className={passwordClasses}>
<TextField
i18nKeyLabel="accountsUI.password"
label="Password"
name="password"
type="password"
id={`password-${this.props.uniqueId}`}
value={this.state.password}
onChange={this.handleFieldChange}
/>
<TextField
i18nKeyLabel="accountsUI.password"
label="Password"
name="password"
type="password"
id={`password-${this.props.uniqueId}`}
value={this.state.password}
onChange={this.handleFieldChange}
/>
{this.renderPasswordErrors()}
</div>

Expand All @@ -167,10 +167,10 @@ class UpdatePasswordOverlay extends Component {
</div>

</form>
}
</div>
}
</div>
</div>}
</div>
</div>}
</div>
);
}
Expand Down
3 changes: 2 additions & 1 deletion client/modules/accounts/containers/auth/authContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import _ from "lodash";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Meteor } from "meteor/meteor";
import { Accounts } from "meteor/accounts-base";
import { Router } from "/client/api";
import { composeWithTracker } from "/lib/api/compose";
import { SignIn, SignUp, LoginButtons } from "../../components";
Expand Down Expand Up @@ -202,7 +203,7 @@ class AuthContainer extends Component {
onSocialClick={this.handleSocialLogin}
capitalizeName={this.capitalizeName}
/>
{this.renderAuthView()}
{this.renderAuthView()}
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion client/modules/accounts/containers/auth/loginContainer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Random } from "meteor/random";
import { composeWithTracker } from "/lib/api/compose";
import AuthContainer from "./authContainer";
import { ForgotContainer } from "../passwordReset";
Expand Down Expand Up @@ -70,7 +71,6 @@ class LoginContainer extends Component {
);
}
}

}

function composer(props, onData) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import React, { Component } from "react";
import { Meteor } from "meteor/meteor";
import { Accounts } from "meteor/accounts-base";
import { Roles } from "meteor/alanning:roles";
import { Reaction } from "/client/api";
import { Session } from "meteor/session";
import { Gravatar } from "meteor/jparker:gravatar";
import { Reaction, Logger } from "/client/api";
import { i18nextDep, i18next } from "/client/api";
import { composeWithTracker } from "/lib/api/compose";
import * as Collections from "/lib/collections";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import _ from "lodash";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Accounts } from "meteor/accounts-base";
import { Random } from "meteor/random";
import { composeWithTracker } from "/lib/api/compose";
import { UpdatePasswordOverlay } from "/client/modules/accounts/components";
import { MessagesContainer } from "/client/modules/accounts/containers/helpers";
Expand Down
7 changes: 5 additions & 2 deletions client/modules/accounts/helpers/templates.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { Reaction, i18next, i18nextDep } from "/client/api";
import * as Collections from "/lib/collections";
import { Meteor } from "meteor/meteor";
import { Template } from "meteor/templating";
import { Accounts } from "meteor/accounts-base";
import { Roles } from "meteor/alanning:roles";
import { Gravatar } from "meteor/jparker:gravatar";
import { Reaction, i18next, i18nextDep } from "/client/api";
import * as Collections from "/lib/collections";

Template.registerHelper("getGravatar", function (currentUser, size) {
const options = {
Expand Down
3 changes: 2 additions & 1 deletion client/modules/accounts/helpers/util.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import _ from "lodash";
import { Accounts } from "meteor/accounts-base";
import { ServiceConfiguration } from "meteor/service-configuration";

function capitalize(str) {
const finalString = str === null ? "" : String(str);
Expand Down Expand Up @@ -33,7 +35,6 @@ providers.Twitter.fields = function () {
};

export class ServiceConfigHelper {

availableServices() {
const services = Package["accounts-oauth"] ? Accounts.oauth.serviceNames() : [];
services.sort();
Expand Down
Loading