conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
</div>`,
parsed: {v:4,t:['hi',{t:2,p:[1,3,2],r:'name'},' ',{t:7,e:'div',p:[2,1,11],f:['blah ',{t:4,p:[3,2,22],r:'foo',f:['wew',{t:7,e:'span',p:[3,13,33],f:['Ain\'t that ',{t:2,p:[4,8,52],r:'grand'},'?']}]}]}]}
=======
</div>` ),
parsed: {v:3,t:['hi',{t:2,p:[1,3,2],r:'name'},' ',{t:7,e:'div',p:[2,1,11],f:['blah ',{t:4,p:[3,2,22],r:'foo',f:['wew',{t:7,e:'span',p:[3,13,33],f:['Ain\'t that ',{t:2,p:[4,8,52],r:'grand'},'?']}]}]}]}
>>>>>>>
</div>` ),
parsed: {v:4,t:['hi',{t:2,p:[1,3,2],r:'name'},' ',{t:7,e:'div',p:[2,1,11],f:['blah ',{t:4,p:[3,2,22],r:'foo',f:['wew',{t:7,e:'span',p:[3,13,33],f:['Ain\'t that ',{t:2,p:[4,8,52],r:'grand'},'?']}]}]}]} |
<<<<<<<
},
{
name: 'Boolean attributes are set using setAttribute() if needed (#2201)',
template: `<div itemscope="{{foo}}"></div>`,
data: { foo: true },
result: '<div itemscope=""></div>',
new_data: { foo: false },
new_result: '<div></div>'
=======
},
{
name: '`undefined` and `null` can be used as object keys (#1878)',
template: `{{dict[null]}}, {{dict[undefined]}}`,
data: {
dict: {
null: 'null value',
undefined: 'undefined value'
}
},
result: 'null value, undefined value'
>>>>>>>
},
{
name: 'Boolean attributes are set using setAttribute() if needed (#2201)',
template: `<div itemscope="{{foo}}"></div>`,
data: { foo: true },
result: '<div itemscope=""></div>',
new_data: { foo: false },
new_result: '<div></div>'
},
{
name: '`undefined` and `null` can be used as object keys (#1878)',
template: `{{dict[null]}}, {{dict[undefined]}}`,
data: {
dict: {
null: 'null value',
undefined: 'undefined value'
}
},
result: 'null value, undefined value' |
<<<<<<<
import UpdateSettingContract from './UpdateSettingContract'
import ExchangeCreateContract from './ExchangeCreateContract'
=======
import TransferContract from './TransferContract'
>>>>>>>
import UpdateSettingContract from './UpdateSettingContract'
import ExchangeCreateContract from './ExchangeCreateContract'
import TransferContract from './TransferContract' |
<<<<<<<
mappings: mappings,
inlinePartials: inlinePartials
=======
mappings: parameters.mappings,
inlinePartials: inlinePartials,
cssIds: parentFragment.cssIds
>>>>>>>
mappings: mappings,
inlinePartials: inlinePartials
cssIds: parentFragment.cssIds |
<<<<<<<
if ( dependant.isStatic ) {
return;
}
keypath = dependant.keypath;
priority = dependant.priority;
depsByKeypath = this.deps[ priority ] || ( this.deps[ priority ] = {} );
=======
depsByKeypath = this.deps[ group ] || ( this.deps[ group ] = {} );
>>>>>>>
if ( dependant.isStatic ) {
return;
}
depsByKeypath = this.deps[ group ] || ( this.deps[ group ] = {} ); |
<<<<<<<
import {GroupUnreadChannels} from 'utils/constants.jsx';
=======
import {showCreateOption} from 'utils/channel_utils.jsx';
import {GroupUnreadChannels, Constants} from 'utils/constants.jsx';
import {close} from 'actions/views/lhs';
import {getIsLhsOpen} from 'selectors/lhs';
>>>>>>>
import {GroupUnreadChannels} from 'utils/constants.jsx';
import {close} from 'actions/views/lhs';
import {getIsLhsOpen} from 'selectors/lhs'; |
<<<<<<<
import {haveISystemPerm} from 'mattermost-redux/selectors/entities/roles';
import {Permissions} from 'mattermost-redux/constants';
=======
import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
>>>>>>>
import {haveISystemPerm} from 'mattermost-redux/selectors/entities/roles';
import {Permissions} from 'mattermost-redux/constants';
import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
<<<<<<<
function mapStateToProps(state) {
const canViewSystemErrors = haveISystemPerm(state, {perm: Permissions.MANAGE_SYSTEM});
=======
function mapStateToProps(state) {
const license = getLicense(state);
const config = getConfig(state);
const licenseId = license.Id;
const siteURL = config.SiteURL;
const sendEmailNotifications = config.SendEmailNotifications === 'true';
const bannerText = config.BannerText;
const allowBannerDismissal = config.AllowBannerDismissal === 'true';
const enableBanner = config.EnableBanner === 'true';
const bannerColor = config.BannerColor;
const bannerTextColor = config.BannerTextColor;
const enableSignUpWithGitLab = config.EnableSignUpWithGitLab === 'true';
>>>>>>>
function mapStateToProps(state) {
const canViewSystemErrors = haveISystemPerm(state, {perm: Permissions.MANAGE_SYSTEM});
const license = getLicense(state);
const config = getConfig(state);
const licenseId = license.Id;
const siteURL = config.SiteURL;
const sendEmailNotifications = config.SendEmailNotifications === 'true';
const bannerText = config.BannerText;
const allowBannerDismissal = config.AllowBannerDismissal === 'true';
const enableBanner = config.EnableBanner === 'true';
const bannerColor = config.BannerColor;
const bannerTextColor = config.BannerTextColor;
const enableSignUpWithGitLab = config.EnableSignUpWithGitLab === 'true';
<<<<<<<
isLoggedIn: Boolean(getCurrentUserId(state)),
canViewSystemErrors
=======
isLoggedIn: Boolean(getCurrentUserId(state)),
licenseId,
siteURL,
sendEmailNotifications,
bannerText,
allowBannerDismissal,
enableBanner,
bannerColor,
bannerTextColor,
enableSignUpWithGitLab
>>>>>>>
isLoggedIn: Boolean(getCurrentUserId(state)),
canViewSystemErrors,
licenseId,
siteURL,
sendEmailNotifications,
bannerText,
allowBannerDismissal,
enableBanner,
bannerColor,
bannerTextColor,
enableSignUpWithGitLab |
<<<<<<<
timeoutFlush();
=======
timeoutFlush();
expect($state.params.id).toBe('1');
>>>>>>>
timeoutFlush();
expect($state.params.id).toBe('1');
<<<<<<<
timeoutFlush();
=======
timeoutFlush();
expect($state.params.id).toBe('4');
>>>>>>>
timeoutFlush();
expect($state.params.id).toBe('4');
<<<<<<<
it('should match on any child state refs', inject(function($rootScope, $q, $compile, $state) {
el = angular.element('<div ui-sref-active="active"><a ui-sref="contacts.item({ id: 1 })">Contacts</a><a ui-sref="contacts.item({ id: 2 })">Contacts</a></div>');
template = $compile(el)($rootScope);
$rootScope.$digest();
expect(angular.element(template[0]).attr('class')).toBe('ng-scope');
$state.transitionTo('contacts.item', { id: 1 });
$q.flush();
timeoutFlush();
expect(angular.element(template[0]).attr('class')).toBe('ng-scope active');
$state.transitionTo('contacts.item', { id: 2 });
$q.flush();
timeoutFlush();
expect(angular.element(template[0]).attr('class')).toBe('ng-scope active');
}));
it('should match fuzzy on lazy loaded states', inject(function($rootScope, $q, $compile, $state) {
el = angular.element('<div><a ui-sref="contacts.lazy" ui-sref-active="active">Lazy Contact</a></div>');
template = $compile(el)($rootScope);
$rootScope.$digest();
$rootScope.$on('$stateNotFound', function () {
_stateProvider.state('contacts.lazy', {});
});
$state.transitionTo('contacts.item', { id: 1 });
$q.flush();
timeoutFlush();
expect(angular.element(template[0].querySelector('a')).attr('class')).toBe('');
$state.transitionTo('contacts.lazy');
$q.flush();
timeoutFlush();
expect(angular.element(template[0].querySelector('a')).attr('class')).toBe('active');
}));
it('should match exactly on lazy loaded states', inject(function($rootScope, $q, $compile, $state) {
el = angular.element('<div><a ui-sref="contacts.lazy" ui-sref-active-eq="active">Lazy Contact</a></div>');
template = $compile(el)($rootScope);
$rootScope.$digest();
$rootScope.$on('$stateNotFound', function () {
_stateProvider.state('contacts.lazy', {});
});
$state.transitionTo('contacts.item', { id: 1 });
$q.flush();
timeoutFlush();
expect(angular.element(template[0].querySelector('a')).attr('class')).toBe('');
$state.transitionTo('contacts.lazy');
$q.flush();
timeoutFlush();
expect(angular.element(template[0].querySelector('a')).attr('class')).toBe('active');
}));
it('should allow multiple classes to be supplied', inject(function($rootScope, $q, $compile, $state) {
template = $compile('<div><a ui-sref="contacts.item({ id: 1 })" ui-sref-active="active also-active">Contacts</a></div>')($rootScope);
$rootScope.$digest();
var a = angular.element(template[0].getElementsByTagName('a')[0]);
$state.transitionTo('contacts.item.edit', { id: 1 });
$q.flush();
timeoutFlush();
expect(a.attr('class')).toMatch(/active also-active/);
}));
describe('ng-{class,style} interface', function() {
it('should match on abstract states that are included by the current state', inject(function($rootScope, $compile, $state, $q) {
el = $compile('<div ui-sref-active="{active: \'admin.*\'}"><a ui-sref-active="active" ui-sref="admin.roles">Roles</a></div>')($rootScope);
$state.transitionTo('admin.roles');
$q.flush();
timeoutFlush();
var abstractParent = el[0];
expect(abstractParent.className).toMatch(/active/);
var child = el[0].querySelector('a');
expect(child.className).toMatch(/active/);
}));
it('should match on state parameters', inject(function($compile, $rootScope, $state, $q) {
el = $compile('<div ui-sref-active="{active: \'admin.roles({page: 1})\'}"></div>')($rootScope);
$state.transitionTo('admin.roles', {page: 1});
$q.flush();
timeoutFlush();
expect(el[0].className).toMatch(/active/);
}));
it('should shadow the state provided by ui-sref', inject(function($compile, $rootScope, $state, $q) {
el = $compile('<div ui-sref-active="{active: \'admin.roles({page: 1})\'}"><a ui-sref="admin.roles"></a></div>')($rootScope);
$state.transitionTo('admin.roles');
$q.flush();
timeoutFlush();
expect(el[0].className).not.toMatch(/active/);
$state.transitionTo('admin.roles', {page: 1});
$q.flush();
timeoutFlush();
expect(el[0].className).toMatch(/active/);
}));
it('should support multiple <className, stateOrName> pairs', inject(function($compile, $rootScope, $state, $q) {
el = $compile('<div ui-sref-active="{contacts: \'contacts.*\', admin: \'admin.roles({page: 1})\'}"></div>')($rootScope);
$state.transitionTo('contacts');
$q.flush();
timeoutFlush();
expect(el[0].className).toMatch(/contacts/);
expect(el[0].className).not.toMatch(/admin/);
$state.transitionTo('admin.roles', {page: 1});
$q.flush();
timeoutFlush();
expect(el[0].className).toMatch(/admin/);
expect(el[0].className).not.toMatch(/contacts/);
}));
it('should update the active classes when compiled', inject(function($compile, $rootScope, $document, $state, $q) {
$state.transitionTo('admin.roles');
$q.flush();
timeoutFlush();
el = $compile('<div ui-sref-active="{active: \'admin.roles\'}"/>')($rootScope);
$rootScope.$digest();
timeoutFlush();
expect(el.hasClass('active')).toBeTruthy();
}));
});
});
=======
>>>>>>> |
<<<<<<<
$ViewDirective.$inject = ['$state', '$view', '$injector', '$uiViewScroll'];
function $ViewDirective( $state, $view, $injector, $uiViewScroll) {
var views = {};
=======
$ViewDirective.$inject = ['$state', '$injector', '$uiViewScroll', '$interpolate'];
function $ViewDirective( $state, $injector, $uiViewScroll, $interpolate) {
>>>>>>>
$ViewDirective.$inject = ['$state', '$view', '$injector', '$uiViewScroll', '$interpolate'];
function $ViewDirective( $state, $view, $injector, $uiViewScroll, $interpolate) {
var views = {};
<<<<<<<
name = getUiViewName(attrs, $element.inheritedData('$uiView')),
previousLocals = viewConfig && viewConfig.locals;
=======
name = getUiViewName(scope, attrs, $element, $interpolate),
previousLocals = name && $state.$current && $state.$current.locals[name];
>>>>>>>
name = getUiViewName(scope, attrs, $element, $interpolate),
previousLocals = viewConfig && viewConfig.locals;
<<<<<<<
=======
return function (scope, $element, attrs) {
var current = $state.$current,
name = getUiViewName(scope, attrs, $element, $interpolate),
locals = current && current.locals[name];
>>>>>>> |
<<<<<<<
var newScope = scope.$new(),
name = getUiViewName(attrs, $element.inheritedData('$uiView')),
=======
var newScope,
name = currentEl && currentEl.data('$uiViewName'),
>>>>>>>
var newScope,
name = getUiViewName(attrs, $element.inheritedData('$uiView')),
<<<<<<<
latestLocals = $state.$current.locals[name];
=======
newScope = scope.$new();
>>>>>>>
newScope = scope.$new();
latestLocals = $state.$current.locals[name]; |
<<<<<<<
import { Android, Simulator, Config, Project, ProjectSettings, Exp, UrlUtils } from 'xdl';
import devToolsMiddleware from 'haul-cli/src/server/middleware/devToolsMiddleware';
import liveReloadMiddleware from 'haul-cli/src/server/middleware/liveReloadMiddleware';
import statusPageMiddleware from 'haul-cli/src/server/middleware/statusPageMiddleware';
import symbolicateMiddleware from 'haul-cli/src/server/middleware/symbolicateMiddleware';
import openInEditorMiddleware from 'haul-cli/src/server/middleware/openInEditorMiddleware';
import loggerMiddleware from 'haul-cli/src/server/middleware/loggerMiddleware';
import missingBundleMiddleware from 'haul-cli/src/server/middleware/missingBundleMiddleware';
import systraceMiddleware from 'haul-cli/src/server/middleware/systraceMiddleware';
import rawBodyMiddleware from 'haul-cli/src/server/middleware/rawBodyMiddleware';
import WebSocketProxy from 'haul-cli/src/server/util/WebsocketProxy';
import ConcatSource from 'webpack-sources/lib/ConcatSource';
import RawSource from 'webpack-sources/lib/RawSource';
import which from 'which';
=======
import { ConcatSource, RawSource } from 'webpack-sources';
>>>>>>>
import { Android, Simulator, Config, Project, ProjectSettings, Exp, UrlUtils } from 'xdl';
import devToolsMiddleware from 'haul-cli/src/server/middleware/devToolsMiddleware';
import liveReloadMiddleware from 'haul-cli/src/server/middleware/liveReloadMiddleware';
import statusPageMiddleware from 'haul-cli/src/server/middleware/statusPageMiddleware';
import symbolicateMiddleware from 'haul-cli/src/server/middleware/symbolicateMiddleware';
import openInEditorMiddleware from 'haul-cli/src/server/middleware/openInEditorMiddleware';
import loggerMiddleware from 'haul-cli/src/server/middleware/loggerMiddleware';
import missingBundleMiddleware from 'haul-cli/src/server/middleware/missingBundleMiddleware';
import systraceMiddleware from 'haul-cli/src/server/middleware/systraceMiddleware';
import rawBodyMiddleware from 'haul-cli/src/server/middleware/rawBodyMiddleware';
import WebSocketProxy from 'haul-cli/src/server/util/WebsocketProxy';
import ConcatSource from 'webpack-sources/lib/ConcatSource';
import RawSource from 'webpack-sources/lib/RawSource';
import which from 'which';
import { ConcatSource, RawSource } from 'webpack-sources';
<<<<<<<
if (['android', 'ios'].indexOf(platform) >= 0) {
startExpoServer(config, platform);
}
if (pkg.app.reactHotLoader) {
config.entry[Object.keys(config.entry)[0]].unshift('react-hot-loader/patch');
}
config.entry[Object.keys(config.entry)[0]].unshift(
`webpack-hot-middleware/client?http://localhost:${clientConfig.devServer.port}/`);
config.plugins.push(new webpack.HotModuleReplacementPlugin(),
=======
_.each(clientConfig.entry, entry => {
if (pkg.app.reactHotLoader) {
entry.unshift('react-hot-loader/patch');
}
entry.unshift(
`webpack-dev-server/client?http://localhost:${pkg.app.webpackDevPort}/`,
'webpack/hot/dev-server');
});
clientConfig.plugins.push(new webpack.HotModuleReplacementPlugin(),
>>>>>>>
if (['android', 'ios'].indexOf(platform) >= 0) {
startExpoServer(config, platform);
}
_.each(config.entry, entry => {
if (pkg.app.reactHotLoader) {
entry.unshift('react-hot-loader/patch');
}
entry.unshift(
`webpack-hot-middleware/client?http://localhost:${config.devServer.port}/`);
'webpack/hot/dev-server');
});
config.plugins.push(new webpack.HotModuleReplacementPlugin(),
<<<<<<<
function startWebpackDevServer(config, platform, reporter, logger) {
const configOutputPath = config.output.path;
config.output.path = '/';
config.plugins.push(frontendVirtualModules);
let compiler = webpack(config);
=======
function startWebpackDevServer(clientConfig, reporter) {
let compiler = webpack(clientConfig);
>>>>>>>
function startWebpackDevServer(config, platform, reporter, logger) {
const configOutputPath = config.output.path;
config.output.path = '/';
config.plugins.push(frontendVirtualModules);
let compiler = webpack(config);
<<<<<<<
if (pkg.app.webpackDll && platform !== 'web') {
compiler.plugin('after-compile', (compilation, callback) => {
let vendorHashesJson = JSON.parse(fs.readFileSync(path.join(pkg.app.frontendBuildDir, 'vendor_dll_hashes.json')));
Object.keys(compilation.assets).forEach(key => {
if (key.endsWith('.bundle')) {
const vendorContents = fs.readFileSync(path.join(pkg.app.frontendBuildDir, vendorHashesJson.name)).toString();
compilation.assets[key] = new ConcatSource(new RawSource(vendorContents), compilation.assets[key]);
}
});
callback();
});
}
=======
if (pkg.app.webpackDll) {
compiler.plugin('after-compile', (compilation, callback) => {
let vendorHashesJson = JSON.parse(fs.readFileSync(path.join(pkg.app.frontendBuildDir, 'vendor_dll_hashes.json')));
const vendorContents = fs.readFileSync(path.join(pkg.app.frontendBuildDir, vendorHashesJson.name)).toString();
_.each(compilation.chunks, chunk => {
_.each(chunk.files, file => {
compilation.assets[file] = new ConcatSource(new RawSource(vendorContents), compilation.assets[file]);
});
});
callback();
});
}
>>>>>>>
if (pkg.app.webpackDll && platform !== 'web') {
compiler.plugin('after-compile', (compilation, callback) => {
let vendorHashesJson = JSON.parse(fs.readFileSync(path.join(pkg.app.frontendBuildDir, 'vendor_dll_hashes.json')));
const vendorContents = fs.readFileSync(path.join(pkg.app.frontendBuildDir, vendorHashesJson.name)).toString();
_.each(compilation.chunks, chunk => {
_.each(chunk.files, file => {
compilation.assets[file] = new ConcatSource(new RawSource(vendorContents), compilation.assets[file]);
});
});
callback();
});
}
<<<<<<<
if (pkg.app.webpackDll) {
let vendorHashesJson = JSON.parse(fs.readFileSync(path.join(pkg.app.frontendBuildDir, 'vendor_dll_hashes.json')));
assetsMap['vendor.js'] = vendorHashesJson.name;
}
=======
>>>>>>>
if (pkg.app.webpackDll) {
let vendorHashesJson = JSON.parse(fs.readFileSync(path.join(pkg.app.frontendBuildDir, 'vendor_dll_hashes.json')));
assetsMap['vendor.js'] = vendorHashesJson.name;
}
<<<<<<<
startServer();
startClient(clientConfig, "web");
startClient(androidConfig, "android");
// startClient(iOSConfig, "ios");
=======
if (!serverConfig.url) {
startServer();
}
startClient();
>>>>>>>
if (!serverConfig.url) {
startServer();
}
startClient(clientConfig, "web");
startClient(androidConfig, "android");
// startClient(iOSConfig, "ios"); |
<<<<<<<
this.translate = this.jsoneditor.translate || JSONEditor.defaults.translate;
=======
>>>>>>>
this.translate = this.jsoneditor.translate || JSONEditor.defaults.translate; |
<<<<<<<
=======
name: 'Find JWT Secret',
category: 'Weak Security Mechanism',
description: '<a href="/#/contact">Inform the shop</a> about a JWT issue. (Mention the exact secret used for the signature in the JWT in your comment)',
difficulty: 4,
hint: addHint('This might require you to grab a little bit deeper into the pentester\'s toolbox.'),
hintUrl: addHint('https://bkimminich.gitbooks.io/pwning-owasp-juice-shop/content/part2/weak-security.html#inform-the-shop-about-a-jwt-issue'),
solved: false
}).then(challenge => {
challenges.jwtSecretChallenge = challenge
})
models.Challenge.create({
>>>>>>> |
<<<<<<<
const jsonHeader = { 'content-type': 'application/json' }
let authHeader
beforeAll(() => {
return frisby.post(REST_URL + '/user/login', {
headers: jsonHeader,
body: {
email: '[email protected]',
password: 'ncc-1701'
}
})
.expect('status', 200)
.then(({ json }) => {
authHeader = { 'Authorization': 'Bearer ' + json.authentication.token, 'content-type': 'application/json' }
})
})
=======
const authHeader = { Authorization: 'Bearer ' + insecurity.authorize(), 'content-type': 'application/json' }
>>>>>>>
const jsonHeader = { 'content-type': 'application/json' }
let authHeader
beforeAll(() => {
return frisby.post(REST_URL + '/user/login', {
headers: jsonHeader,
body: {
email: '[email protected]',
password: 'ncc-1701'
}
})
.expect('status', 200)
.then(({ json }) => {
authHeader = { Authorization: 'Bearer ' + json.authentication.token, 'content-type': 'application/json' }
})
}) |
<<<<<<<
/* Check if the quantity is available and add item to basket */
app.put('/api/BasketItems/:id', basketItems.quantityCheckBeforeBasketItemUpdate())
app.post('/api/BasketItems', basketItems.quantityCheckBeforeBasketItemAddition(), basketItems.addBasketItem())
=======
/* Add item to basket */
app.post('/api/BasketItems', basketItems())
/* Feedbacks: Do not allow changes of existing feedback */
app.put('/api/Feedbacks/:id', insecurity.denyAll())
/* PrivacyRequests: Only allowed for authenticated users */
app.use('/api/PrivacyRequests', insecurity.isAuthorized())
app.use('/api/PrivacyRequests/:id', insecurity.isAuthorized())
>>>>>>>
/* Check if the quantity is available and add item to basket */
app.put('/api/BasketItems/:id', basketItems.quantityCheckBeforeBasketItemUpdate())
app.post('/api/BasketItems', basketItems.quantityCheckBeforeBasketItemAddition(), basketItems.addBasketItem())
/* Feedbacks: Do not allow changes of existing feedback */
app.put('/api/Feedbacks/:id', insecurity.denyAll())
/* PrivacyRequests: Only allowed for authenticated users */
app.use('/api/PrivacyRequests', insecurity.isAuthorized())
app.use('/api/PrivacyRequests/:id', insecurity.isAuthorized()) |
<<<<<<<
const orderHistory = require('./routes/orderHistory')
=======
const delivery = require('./routes/delivery')
>>>>>>>
const orderHistory = require('./routes/orderHistory')
const delivery = require('./routes/delivery') |
<<<<<<<
/* Accounting users are allowed to check and update quantities */
app.delete('/api/Quantitys/:id', insecurity.denyAll())
app.post('/api/Quantitys', insecurity.denyAll())
app.use('/api/Quantitys', insecurity.isAccounting())
app.use('/api/Quantitys/:id', insecurity.isAccounting())
=======
/* Feedbacks: Do not allow changes of existing feedback */
app.put('/api/Feedbacks/:id', insecurity.denyAll())
/* PrivacyRequests: Only allowed for authenticated users */
app.use('/api/PrivacyRequests', insecurity.isAuthorized())
app.use('/api/PrivacyRequests/:id', insecurity.isAuthorized())
>>>>>>>
/* Accounting users are allowed to check and update quantities */
app.delete('/api/Quantitys/:id', insecurity.denyAll())
app.post('/api/Quantitys', insecurity.denyAll())
app.use('/api/Quantitys', insecurity.isAccounting())
app.use('/api/Quantitys/:id', insecurity.isAccounting())
/* Feedbacks: Do not allow changes of existing feedback */
app.put('/api/Feedbacks/:id', insecurity.denyAll())
/* PrivacyRequests: Only allowed for authenticated users */
app.use('/api/PrivacyRequests', insecurity.isAuthorized())
app.use('/api/PrivacyRequests/:id', insecurity.isAuthorized())
<<<<<<<
{ name: 'SecurityAnswer', exclude: [] },
{ name: 'Quantity', exclude: [] }
=======
{ name: 'SecurityAnswer', exclude: [] },
{ name: 'PrivacyRequest', exclude: [] }
>>>>>>>
{ name: 'SecurityAnswer', exclude: [] },
{ name: 'Quantity', exclude: [] },
{ name: 'PrivacyRequest', exclude: [] } |
<<<<<<<
const insecurity = require('../lib/insecurity')
=======
const isDocker = require('is-docker')
>>>>>>>
const insecurity = require('../lib/insecurity')
const isDocker = require('is-docker') |
<<<<<<<
}
exports.isAccounting = () => {
return (req, res, next) => {
const decodedToken = jwt.verify(utils.jwtFrom(req), publicKey, { expiresIn: 3600 * 5, algorithm: 'RS256' })
if (decodedToken.data.role === exports.roles.accounting) {
next()
} else {
res.status(403).json({ error: 'Malicious activity detected' })
}
}
=======
}
exports.appendUserId = () => {
return (req, res, next) => {
try {
req.body.UserId = this.authenticatedUsers.tokenMap[utils.jwtFrom(req)].data.id
next()
} catch (error) {
res.status(400).json({ status: 'error', message: error })
}
}
>>>>>>>
}
exports.isAccounting = () => {
return (req, res, next) => {
const decodedToken = jwt.verify(utils.jwtFrom(req), publicKey, { expiresIn: 3600 * 5, algorithm: 'RS256' })
if (decodedToken.data.role === exports.roles.accounting) {
next()
} else {
res.status(403).json({ error: 'Malicious activity detected' })
}
}
}
exports.appendUserId = () => {
return (req, res, next) => {
try {
req.body.UserId = this.authenticatedUsers.tokenMap[utils.jwtFrom(req)].data.id
next()
} catch (error) {
res.status(400).json({ status: 'error', message: error })
}
} |
<<<<<<<
async function createDeliveryMethods () {
const delivery = await loadStaticData('delivery')
await Promise.all(
delivery.map(async ({ name, price, primePrice, eta }) => {
try {
await models.Delivery.create({
name,
price,
primePrice,
eta
})
} catch (err) {
logger.error(`Could not insert Delivery Method: ${err.message}`)
}
})
)
}
=======
function createAddresses (UserId, addresses) {
addresses.map((address) => {
return models.Address.create({
UserId: UserId,
country: address.country,
fullName: address.fullName,
mobileNum: address.mobileNum,
pinCode: address.pinCode,
streetAddress: address.streetAddress,
city: address.city,
state: address.state ? address.state : null
}).catch((err) => {
logger.error(`Could not create address: ${err.message}`)
})
})
}
function createCards (UserId, cards) {
cards.map((card) => {
return models.Card.create({
UserId: UserId,
fullName: card.fullName,
cardNum: card.cardNum,
expMonth: card.expMonth,
expYear: card.expYear
}).catch((err) => {
logger.error(`Could not create card: ${err.message}`)
})
})
}
>>>>>>>
async function createDeliveryMethods () {
const delivery = await loadStaticData('delivery')
await Promise.all(
delivery.map(async ({ name, price, primePrice, eta }) => {
try {
await models.Delivery.create({
name,
price,
primePrice,
eta
})
} catch (err) {
logger.error(`Could not insert Delivery Method: ${err.message}`)
}
})
)
}
function createAddresses (UserId, addresses) {
addresses.map((address) => {
return models.Address.create({
UserId: UserId,
country: address.country,
fullName: address.fullName,
mobileNum: address.mobileNum,
pinCode: address.pinCode,
streetAddress: address.streetAddress,
city: address.city,
state: address.state ? address.state : null
}).catch((err) => {
logger.error(`Could not create address: ${err.message}`)
})
})
}
function createCards (UserId, cards) {
cards.map((card) => {
return models.Card.create({
UserId: UserId,
fullName: card.fullName,
cardNum: card.cardNum,
expMonth: card.expMonth,
expYear: card.expYear
}).catch((err) => {
logger.error(`Could not create card: ${err.message}`)
})
})
} |
<<<<<<<
=======
/* Secure mode */
let secureMode = false;
if (argv.secure) secureMode = true;
/* Is module popular? - for secure mode */
const POPULARITY_THRESHOLD = 10000;
let isModulePopular = (name) => {
let url = 'https://api.npmjs.org/downloads/point/last-month/' + name;
request('GET', url, (error, response, body) => {
let downloads = JSON.parse(body).downloads;
return (downloads > POPULARITY_THRESHOLD);
});
};
/* Is test file? */
let isTestFile = (name) => {
return (name.endsWith('.spec.js') || name.endsWith('.test.js'));
};
/* Get module names from array of module objects */
let getNamesFromModules = (modules) => {
return modules.map(module => module.name);
};
/* Dedup modules
* Divide modules into prod and dev
* Deduplicates each list
*/
let deduplicate = (modules) => {
let dedupedModules = [];
let testModules = modules.filter(module => module.dev);
dedupedModules = dedupedModules.concat(deduplicateSimilarModules(testModules));
let prodModules = modules.filter(module => !module.dev);
dedupedModules = dedupedModules.concat(deduplicateSimilarModules(prodModules));
return dedupedModules;
};
/* Dedup similar modules
* Deduplicates list
* Ignores/assumes type of the modules in list
*/
let deduplicateSimilarModules = (modules) => {
let dedupedModules = [];
let dedupedModuleNames = [];
for (let module of modules) {
if (dedupedModuleNames.indexOf(module.name) === -1) {
dedupedModules.push(module);
dedupedModuleNames.push(module.name);
}
}
return dedupedModules;
};
>>>>>>> |
<<<<<<<
function issue(num, noparens) {
return `${noparens?'':'('}<a href="https://github.com/cxw42/TabFern/issues/${num|0}">#${num|0}</a>${noparens?'':')'}`;
}
=======
function issue(num, noparen) { return `${noparen ? '' : '('}<a href="https://github.com/cxw42/TabFern/issues/${num|0}">#${num|0}</a>${noparen ? '' : ')'}`; }
>>>>>>>
function issue(num, noparens) {
return `${noparens?'':'('}<a href="https://github.com/cxw42/TabFern/issues/${num|0}">#${num|0}</a>${noparens?'':')'}`;
}
<<<<<<<
{
"tab": i18n.get("Welcome / Help"),
"group": i18n.get("Import/Export"),
"name": "export-settings",
"id": "export-settings",
"type": "button",
"text": "Export settings to file"
},
{
"tab": i18n.get("Welcome / Help"),
"group": i18n.get("Import/Export"),
"name": "import-settings",
"id": "import-settings",
"type": "button",
"text": "Import settings from file"
},
=======
{
"tab": future_i18n("Welcome / Help"),
"group": future_i18n("Incognito mode"),
"type": "description",
"text":
`TabFern cannot see Incognito windows or tabs, and is not yet tested in
Incognito mode. If you would like Incognito support in TabFern, please
vote at ${issue(125,true)}.
`,
},
{
"tab": future_i18n("Welcome / Help"),
"group": future_i18n("Import/Export"),
"name": "export-settings",
"id": "export-settings",
"type": "button",
"text": "Save settings to a file"
},
{
"tab": future_i18n("Welcome / Help"),
"group": future_i18n("Import/Export"),
"name": "import-settings",
"id": "import-settings",
"type": "button",
"text": "Load settings from a file"
},
>>>>>>>
{
"tab": future_i18n("Welcome / Help"),
"group": future_i18n("Incognito mode"),
"type": "description",
"text":
`TabFern cannot see Incognito windows or tabs, and is not yet tested in
Incognito mode. If you would like Incognito support in TabFern, please
vote at ${issue(125,true)}.
`,
},
{
"tab": future_i18n("Welcome / Help"),
"group": future_i18n("Import/Export"),
"name": "export-settings",
"id": "export-settings",
"type": "button",
"text": "Save settings to a file"
},
{
"tab": future_i18n("Welcome / Help"),
"group": future_i18n("Import/Export"),
"name": "import-settings",
"id": "import-settings",
"type": "button",
"text": "Load settings from a file"
},
<<<<<<<
'tab': i18n.get('Behaviour'),
'group': i18n.get('Partly-open windows'),
'name': CFG_OPEN_REST_ON_CLICK,
'type': 'radioButtons',
'label': `When only some of the tabs in a window are open,
what should happen when you click the
name of the window?`,
'options': [
{value: CFG_OROC_DO, text: 'Open all the remaining closed tabs'},
{value: CFG_OROC_DO_NOT, text: 'Just bring the window to the front' +
' (open the remaining tabs from the right-click menu)'},
],
},
{
"tab": i18n.get("Behaviour"),
"group": i18n.get("Deleting windows"),
=======
"tab": future_i18n("Behaviour"),
"group": future_i18n("Deleting windows"),
>>>>>>>
'tab': future_i18n('Behaviour'),
'group': future_i18n('Partly-open windows'),
'name': CFGS_OPEN_REST_ON_CLICK,
'type': 'radioButtons',
'label': `When only some of the tabs in a window are open,
what should happen when you click the
name of the window?`,
'options': [
{value: CFG_OROC_DO, text: 'Open all the remaining closed tabs'},
{value: CFG_OROC_DO_NOT, text: 'Just bring the window to the front' +
' (you can open the remaining tabs from the right-click menu)'},
],
},
{
"tab": future_i18n("Behaviour"),
"group": future_i18n("Deleting windows"),
<<<<<<<
<li class="gold-star">Opening one tab at a time! Yes, the wait is over! ${issue(35)}
<ul>
<li>Click on a tab in a closed window to open only that tab.</li>
<li>Click the "close and save" icon (${icon('fff-picture-delete')})
on a tab's tree entry to close only that tab.</li>
<li>To open any remaining closed tabs, right-click the window and choose
"Open all tabs." (See ${settings} Behaviour ${gt} Partly-open windows
for another option.)</li>
</ul>
<p>Please note that if Chrome crashes while you have only some tabs open, the
recovered window will show up in TabFern as a separate, unsaved window
(related to ${issue(41, true)}).</p>
</li>
=======
</ul>`,
},
{
"tab": future_i18n("What's new?"),
"group": `Version 0.1.18${brplain('2018-09-17')}`,
'group_html':true,
"type": "description",
"text":
`<ul>
<li>New menu item to move a window to the top of the tree: right-click the
window's entry in the tree and choose "Move to top." ${issue(58)}</li>
<li>New option to choose whether to open the TabFern window automatically
when you start Chrome (on ${ham} ${gt} Settings ${gt} Behaviour).
${issue(143)} </li>
</ul>`,
},
{
"tab": future_i18n("What's new?"),
"group": `Version 0.1.17${brplain('2018-09-02')}`,
'group_html':true,
"type": "description",
"text":
`<ul>
<li class="gold-star">TabFern now has <b>500</b> users!!!
<b>Thank you</b> for using TabFern and helping the project!</li>
<li>The first version of TabFern was released one year ago today.
\u{1F382}</li>
<li>Partial translations into French and Russian. My thanks to the
translators! Please see the new Credits tab. ${issue(135)}</li>
>>>>>>>
<li class="gold-star">Opening one tab at a time! Yes, the wait is over! ${issue(35)}
<ul>
<li>Click on a tab in a closed window to open only that tab.</li>
<li>Click the "close and save" icon (${icon('fff-picture-delete')})
on a tab's tree entry to close only that tab.</li>
<li>To open any remaining closed tabs, right-click the window and choose
"Open all tabs." (See ${settings} Behaviour ${gt} Partly-open windows
for another option.)</li>
</ul>
<p>Please note that if Chrome crashes while you have only some tabs open, the
recovered window will show up in TabFern as a separate, unsaved window
(related to ${issue(41, true)}).</p>
</li>
</ul>`,
},
{
"tab": future_i18n("What's new?"),
"group": `Version 0.1.18${brplain('2018-09-17')}`,
'group_html':true,
"type": "description",
"text":
`<ul>
<li>New menu item to move a window to the top of the tree: right-click the
window's entry in the tree and choose "Move to top." ${issue(58)}</li>
<li>New option to choose whether to open the TabFern window automatically
when you start Chrome (on ${ham} ${gt} Settings ${gt} Behaviour).
${issue(143)} </li>
</ul>`,
},
{
"tab": future_i18n("What's new?"),
"group": `Version 0.1.17${brplain('2018-09-02')}`,
'group_html':true,
"type": "description",
"text":
`<ul>
<li class="gold-star">TabFern now has <b>500</b> users!!!
<b>Thank you</b> for using TabFern and helping the project!</li>
<li>The first version of TabFern was released one year ago today.
\u{1F382}</li>
<li>Partial translations into French and Russian. My thanks to the
translators! Please see the new Credits tab. ${issue(135)}</li> |
<<<<<<<
const { CQWebSocket, WebSocketState } = require('../..')
const { test } = require('ava')
test('new CQWebSocket() with default options', function (t) {
t.plan(8)
const bot = new CQWebSocket()
t.is(bot._monitor.EVENT.state, WebSocketState.INIT)
t.is(bot._monitor.API.state, WebSocketState.INIT)
t.is(bot._baseUrl, '127.0.0.1:6700')
t.is(bot._qq, -1)
t.is(bot._token, '')
t.deepEqual(bot._reconnectOptions, {
reconnection: true,
reconnectionAttempts: Infinity,
reconnectionDelay: 1000
})
t.deepEqual(bot._wsOptions, {
fragmentOutgoingMessages: false
})
t.deepEqual(bot._requestOptions, { })
})
test('new CQWebSocket() with custom options', function (t) {
t.plan(8)
const bot = new CQWebSocket({
enableAPI: false,
enableEvent: true,
baseUrl: '8.8.8.8:8888/ws',
qq: 123456789,
access_token: 'qwerasdf',
reconnection: true,
reconnectionAttempts: 10,
reconnectionDelay: 5000,
fragmentOutgoingMessages: true,
fragmentationThreshold: 0x4000,
requestOptions: {
timeout: 2000
}
})
t.is(bot._monitor.EVENT.state, WebSocketState.INIT)
t.is(bot._monitor.API.state, WebSocketState.DISABLED)
t.is(bot._baseUrl, '8.8.8.8:8888/ws')
t.is(bot._qq, 123456789)
t.is(bot._token, 'qwerasdf')
t.deepEqual(bot._requestOptions, {
timeout: 2000
})
t.deepEqual(bot._reconnectOptions, {
reconnection: true,
reconnectionAttempts: 10,
reconnectionDelay: 5000
})
t.deepEqual(bot._wsOptions, {
fragmentOutgoingMessages: true,
fragmentationThreshold: 0x4000
})
})
=======
const CQWebSocket = require('../..')
const { WebsocketState } = CQWebSocket
const { test } = require('ava')
test('new Websocket() with default options', function (t) {
t.plan(8)
const bot = new CQWebSocket()
t.is(bot._monitor.EVENT.state, WebsocketState.INIT)
t.is(bot._monitor.API.state, WebsocketState.INIT)
t.is(bot._baseUrl, 'ws://127.0.0.1:6700')
t.is(bot._qq, -1)
t.is(bot._token, '')
t.deepEqual(bot._reconnectOptions, {
reconnection: true,
reconnectionAttempts: Infinity,
reconnectionDelay: 1000
})
t.deepEqual(bot._wsOptions, {
fragmentOutgoingMessages: false
})
t.deepEqual(bot._requestOptions, { })
})
test('new Websocket() with custom options', function (t) {
t.plan(8)
const bot = new CQWebSocket({
enableAPI: false,
enableEvent: true,
baseUrl: '8.8.8.8:8888/ws',
qq: 123456789,
access_token: 'qwerasdf',
reconnection: true,
reconnectionAttempts: 10,
reconnectionDelay: 5000,
fragmentOutgoingMessages: true,
fragmentationThreshold: 0x4000,
requestOptions: {
timeout: 2000
}
})
t.is(bot._monitor.EVENT.state, WebsocketState.INIT)
t.is(bot._monitor.API.state, WebsocketState.DISABLED)
t.is(bot._baseUrl, 'ws://8.8.8.8:8888/ws')
t.is(bot._qq, 123456789)
t.is(bot._token, 'qwerasdf')
t.deepEqual(bot._requestOptions, {
timeout: 2000
})
t.deepEqual(bot._reconnectOptions, {
reconnection: true,
reconnectionAttempts: 10,
reconnectionDelay: 5000
})
t.deepEqual(bot._wsOptions, {
fragmentOutgoingMessages: true,
fragmentationThreshold: 0x4000
})
})
test('new Websocket(): protocol', function (t) {
t.plan(2)
const bot1 = new CQWebSocket({
protocol: 'HTTP'
})
t.is(bot1._baseUrl, 'http://127.0.0.1:6700')
const bot2 = new CQWebSocket({
protocol: 'wss:',
port: 23456
})
t.is(bot2._baseUrl, 'wss://127.0.0.1:23456')
})
test('new Websocket(): base url', function (t) {
t.plan(2)
const bot1 = new CQWebSocket({
baseUrl: '127.0.0.1:22222'
})
t.is(bot1._baseUrl, 'ws://127.0.0.1:22222')
const bot2 = new CQWebSocket({
baseUrl: 'wss://my.dns/bot'
})
t.is(bot2._baseUrl, 'wss://my.dns/bot')
})
>>>>>>>
const { CQWebSocket, WebSocketState } = require('../..')
const { test } = require('ava')
test('new CQWebSocket() with default options', function (t) {
t.plan(8)
const bot = new CQWebSocket()
t.is(bot._monitor.EVENT.state, WebSocketState.INIT)
t.is(bot._monitor.API.state, WebSocketState.INIT)
t.is(bot._baseUrl, '127.0.0.1:6700')
t.is(bot._qq, -1)
t.is(bot._token, '')
t.deepEqual(bot._reconnectOptions, {
reconnection: true,
reconnectionAttempts: Infinity,
reconnectionDelay: 1000
})
t.deepEqual(bot._wsOptions, {
fragmentOutgoingMessages: false
})
t.deepEqual(bot._requestOptions, { })
})
test('new CQWebSocket() with custom options', function (t) {
t.plan(8)
const bot = new CQWebSocket({
enableAPI: false,
enableEvent: true,
baseUrl: '8.8.8.8:8888/ws',
qq: 123456789,
access_token: 'qwerasdf',
reconnection: true,
reconnectionAttempts: 10,
reconnectionDelay: 5000,
fragmentOutgoingMessages: true,
fragmentationThreshold: 0x4000,
requestOptions: {
timeout: 2000
}
})
t.is(bot._monitor.EVENT.state, WebSocketState.INIT)
t.is(bot._monitor.API.state, WebSocketState.DISABLED)
t.is(bot._baseUrl, '8.8.8.8:8888/ws')
t.is(bot._qq, 123456789)
t.is(bot._token, 'qwerasdf')
t.deepEqual(bot._requestOptions, {
timeout: 2000
})
t.deepEqual(bot._reconnectOptions, {
reconnection: true,
reconnectionAttempts: 10,
reconnectionDelay: 5000
})
t.deepEqual(bot._wsOptions, {
fragmentOutgoingMessages: true,
fragmentationThreshold: 0x4000
})
})
test('new Websocket(): protocol', function (t) {
t.plan(2)
const bot1 = new CQWebSocket({
protocol: 'HTTP'
})
t.is(bot1._baseUrl, 'http://127.0.0.1:6700')
const bot2 = new CQWebSocket({
protocol: 'wss:',
port: 23456
})
t.is(bot2._baseUrl, 'wss://127.0.0.1:23456')
})
test('new Websocket(): base url', function (t) {
t.plan(2)
const bot1 = new CQWebSocket({
baseUrl: '127.0.0.1:22222'
})
t.is(bot1._baseUrl, 'ws://127.0.0.1:22222')
const bot2 = new CQWebSocket({
baseUrl: 'wss://my.dns/bot'
})
t.is(bot2._baseUrl, 'wss://my.dns/bot')
}) |
<<<<<<<
=======
var baseUri = utils.getBaseUri(req)
>>>>>>> |
<<<<<<<
// 'test/e2e/setup-scenario/before-all.js',
// 'test/e2e/scenarios/admin/admin_cloud.js',
'test/e2e/scenarios/admin/admin_cloud_image.js',
// 'test/e2e/scenarios/admin/admin_groups_management.js',
// 'test/e2e/scenarios/admin/admin_metaprops_configuration.js',
// 'test/e2e/scenarios/admin/admin_users_management.js',
// 'test/e2e/scenarios/application/application.js',
// 'test/e2e/scenarios/application/application_metaprops.js',
// 'test/e2e/scenarios/application/application_environments.js',
// 'test/e2e/scenarios/application/application_versions.js',
// 'test/e2e/scenarios/application/application_security.js',
// 'test/e2e/scenarios/application/application_security_role_check.js',
// 'test/e2e/scenarios/application/application_tags.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_editrelationshipname.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_editrequiredprops.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_input_output.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_multiplenodeversions.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_nodetemplate.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_plan.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_relationships.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_replacenode.js',
// 'test/e2e/scenarios/application_topology/application_topology_runtime.js',
// 'test/e2e/scenarios/deployment/deployment.js',
// 'test/e2e/scenarios/deployment/deployment_matcher.js',
// 'test/e2e/scenarios/deployment/deployment_manual_match_resources.js',
// 'test/e2e/scenarios/security/security_cloud.js',
// 'test/e2e/scenarios/security/security_groups.js',
// 'test/e2e/scenarios/security/security_users.js',
=======
'test/e2e/setup-scenario/before-all.js',
// 'test/e2e/scenarios/admin_cloud.js',
// 'test/e2e/scenarios/admin_cloud_image.js',
// 'test/e2e/scenarios/admin_groups_management.js',
// 'test/e2e/scenarios/admin_metaprops_configuration.js',
// 'test/e2e/scenarios/admin_users_management.js',
// 'test/e2e/scenarios/application.js',
// 'test/e2e/scenarios/application_metaprops.js',
// 'test/e2e/scenarios/application_environments.js',
// 'test/e2e/scenarios/application_versions.js',
// 'test/e2e/scenarios/application_security.js',
// 'test/e2e/scenarios/application_security_role_check.js',
// 'test/e2e/scenarios/application_tags.js',
// 'test/e2e/scenarios/application_topology_editor_editrelationshipname.js',
// 'test/e2e/scenarios/application_topology_editor_editrequiredprops.js',
// 'test/e2e/scenarios/application_topology_editor_input_output.js',
// 'test/e2e/scenarios/application_topology_editor_multiplenodeversions.js',
// 'test/e2e/scenarios/application_topology_editor_nodetemplate.js',
// 'test/e2e/scenarios/application_topology_editor_plan.js',
// 'test/e2e/scenarios/application_topology_editor_relationships.js',
// 'test/e2e/scenarios/application_topology_editor_replacenode.js',
// 'test/e2e/scenarios/application_topology_scaling.js',
// 'test/e2e/scenarios/application_topology_runtime.js',
>>>>>>>
// 'test/e2e/setup-scenario/before-all.js',
// 'test/e2e/scenarios/admin/admin_cloud.js',
'test/e2e/scenarios/admin/admin_cloud_image.js',
// 'test/e2e/scenarios/admin/admin_groups_management.js',
// 'test/e2e/scenarios/admin/admin_metaprops_configuration.js',
// 'test/e2e/scenarios/admin/admin_users_management.js',
// 'test/e2e/scenarios/application/application.js',
// 'test/e2e/scenarios/application/application_metaprops.js',
// 'test/e2e/scenarios/application/application_environments.js',
// 'test/e2e/scenarios/application/application_versions.js',
// 'test/e2e/scenarios/application/application_security.js',
// 'test/e2e/scenarios/application/application_security_role_check.js',
// 'test/e2e/scenarios/application/application_tags.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_editrelationshipname.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_editrequiredprops.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_input_output.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_multiplenodeversions.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_nodetemplate.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_plan.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_relationships.js',
// 'test/e2e/scenarios/application_topology/application_topology_editor_replacenode.js',
// 'test/e2e/scenarios/application_topology/application_topology_runtime.js',
// 'test/e2e/scenarios/deployment/deployment.js',
// 'test/e2e/scenarios/deployment/deployment_matcher.js',
// 'test/e2e/scenarios/deployment/deployment_manual_match_resources.js',
// 'test/e2e/scenarios/security/security_cloud.js',
// 'test/e2e/scenarios/security/security_groups.js',
// 'test/e2e/scenarios/security/security_users.js',
<<<<<<<
=======
// 'test/e2e/scenarios/deployment.js',
// 'test/e2e/scenarios/deployment_matcher.js',
// 'test/e2e/scenarios/deployment_manual_match_resources.js',
>>>>>>>
// 'test/e2e/scenarios/deployment.js',
// 'test/e2e/scenarios/deployment_matcher.js',
// 'test/e2e/scenarios/deployment_manual_match_resources.js', |
<<<<<<<
// It's a function only for custom operation
toggleInputParametersSecret: function(inputParameterName, inputParameter) {
=======
/*
* It's a function for policy secret button
It receives a policyEntry like propertyEntry
*/
togglePolicyPropertySecret: function(policy) {
// This request object is for unset the property.
var requestObject = {
type: 'org.alien4cloud.tosca.editor.operations.secrets.UnsetPolicyPropertyAsSecretOperation',
nodeName: this.scope.policies.selectedTemplate.name,
propertyName: policy.key
};
var broadcastObject = {
'propertyName': policy.key};
this.toggleSecret(policy, requestObject, broadcastObject);
},
/*
* It's a function only for custom operation
*/
toggleInputParameterSecret: function(inputParameterName, inputParameter) {
>>>>>>>
/*
* It's a function for policy secret button
It receives a policyEntry like propertyEntry
*/
togglePolicyPropertySecret: function(policy) {
// This request object is for unset the property.
var requestObject = {
type: 'org.alien4cloud.tosca.editor.operations.secrets.UnsetPolicyPropertyAsSecretOperation',
nodeName: this.scope.policies.selectedTemplate.name,
propertyName: policy.key
};
var broadcastObject = {
'propertyName': policy.key};
this.toggleSecret(policy, requestObject, broadcastObject);
},
/*
* It's a function only for custom operation
*/
toggleInputParametersSecret: function(inputParameterName, inputParameter) {
<<<<<<<
},
/*
* It's a function for toggling input secret.
Here we consider the value as a reference.
*/
toggleInputSecret: function(topology, inputId) {
if (_.undefined(topology.deployerInputProperties[inputId])) {
topology.deployerInputProperties[inputId] = {};
}
var property = topology.deployerInputProperties[inputId];
var scope = this.scope;
if (scope.properties.isSecretValue(property)) {
// Unset the property
property = null;
setTimeout(function () {
$('#reset-property-' + inputId).trigger('click');
}, 0);
} else {
_.forEach(_.keys(property), function(key){
delete property[key];
});
property['function'] = 'get_secret';
property['parameters'] = [''];
// Trigger the editor to enter the secret
setTimeout(function () {
$('#p_secret_' + inputId).trigger('click');
}, 0);
}
},
/*
* It's a function for toggling preconfigured input secret.
Here we consider the value as a reference.
*/
togglePreconfiguredInputSecret: function(topology, inputId) {
if (_.undefined(topology.preconfiguredInputProperties[inputId])) {
topology.preconfiguredInputProperties[inputId] = {};
}
var property = topology.preconfiguredInputProperties[inputId];
var scope = this.scope;
if (scope.properties.isSecretValue(property)) {
// Unset the property
property = null;
setTimeout(function () {
$('#reset-property-' + inputId).trigger('click');
}, 0);
} else {
_.forEach(_.keys(property), function(key){
delete property[key];
});
property['function'] = 'get_secret';
property['parameters'] = [''];
// Trigger the editor to enter the secret
setTimeout(function () {
$('#p_secret_' + inputId).trigger('click');
}, 0);
}
=======
},
toggleRelationshipPropertySecret: function(property, relationshipName) {
var scope = this.scope;
// This request object is for unset the property.
var requestObject = {
type: 'org.alien4cloud.tosca.editor.operations.secrets.UnsetRelationshipPropertyAsSecretOperation',
nodeName: this.scope.selectedNodeTemplate.name,
propertyName: property.key,
relationshipName: relationshipName
};
// Broadcast an event to auto open the editor inside the secret display.
var broadcastObject = {
'propertyName': property.key,
'relationshipName': relationshipName};
this.toggleSecret(property, requestObject, broadcastObject);
>>>>>>>
},
toggleRelationshipPropertySecret: function(property, relationshipName) {
var scope = this.scope;
// This request object is for unset the property.
var requestObject = {
type: 'org.alien4cloud.tosca.editor.operations.secrets.UnsetRelationshipPropertyAsSecretOperation',
nodeName: this.scope.selectedNodeTemplate.name,
propertyName: property.key,
relationshipName: relationshipName
};
// Broadcast an event to auto open the editor inside the secret display.
var broadcastObject = {
'propertyName': property.key,
'relationshipName': relationshipName};
this.toggleSecret(property, requestObject, broadcastObject); |
<<<<<<<
m4a: !!(audioTest.canPlayType('audio/x-m4a;') || audioTest.canPlayType('audio/m4a;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
mp4: !!(audioTest.canPlayType('audio/x-mp4;') || audioTest.canPlayType('audio/mp4;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
=======
aac: !!audioTest.canPlayType('audio/aac;').replace(/^no$/, ''),
m4a: !!(audioTest.canPlayType('audio/x-m4a;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
mp4: !!(audioTest.canPlayType('audio/x-mp4;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
>>>>>>>
aac: !!audioTest.canPlayType('audio/aac;').replace(/^no$/, ''),
m4a: !!(audioTest.canPlayType('audio/x-m4a;') || audioTest.canPlayType('audio/m4a;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
mp4: !!(audioTest.canPlayType('audio/x-mp4;') || audioTest.canPlayType('audio/mp4;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''), |
<<<<<<<
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page${pathname}`} as='script' />
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page/_error`} as='script' />
{this.getPreloadDynamicChunks()}
=======
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} as='script' />
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page/_error/index.js`} as='script' />
>>>>>>>
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} as='script' />
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page/_error/index.js`} as='script' />
{this.getPreloadDynamicChunks()}
<<<<<<<
const { staticMarkup, __NEXT_DATA__, chunks } = this.context._documentProps
const { pathname, buildId, assetPrefix } = __NEXT_DATA__
=======
const { staticMarkup, __NEXT_DATA__ } = this.context._documentProps
const { pathname, nextExport, buildId, assetPrefix } = __NEXT_DATA__
const pagePathname = getPagePathname(pathname, nextExport)
>>>>>>>
const { staticMarkup, __NEXT_DATA__, chunks } = this.context._documentProps
const { pathname, nextExport, buildId, assetPrefix } = __NEXT_DATA__
const pagePathname = getPagePathname(pathname, nextExport)
<<<<<<<
<script async type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page${pathname}`} />
<script async type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page/_error`} />
{staticMarkup ? null : this.getDynamicChunks()}
=======
<script async id={`__NEXT_PAGE__${pathname}`} type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} />
<script async id={`__NEXT_PAGE__/_error`} type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page/_error/index.js`} />
>>>>>>>
<script async id={`__NEXT_PAGE__${pathname}`} type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} />
<script async id={`__NEXT_PAGE__/_error`} type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page/_error/index.js`} />
{staticMarkup ? null : this.getDynamicChunks()} |
<<<<<<<
export const router = new Router(location.href, { Component })
=======
const router = new Router(window.location.href, { Component })
>>>>>>>
export const router = new Router(window.location.href, { Component }) |
<<<<<<<
<link rel='preload' href={`/_next/${buildId}/page${pathname}`} as='script' />
<link rel='preload' href={`/_next/${buildId}/page/_error`} as='script' />
{this.getPreloadDynamicChunks()}
{this.getPreloadMainLinks()}
=======
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page${pathname}`} as='script' />
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page/_error`} as='script' />
{this.getPreloadMainLinks()}
>>>>>>>
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page${pathname}`} as='script' />
<link rel='preload' href={`${assetPrefix}/_next/${buildId}/page/_error`} as='script' />
{this.getPreloadDynamicChunks()}
{this.getPreloadMainLinks()}
<<<<<<<
const { staticMarkup, __NEXT_DATA__, chunks } = this.context._documentProps
const { pathname, buildId } = __NEXT_DATA__
__NEXT_DATA__.chunks = chunks
=======
const { staticMarkup, __NEXT_DATA__ } = this.context._documentProps
const { pathname, buildId, assetPrefix } = __NEXT_DATA__
>>>>>>>
const { staticMarkup, __NEXT_DATA__, chunks } = this.context._documentProps
const { pathname, buildId, assetPrefix } = __NEXT_DATA__
__NEXT_DATA__.chunks = chunks
<<<<<<<
__html: `
__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)}
module={}
__NEXT_LOADED_PAGES__ = []
__NEXT_LOADED_CHUNKS__ = []
__NEXT_REGISTER_PAGE = function (route, fn) {
__NEXT_LOADED_PAGES__.push({ route: route, fn: fn })
}
__NEXT_REGISTER_CHUNK = function (chunkName, fn) {
__NEXT_LOADED_CHUNKS__.push({ chunkName: chunkName, fn: fn })
}
`
=======
__html: `
__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)}
module={}
__NEXT_LOADED_PAGES__ = []
__NEXT_REGISTER_PAGE = function (route, fn) {
__NEXT_LOADED_PAGES__.push({ route: route, fn: fn })
}
`
>>>>>>>
__html: `
__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)}
module={}
__NEXT_LOADED_PAGES__ = []
__NEXT_LOADED_CHUNKS__ = []
__NEXT_REGISTER_PAGE = function (route, fn) {
__NEXT_LOADED_PAGES__.push({ route: route, fn: fn })
}
__NEXT_REGISTER_CHUNK = function (chunkName, fn) {
__NEXT_LOADED_CHUNKS__.push({ chunkName: chunkName, fn: fn })
}
`
<<<<<<<
<script async type='text/javascript' src={`/_next/${buildId}/page${pathname}`} />
<script async type='text/javascript' src={`/_next/${buildId}/page/_error`} />
{staticMarkup ? null : this.getDynamicChunks()}
=======
<script async type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page${pathname}`} />
<script async type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page/_error`} />
>>>>>>>
<script async type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page${pathname}`} />
<script async type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page/_error`} />
{staticMarkup ? null : this.getDynamicChunks()} |
<<<<<<<
} else if (version && !semver.valid(version)) {
badRequest(res, `Invalid SemVer: "${version}"`)
=======
} else if (platform !== 'darwin' && platform !== 'win32') {
const message = `Unsupported platform: "${platform}". Supported: darwin, win32.`
notFound(res, message)
>>>>>>>
} else if (platform !== 'darwin' && platform !== 'win32') {
const message = `Unsupported platform: "${platform}". Supported: darwin, win32.`
notFound(res, message)
} else if (version && !semver.valid(version)) {
badRequest(res, `Invalid SemVer: "${version}"`) |
<<<<<<<
$scope.shouldDisable = function() {
var returnValue = true;
if ($scope.object) {
returnValue = !($scope.object.activeDirectoryBase &&
$scope.object.activeDirectoryUsername &&
$scope.object.activeDirectoryCredentials &&
$scope.object.activeDirectoryURL);
}
return returnValue;
};
=======
$scope.selectedRole = function(roleId) {
return $scope.object.defaultRoleId == roleId;
};
>>>>>>>
$scope.shouldDisable = function() {
var returnValue = true;
if ($scope.object) {
returnValue = !($scope.object.activeDirectoryBase &&
$scope.object.activeDirectoryUsername &&
$scope.object.activeDirectoryCredentials &&
$scope.object.activeDirectoryURL);
}
return returnValue;
};
$scope.selectedRole = function(roleId) {
return $scope.object.defaultRoleId == roleId;
}; |
<<<<<<<
import { withRouter } from 'react-router-dom';
=======
import PropTypes from 'prop-types';
>>>>>>>
import { withRouter } from 'react-router-dom';
import PropTypes from 'prop-types';
<<<<<<<
const {
locale = {},
language = 'en-us',
location: { pathname },
} = this.props;
=======
const { locale = {}, language = 'en-US' } = this.props;
>>>>>>>
const {
locale = {},
language = 'en-us',
location: { pathname },
} = this.props; |
<<<<<<<
import {Client} from "../../services/api";
=======
>>>>>>>
<<<<<<<
constructor() {
super();
this.state = {
pieChart: null
};
}
=======
>>>>>>> |
<<<<<<<
import PropTypes from 'prop-types';
export const DURATION = {
LENGTH_LONG: 2000,
=======
const ViewPropTypes = RNViewPropTypes || View.propTypes;
export const DURATION = {
LENGTH_LONG: 2000,
>>>>>>>
import PropTypes from 'prop-types';
const ViewPropTypes = RNViewPropTypes || View.propTypes;
export const DURATION = {
<<<<<<<
style: PropTypes.any,
position: PropTypes.oneOf([
=======
style: ViewPropTypes.style,
position: PropTypes.oneOf([
>>>>>>>
style: ViewPropTypes.style,
position: PropTypes.oneOf([
<<<<<<<
textStyle: PropTypes.any,
positionValue: PropTypes.number,
fadeInDuration: PropTypes.number,
fadeOutDuration: PropTypes.number,
opacity: PropTypes.number
=======
textStyle: Text.propTypes.style,
positionValue:PropTypes.number,
fadeInDuration:PropTypes.number,
fadeOutDuration:PropTypes.number,
opacity:PropTypes.number
>>>>>>>
textStyle: Text.propTypes.style,
positionValue:PropTypes.number,
fadeInDuration:PropTypes.number,
fadeOutDuration:PropTypes.number,
opacity:PropTypes.number |
<<<<<<<
}
=======
},
/*
>>>>>>>
},
/*
<<<<<<<
// {
// input: "examples/input/input.html",
// output: { dir: "dist/examples/input" },
// plugins: [html(), resolve(), commonjs(), typescript(), json(), babel({ babelHelpers: "bundled" })]
// },
// // Input
// {
// input: "examples/input/input_three.html",
// output: { dir: "dist/examples/input" },
// plugins: [html(), resolve()]
// },
// {
// input: "examples/input/touch-handler-1.html",
// output: { dir: "dist/examples/input" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/input/touch-handler-2.html",
// output: { dir: "dist/examples/input" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
=======
{
input: "examples/input/input.html",
output: { dir: "dist/examples/input" },
plugins: [html(), resolve(), commonjs(), typescript(), json(), babel({ babelHelpers: "bundled" })]
},
*/
// Input
{
input: "examples/input/input_three.html",
output: { dir: "dist/examples/input" },
plugins: [html(), resolve()]
},
/*
{
input: "examples/input/touch-handler-1.html",
output: { dir: "dist/examples/input" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
},
{
input: "examples/input/touch-handler-2.html",
output: { dir: "dist/examples/input" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
},
>>>>>>>
{
input: "examples/input/input.html",
output: { dir: "dist/examples/input" },
plugins: [html(), resolve(), commonjs(), typescript(), json(), babel({ babelHelpers: "bundled" })]
},
*/
// Input
{
input: "examples/input/input_three.html",
output: { dir: "dist/examples/input" },
plugins: [html(), resolve()]
}
/*
{
input: "examples/input/touch-handler-1.html",
output: { dir: "dist/examples/input" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
},
{
input: "examples/input/touch-handler-2.html",
output: { dir: "dist/examples/input" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
},
<<<<<<<
// // Particles
// {
// input: "examples/particles/fireworks.html",
// output: { dir: "dist/examples/particles" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/particles/index.html",
// output: { dir: "dist/examples/particles" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/particles/index-not-vr.html",
// output: { dir: "dist/examples/particles" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/physics/box.html",
// output: { dir: "dist/examples/physics" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/physics/car.html",
// output: { dir: "dist/examples/physics" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// }
=======
// Particles
{
input: "examples/particles/fireworks.html",
output: { dir: "dist/examples/particles" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
},
{
input: "examples/particles/index.html",
output: { dir: "dist/examples/particles" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
},
{
input: "examples/particles/index-not-vr.html",
output: { dir: "dist/examples/particles" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
},
{
input: "examples/physics/box.html",
output: { dir: "dist/examples/physics" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
},
{
input: "examples/physics/car.html",
output: { dir: "dist/examples/physics" },
plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
}
*/
>>>>>>>
// // Particles
// {
// input: "examples/particles/fireworks.html",
// output: { dir: "dist/examples/particles" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/particles/index.html",
// output: { dir: "dist/examples/particles" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/particles/index-not-vr.html",
// output: { dir: "dist/examples/particles" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/physics/box.html",
// output: { dir: "dist/examples/physics" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// },
// {
// input: "examples/physics/car.html",
// output: { dir: "dist/examples/physics" },
// plugins: [html(), resolve(), typescript(), babel({ babelHelpers: "bundled", plugins: ["transform-class-properties"] }), commonjs(), json()]
// }
*/ |
<<<<<<<
var dataUnspent = JSON.parse(fs.readFileSync('test/data/unspent.json'));
var dataUnspentSign = JSON.parse(fs.readFileSync('test/data/unspentSign.json'));
=======
var dataSigCanonical = JSON.parse(fs.readFileSync('test/data/sig_canonical.json'));
var dataSigNonCanonical = JSON.parse(fs.readFileSync('test/data/sig_noncanonical.json'));
>>>>>>>
var dataUnspent = JSON.parse(fs.readFileSync('test/data/unspent.json'));
var dataUnspentSign = JSON.parse(fs.readFileSync('test/data/unspentSign.json'));
var dataSigCanonical = JSON.parse(fs.readFileSync('test/data/sig_canonical.json'));
var dataSigNonCanonical = JSON.parse(fs.readFileSync('test/data/sig_noncanonical.json'));
<<<<<<<
module.exports.dataScriptAll = dataScriptValid.concat(dataScriptInvalid);
module.exports.dataUnspent = dataUnspent;
module.exports.dataUnspentSign = dataUnspentSign;
=======
module.exports.dataScriptAll = dataScriptValid.concat(dataScriptInvalid);
module.exports.dataSigCanonical = dataSigCanonical;
module.exports.dataSigNonCanonical = dataSigNonCanonical;
>>>>>>>
module.exports.dataScriptAll = dataScriptValid.concat(dataScriptInvalid);
module.exports.dataUnspent = dataUnspent;
module.exports.dataUnspentSign = dataUnspentSign;
module.exports.dataSigCanonical = dataSigCanonical;
module.exports.dataSigNonCanonical = dataSigNonCanonical; |
<<<<<<<
=======
var reFullVal = /^\s*(\d+)\.(\d+)/;
var reFracVal = /^\s*\.(\d+)/;
var reWholeVal = /^\s*(\d+)/;
function padFrac(frac)
{
while (frac.length < 8)
frac = frac + '0';
return frac;
}
function parseFullValue(res)
{
return bignum(res[1]).mul('100000000').add(padFrac(res[2]));
}
function parseFracValue(res)
{
return bignum(padFrac(res[1]));
}
function parseWholeValue(res)
{
return bignum(res[1]).mul('100000000');
}
exports.parseValue = function parseValue(valueStr)
{
var res = valueStr.match(reFullVal);
if (res)
return parseFullValue(res);
res = valueStr.match(reFracVal);
if (res)
return parseFracValue(res);
res = valueStr.match(reWholeVal);
if (res)
return parseWholeValue(res);
return undefined;
};
var pubKeyHashToAddress = exports.pubKeyHashToAddress = function (pubKeyHash, addressVersion) {
if (!pubKeyHash) return "";
var put = new Put();
// Version
if(addressVersion) {
put.word8le(addressVersion);
} else {
put.word8le(0);
}
// Hash
put.put(pubKeyHash);
// Checksum (four bytes)
put.put(twoSha256(put.buffer()).slice(0,4));
return encodeBase58(put.buffer());
};
var addressToPubKeyHash = exports.addressToPubKeyHash = function (address) {
// Trim
address = String(address).replace(/\s/g, '');
// Check sanity
if (!address.match(/^[1-9A-HJ-NP-Za-km-z]{27,35}$/)) {
return null;
}
// Decode
var buffer = decodeBase58(address);
// Parse
var parser = Binary.parse(buffer);
parser.word8('version');
parser.buffer('hash', 20);
parser.buffer('checksum', 4);
// Check checksum
var checksum = twoSha256(buffer.slice(0, 21)).slice(0, 4);
if (checksum.compare(parser.vars.checksum) !== 0) {
return null;
}
return parser.vars.hash;
};
>>>>>>>
var reFullVal = /^\s*(\d+)\.(\d+)/;
var reFracVal = /^\s*\.(\d+)/;
var reWholeVal = /^\s*(\d+)/;
function padFrac(frac)
{
while (frac.length < 8)
frac = frac + '0';
return frac;
}
function parseFullValue(res)
{
return bignum(res[1]).mul('100000000').add(padFrac(res[2]));
}
function parseFracValue(res)
{
return bignum(padFrac(res[1]));
}
function parseWholeValue(res)
{
return bignum(res[1]).mul('100000000');
}
exports.parseValue = function parseValue(valueStr)
{
var res = valueStr.match(reFullVal);
if (res)
return parseFullValue(res);
res = valueStr.match(reFracVal);
if (res)
return parseFracValue(res);
res = valueStr.match(reWholeVal);
if (res)
return parseWholeValue(res);
return undefined;
}; |
<<<<<<<
export const getWatchingConfigPath = () => 'src/.watch.yml';
// TODO: Add error checks for each env variable
=======
export const getWatchingConfigPath = () => 'src/.watch.yml';
export const networksById = {
1: 'api',
3: 'ropsten',
4: 'rinkeby',
42: 'kovan',
};
>>>>>>>
export const getWatchingConfigPath = () => 'src/.watch.yml';
// TODO: Add error checks for each env variable
export const networksById = {
1: 'api',
3: 'ropsten',
4: 'rinkeby',
42: 'kovan',
}; |
<<<<<<<
=======
const transactionTemplate = {
};
>>>>>>>
<<<<<<<
eth: {
getBlock: (blockNumber, transactions, callback) => {
if (callback)
callback(null, blockTemplate)
},
getTransactionReceipt: (transaction, callback) => {
if (callback)
callback(null, transactionReceiptTemplate)
}
}
=======
eth: {
getBlock: (blocnNumber, transactions, callback) => {
if (callback) { callback(null, blockTemplate); }
},
getTransactionReceipt: (transaction, callback) => {
if (callback) { callback(null, transactionReceiptTemplate); }
},
getTransaction: (transaction, callback) => {
if (callback) { callback(null, transactionTemplate); }
},
},
>>>>>>>
eth: {
getBlock: (blocnNumber, transactions, callback) => {
if (callback) { callback(null, blockTemplate); }
},
getTransactionReceipt: (transaction, callback) => {
if (callback) { callback(null, transactionReceiptTemplate); }
},
}, |
<<<<<<<
export const getWatchingConfigPath = () => 'src/.watch.yml';
export const getOutputModel = () => process.env.OUTPUT_TYPE;
export const graylogConfig = { host: process.env.GRAYLOG_HOSTNAME,
port: process.env.GRAYLOG_PORT };
=======
export const getWatchingConfigPath = () => 'src/.watch.yml';
export const networksById = {
1: 'api',
3: 'ropsten',
4: 'rinkeby',
42: 'kovan',
};
>>>>>>>
export const getWatchingConfigPath = () => 'src/.watch.yml';
export const getOutputModel = () => process.env.OUTPUT_TYPE;
export const graylogConfig = { host: process.env.GRAYLOG_HOSTNAME,
port: process.env.GRAYLOG_PORT };
export const networksById = {
1: 'api',
3: 'ropsten',
4: 'rinkeby',
42: 'kovan',
}; |
<<<<<<<
console.log(chalk.green('✓ got data from weather server'));
=======
if (args.v || args.verbose) {
console.log(clc.green('✓ got data from weather server'));
};
>>>>>>>
if (args.v || args.verbose) {
console.log(chalk.green('✓ got data from weather server'));
}
<<<<<<<
console.log(chalk.green('✓ got geo location server response'));
console.log(chalk.green('✓ got location: ') + chalk.bgBlack.white(json.results[0].formatted_address));
=======
if (args.v || args.verbose) {
console.log(clc.green('✓ got geo location server response'));
console.log(clc.green('✓ got location: ') + clc.bgBlack.white(json.results[0].formatted_address));
}
>>>>>>>
if (args.v || args.verbose) {
console.log(chalk.green('✓ got geo location server response'));
console.log(chalk.green('✓ got location: ') + chalk.bgBlack.white(json.results[0].formatted_address));
}
<<<<<<<
console.log(chalk.green('✓ got location server response'));
=======
if (args.v || args.verbose) {
console.log(clc.green('✓ got location server response'));
}
>>>>>>>
if (args.v || args.verbose) {
console.log(chalk.green('✓ got location server response'));
}
<<<<<<<
console.log(chalk.green('✓ got location: ') + chalk.bgBlack.white(location));
callback(position, units);
=======
if (args.v || args.verbose) {
console.log(clc.green('✓ got location: ') + clc.bgBlack.white(location));
}
callback(position, units, args);
>>>>>>>
if (args.v || args.verbose) {
console.log(chalk.green('✓ got location: ') + chalk.bgBlack.white(location));
}
callback(position, units, args); |
<<<<<<<
console.log(chalk.green('✓ saved preset'));
=======
if (args.v || args.verbose) {
console.log(clc.green('✓ saved preset'));
}
>>>>>>>
if (args.v || args.verbose) {
console.log(chalk.green('✓ saved preset'));
}
<<<<<<<
console.log(chalk.red('✗ couldn\'t read preset data: you have no presets! run the ') + chalk.bgBlack.white(' -s ') +
chalk.red(' or the ') + chalk.bgBlack.white('-save') + chalk.red('\n option after any commands to save preferences'));
=======
console.log(clc.red('✗ couldn\'t read preset data: you have no presets! run the ') + clc.bgBlack.white(' -s ') +
clc.red(' or the ') + clc.bgBlack.white('-save') + clc.red('\n option after any commands to save preferences'));
>>>>>>>
console.log(chalk.red('✗ couldn\'t read preset data: you have no presets! run the ') + chalk.bgBlack.white(' -s ') +
chalk.red(' or the ') + chalk.bgBlack.white('-save') + chalk.red('\n option after any commands to save preferences'));
<<<<<<<
console.log(chalk.green('✓ read preset'));
=======
if (args.v || args.verbose) {
console.log(clc.green('✓ read preset'));
}
>>>>>>>
if (args.v || args.verbose) {
console.log(chalk.green('✓ read preset'));
} |
<<<<<<<
vm.isSelectedSplittable = false;
};
=======
vm.isSelectedSplittable = true;
}
>>>>>>>
vm.isSelectedSplittable = true;
}; |
<<<<<<<
},
{
pattern: 'test/spec/plugin/TextBoxPlaceHolderSpec.js',
included: false
=======
},
{
pattern: 'test/spec/ControlSpec.js',
include: false
},
{
pattern: 'test/spec/lib/*.js',
include: false
},
{
pattern: 'test/spec/mainSpec.js',
include: false
>>>>>>>
},
{
pattern: 'test/spec/plugin/TextBoxPlaceHolderSpec.js',
included: false
},
{
pattern: 'test/spec/ControlSpec.js',
include: false
},
{
pattern: 'test/spec/lib/*.js',
include: false
},
{
pattern: 'test/spec/mainSpec.js',
include: false |
<<<<<<<
// 由于基础组件Control添加了公共属性，不能将暂时移除此处限制
// else if (name in thisOptions) {
else {
=======
else if (name in thisOptions) {
>>>>>>>
// 由于基础组件Control添加了公共属性，不能将暂时移除此处限制
// else if (name in thisOptions) {
else {
<<<<<<<
/**
* 控件库配置数据
*
* @type {Object}
* @ignore
*/
var config = {
uiPrefix: 'data-ui',
instanceAttr: 'data-ctrl-id',
uiClassPrefix: 'ui',
skinClassPrefix: 'skin',
stateClassPrefix: 'state',
domIDPrefix: ''
};
/**
* 将参数用`-`连接成字符串
*
* @param {string...} args 需要连接的串
* @return {string}
* @ignore
*/
function joinByStrike() {
return [].slice.call(arguments, 0).join('-');
}
/**
* 获取控件部件相关的class数组
*
* esui简化版本
*
* 如果不传递`part`参数，则生成如下：
*
* - `ui-{type}`
* - `skin-{type}`
*
* 如果有`part`参数，则生成如下：
*
* - `ui-{type}-{part}`
* - `skin-{type}-{part}`
*
* @param {string?} part 部件名称
* @return {string[]}
*/
lib.getPartClasses = function (control, part) {
var type = control.type.toLowerCase();
var skin = control.skin;
var prefix = config.uiClassPrefix;
var skinPrefix = config.skinClassPrefix;
var classes = [];
if (part) {
classes.push(joinByStrike(prefix, type, part));
if (skin) {
for (var i = 0, len = skin.length; i < len; i++) {
classes.push(joinByStrike(skinPrefix, skin[i], type, part));
}
}
}
else {
classes.push(joinByStrike(prefix, type));
if (skin) {
for (var i = 0, len = skin.length; i < len; i++) {
classes.push(
joinByStrike(skinPrefix, skin[i]),
joinByStrike(skinPrefix, skin[i], type)
);
}
}
}
return classes;
};
/**
* 获取控件部件相关的class字符串，具体可参考{@link lib#getPartClasses}方法
*
* @param {string} [part] 部件名称
* @return {string}
*/
lib.getPartClassName = function (control, part) {
return lib.getPartClasses(control, part).join(' ');
};
/**
* 添加控件部件相关的class，具体可参考{@link lib#getPartClasses}方法
*
* @param {string} [part] 部件名称
* @param {HTMLElement | string} [element] 部件元素或部件名称，默认为主元素
*/
lib.addPartClasses = function (control, part, element) {
if (typeof element === 'string') {
element = lib.getPart(control, element);
}
element = element || control.main;
if (!element) {
return;
}
var classes = lib.getPartClassName(control, part);
$(element).addClass(classes);
};
/**
* 移除控件部件相关的class，具体可参考{@link lib#getPartClasses}方法
*
* @param {string} [part] 部件名称
* @param {HTMLElement | string} [element] 部件元素或部件名称，默认为主元素
*/
lib.removePartClasses = function (control, part, element) {
if (typeof element === 'string') {
element = this.getPart(element);
}
element = element || this.control.main;
if (!element) {
return;
}
var classes = lib.getPartClassName(control, part);
$(element).removeClass(classes);
};
/**
* 获取控件状态相关的class数组
*
* 生成如下：
*
* - `ui-{type}-{state}`
* - `state-{state}`
* - `skin-{skin}-{state}`
* - `skin-{skin}-{type}-{state}`
*
* @param {string} state 状态名称
* @return {string[]}
*/
lib.getStateClasses = function (control, state) {
var type = control.type.toLowerCase();
var classes = [
joinByStrike(config.uiClassPrefix, type, state),
joinByStrike(config.stateClassPrefix, state)
];
var skin = control.skin;
if (skin) {
var skinPrefix = config.skinClassPrefix;
for (var i = 0, len = skin.length; i < len; i++) {
classes.push(
joinByStrike(skinPrefix, skin[i], state),
joinByStrike(skinPrefix, skin[i], type, state)
);
}
}
return classes;
};
/**
* 获取控件的状态样式字符串，具体可参考{@link lib#getStateClasses}方法
*
* @param {string} [part] 部件名称
* @return {string}
*/
lib.getStateClassName = function (control, part) {
return lib.getStateClasses(control, part).join(' ');
};
/**
* 添加控件状态相关的class，具体可参考{@link lib#getStateClasses}方法
*
* @param {string} state 状态名称
*/
lib.addStateClasses = function (control, state) {
var element = control.main;
if (!element) {
return;
}
var classes = lib.getStateClassName(control, state);
$(element).addClass(classes);
};
/**
* 移除控件状态相关的class，具体可参考{@link lib#getStateClasses}方法
*
* @param {string} state 状态名称
*/
lib.removeStateClasses = function (control, state) {
var element = control.main;
if (!element) {
return;
}
var classes = lib.getStateClassName(control, state);
$(element).removeClass(classes);
};
/**
* 获取指定部件的DOM元素
*
* @param {string} part 部件名称
* @return {HTMLElement}
*/
lib.getPart = function (part) {
return lib.g(this.getId(part));
};
/**
* 获取用于控件DOM元素的id
*
* 控件ID: ctrl-{type}-{id}
* 控件部件ID: ctrl-{type}-{id}-{part}
* @param {string} [part] 部件名称，如不提供则生成控件主元素的id
* @return {string}
*/
lib.getPartId = function (control, part) {
part = part ? '-' + part : '';
return 'ctrl-' + control.type.toLowerCase() + '-' + control.id + part;
};
=======
>>>>>>> |
<<<<<<<
* @deprecated
* @see lib.q
=======
>>>>>>>
* @deprecated
* @see lib.q |
<<<<<<<
=======
var ScrollStore = require('./ScrollStore');
>>>>>>>
<<<<<<<
var _currentPath;
=======
>>>>>>>
var _currentPath;
<<<<<<<
=======
if (_currentPath === action.path) {
return;
}
>>>>>>>
<<<<<<<
case LocationActions.SETUP:
case LocationActions.PUSH:
case LocationActions.REPLACE:
case LocationActions.POP:
_currentPath = action.path;
notifyChange(action.sender);
=======
case ActionTypes.SETUP:
case ActionTypes.PUSH:
case ActionTypes.REPLACE:
case ActionTypes.POP:
_currentPath = action.path;
notifyChange();
break;
>>>>>>>
case LocationActions.SETUP:
case LocationActions.PUSH:
case LocationActions.REPLACE:
case LocationActions.POP:
if (_currentPath !== action.path) {
_currentPath = action.path;
notifyChange(action.sender);
}
break; |
<<<<<<<
var State = require('../mixins/State');
=======
var {
Bar,
EchoFooProp,
Foo,
Nested,
EchoBarParam,
MJ,
RedirectToFoo,
RPFlo
} = require('./testHandlers');
>>>>>>>
var {
Bar,
EchoFooProp,
Foo,
Nested,
EchoBarParam,
RedirectToFoo
} = require('./testHandlers');
<<<<<<<
var html = React.renderToString(Handler({ query: state.query.foo }));
=======
var html = React.renderToString(<Handler foo={state.activeQuery.foo} />);
>>>>>>>
var html = React.renderToString(<Handler foo={state.query.foo} />);
<<<<<<<
var Foo = React.createClass({
render: function () {
return React.DOM.div({}, React.createElement(RouteHandler));
}
});
=======
>>>>>>>
<<<<<<<
var Nested = React.createClass({
render: function () {
return (
<div className="Nested">
<h1>hello</h1>
<RouteHandler/>
</div>
);
}
});
var Echo = React.createClass({
render: function () {
return <div>{this.props.name}</div>;
}
});
var ParamEcho = React.createClass({
mixins: [ State ],
render: function () {
return <div>{this.getParams().name}</div>
}
});
var RPFlo = React.createClass({
render: function () { return <div>rpflo</div>; }
});
var MJ = React.createClass({
render: function () { return <div>mj</div>; }
});
=======
>>>>>>> |
<<<<<<<
var RouteHandler = require('../RouteHandler');
var Nested = React.createClass({
render: function () {
return (
<div>
hello
<RouteHandler />
</div>
);
}
});
var Foo = React.createClass({
render: function () {
return <div>foo</div>;
}
});
var Bar = React.createClass({
render: function () {
return <div>bar</div>;
}
});
=======
var Router = require('../../Router');
var ActiveRouteHandler = require('../../components/ActiveRouteHandler');
var { Foo, Bar, Nested } = require('../../__tests__/testHandlers.js');
>>>>>>>
var RouteHandler = require('../RouteHandler');
var { Foo, Bar, Nested } = require('../../__tests__/testHandlers.js'); |
<<<<<<<
})
it('emits events when content-type is x-www-form-urlencoded', async (done) => {
const payload = { 'payload': 'true' } // UrlEncoded are string:string
await request(server).post(channel)
.set('content-type', 'application/x-www-form-urlencoded')
.send(payload)
.expect(200)
events.addEventListener('message', (msg) => {
const data = JSON.parse(msg.data)
expect(data.body).toEqual(payload)
// test is done if all of this gets called
done()
})
})
it('POST /:channel/redeliver re-emits a payload', async (done) => {
const payload = { payload: true }
=======
>>>>>>>
})
it('emits events when content-type is x-www-form-urlencoded', async (done) => {
const payload = { 'payload': 'true' } // UrlEncoded are string:string |
<<<<<<<
liftState,
=======
getModel,
getEffect,
>>>>>>>
liftState,
getModel,
getEffect,
<<<<<<<
liftState,
=======
getModel,
getEffect,
>>>>>>>
liftState,
getModel,
getEffect, |
<<<<<<<
{ test: /\.js$/, exclude: [/app\/lib/, /node_modules/], loader: 'ng-annotate!babel' },
{ test: /\.html$/, loader: 'raw' },
{ test: /\.styl$/, loader: 'style!css!stylus' },
{ test: /\.css$/, loader: 'style!css' },
{ test: /\.(ttf|eot|svg|otf|woff(2)?)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file?name=fonts/[name].[ext]" }
=======
{ test: /\.js$/, exclude: [/app\/lib/, /node_modules/], loader: "ng-annotate!babel" },
{ test: /\.html$/, loader: "raw" },
{ test: /\.styl$/, loader: "style!css!stylus" },
{ test: /\.css$/, loader: "style!css" }
>>>>>>>
{ test: /\.js$/, exclude: [/app\/lib/, /node_modules/], loader: "ng-annotate!babel" },
{ test: /\.html$/, loader: "raw" },
{ test: /\.styl$/, loader: "style!css!stylus" },
{ test: /\.css$/, loader: "style!css" },
{ test: /\.(ttf|eot|svg|otf|woff(2)?)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file?name=fonts/[name].[ext]" } |
<<<<<<<
import GroupService from "../../common/group/group";
import joinGroupPreview from "./_joinGroupPreview/joinGroupPreview";
=======
import Group from "../../common/group/group";
>>>>>>>
import GroupService from "../../common/group/group";
<<<<<<<
joinGroupPreview,
GroupService
=======
Group
>>>>>>>
GroupService |
<<<<<<<
.config(AppTranslate)
.config(AppMaterial)
.component("app", AppComponent);
=======
.config(AppMaterial);
>>>>>>>
.config(AppTranslate)
.config(AppMaterial); |
<<<<<<<
let $httpBackend, $state;
=======
>>>>>>>
<<<<<<<
let groupData = {
id: 12
};
=======
let groupData = { id: 12 };
>>>>>>>
let groupData = { id: 12 }; |
<<<<<<<
console.log(split);
=======
>>>>>>>
<<<<<<<
console.log('contant:'+split[i]);
=======
>>>>>>>
<<<<<<<
console.log(arg, pointer);
=======
>>>>>>> |
<<<<<<<
"Side_Chain":"Side chain browser(DappChain)",
"Main_Chain":"Main chain browser(MainChain)",
=======
"7day": "one week",
"14day": "two weeks",
"30day": "one month",
"select_tip": "To view data other than 2000 You can manually adjust the time window",
"date_number_tip": "{total} records in the current time range",
"date_list_tip": "Only the first 2000 data are displayed",
>>>>>>>
"Side_Chain":"Side chain browser(DappChain)",
"Main_Chain":"Main chain browser(MainChain)",
"7day": "one week",
"14day": "two weeks",
"30day": "one month",
"select_tip": "To view data other than 2000 You can manually adjust the time window",
"date_number_tip": "{total} records in the current time range",
"date_list_tip": "Only the first 2000 data are displayed", |
<<<<<<<
edgeRenderMode="sketchy"
nodeRenderMode="sketchy"
networkType={{ type: "chord" }}
=======
networkType={{ type: "chord", padAngle: 0.3 }}
>>>>>>>
edgeRenderMode="sketchy"
nodeRenderMode="sketchy"
networkType={{ type: "chord", padAngle: 0.3 }} |
<<<<<<<
} ;
},
previous: function() {
if(player.i>0) player.i = player.i-1;
$location.hash(player.tracks[player.i].permalink);
window.smoothScroll(document.getElementById(player.tracks[player.i].permalink));
if (player.playing) player.play(player.tracks, player.i);
},
loadTrack: function(tracks, i) {
player.tracks = tracks;
player.i = i;
$location.hash(tracks[i].permalink);
}
};
audio.addEventListener('ended', function() {
$rootScope.$apply(player.next());
}, false);
return player;
});
=======
},
loadTrack: function(tracks, i) {
player.tracks = tracks;
player.i = i;
$location.hash(tracks[i].permalink);
},
togglePause: function() {
if (player.playing) {
player.pause(player.track);
} else {
player.play(player.tracks, player.i);
}
}
};
audio.addEventListener('ended', function() {
$rootScope.$apply(player.next());
}, false);
// Add native JS event listener for keyboard shortcuts.
var checkKey = function checkKey(e) {
var e = e || window.event;
if (e.keyCode == '32') {
// Spacebar
player.togglePause();
// Stop event bubbling so window doesn't scroll
return false;
} else if (e.keyCode == '74') {
// j = down in vim
$rootScope.$apply(player.next());
} else if (e.keyCode == '75') {
// k = up in vim
$rootScope.$apply(player.previous());
}
};
document.onkeydown = checkKey;
return player;
})
// Audio Factory
.factory('audio', function($document, $rootScope) {
var audio = $document[0].createElement('audio');
return audio;
})
>>>>>>>
} ;
},
previous: function() {
if(player.i>0) player.i = player.i-1;
$location.hash(player.tracks[player.i].permalink);
window.smoothScroll(document.getElementById(player.tracks[player.i].permalink));
if (player.playing) player.play(player.tracks, player.i);
},
loadTrack: function(tracks, i) {
player.tracks = tracks;
player.i = i;
$location.hash(tracks[i].permalink);
},
togglePause: function() {
if (player.playing) {
player.pause(player.track);
} else {
player.play(player.tracks, player.i);
}
}
};
audio.addEventListener('ended', function() {
$rootScope.$apply(player.next());
}, false);
// Add native JS event listener for keyboard shortcuts.
var checkKey = function checkKey(e) {
var e = e || window.event;
if (e.keyCode == '32') {
// Spacebar
player.togglePause();
// Stop event bubbling so window doesn't scroll
return false;
} else if (e.keyCode == '74') {
// j = down in vim
$rootScope.$apply(player.next());
} else if (e.keyCode == '75') {
// k = up in vim
$rootScope.$apply(player.previous());
}
};
document.onkeydown = checkKey;
return player;
}); |
<<<<<<<
return assertRevert(async () => {
await app.vote(voteId, true, { from: nonHolder })
=======
return assertInvalidOpcode(async () => {
await app.vote(voteId, true, true, { from: nonHolder })
>>>>>>>
return assertRevert(async () => {
await app.vote(voteId, true, true, { from: nonHolder })
<<<<<<<
return assertRevert(async () => {
await app.vote(voteId, true, { from: holder31 })
=======
return assertInvalidOpcode(async () => {
await app.vote(voteId, true, true, { from: holder31 })
>>>>>>>
return assertRevert(async () => {
await app.vote(voteId, true, true, { from: holder31 })
<<<<<<<
await app.vote(voteId, true, { from: holder50 }) // causes execution
return assertRevert(async () => {
=======
await app.vote(voteId, true, true, { from: holder50 }) // causes execution
return assertInvalidOpcode(async () => {
>>>>>>>
await app.vote(voteId, true, true, { from: holder50 }) // causes execution
return assertRevert(async () => {
<<<<<<<
await app.vote(voteId, true, { from: holder50 }) // causes execution
return assertRevert(async () => {
await app.vote(voteId, true, { from: holder19 })
=======
await app.vote(voteId, true, true, { from: holder50 }) // causes execution
return assertInvalidOpcode(async () => {
await app.vote(voteId, true, true, { from: holder19 })
>>>>>>>
await app.vote(voteId, true, true, { from: holder50 }) // causes execution
return assertRevert(async () => {
await app.vote(voteId, true, true, { from: holder19 }) |
<<<<<<<
...lang19Q4
=======
// 2019-12-18
"address_vote_reward_pending":"투표 보상",
"address_balance":"TRX 잔액",
"address_get_energe":"에너지 획득하려면",
"address_get_bandwith":"대역폭 획득하려면",
"address_freeze_owner":"자신에게 동결",
"address_freeze_other":"타인에게 동결",
>>>>>>>
// 2019-12-18
"address_vote_reward_pending":"투표 보상",
"address_balance":"TRX 잔액",
"address_get_energe":"에너지 획득하려면",
"address_get_bandwith":"대역폭 획득하려면",
"address_freeze_owner":"자신에게 동결",
"address_freeze_other":"타인에게 동결",
...lang19Q4 |
<<<<<<<
var addBrush = this._attr.addBrushing;
var xScale = this.vis.xAxis.xScale;
=======
var xScale = this.handler.xAxis.xScale;
>>>>>>>
var addBrush = this._attr.addBrushing;
var xScale = this.handler.xAxis.xScale; |
<<<<<<<
=======
require('heat');
require('markercluster');
>>>>>>>
<<<<<<<
var mapOptions = {
minZoom: 2,
maxZoom: 16,
=======
var worldBounds = L.latLngBounds([-200, -220], [200, 220]);
var map = L.map(div[0], {
>>>>>>>
var mapOptions = {
minZoom: 2,
maxZoom: 16,
<<<<<<<
continuousWorld: true,
noWrap: true,
maxBounds: worldBounds
};
var map = L.map(div[0], mapOptions);
self.maps.push(map);
=======
maxBounds: worldBounds,
scrollWheelZoom: false,
fadeAnimation: false
});
>>>>>>>
continuousWorld: true,
noWrap: true,
maxBounds: worldBounds,
scrollWheelZoom: false,
fadeAnimation: false
};
var map = L.map(div[0], mapOptions);
self.maps.push(map);
<<<<<<<
// if sub agg split, add labels
=======
>>>>>>>
<<<<<<<
weight: 1.0,
=======
weight: 0.5,
>>>>>>>
weight: 1.0,
<<<<<<<
// TODO: add UI to select local min max or all min max
=======
// TODO: add UI to select local min max or super min max
>>>>>>>
// TODO: add UI to select local min max or all min max |
<<<<<<<
visTypes.register(require('plugins/vis_types/vislib/histogram'));
visTypes.register(require('plugins/vis_types/vislib/line'));
visTypes.register(require('plugins/vis_types/vislib/pie'));
=======
visTypes.register(require('plugins/vis_types/histogram'));
visTypes.register(require('plugins/vis_types/line'));
visTypes.register(require('plugins/vis_types/area'));
visTypes.register(require('plugins/vis_types/pie'));
>>>>>>>
visTypes.register(require('plugins/vis_types/vislib/histogram'));
visTypes.register(require('plugins/vis_types/vislib/line'));
visTypes.register(require('plugins/vis_types/vislib/pie'));
visTypes.register(require('plugins/vis_types/area')); |
<<<<<<<
$scope.toggleTimepicker = function () {
// Close if already open
if ($scope.configTemplate === timepickerHtml) {
delete $scope.configTemplate;
} else {
$scope.configTemplate = timepickerHtml;
}
};
=======
function updateDataSource() {
if ($scope.opts.index !== search.get('index')) {
// set the index on the savedSearch
search.index($scope.opts.index);
// clear the columns and fields, then refetch when we do a search
$scope.columns = $scope.fields = null;
}
>>>>>>>
$scope.toggleTimepicker = function () {
// Close if already open
if ($scope.configTemplate === timepickerHtml) {
delete $scope.configTemplate;
} else {
$scope.configTemplate = timepickerHtml;
}
};
function updateDataSource() {
if ($scope.opts.index !== search.get('index')) {
// set the index on the savedSearch
search.index($scope.opts.index);
// clear the columns and fields, then refetch when we do a search
$scope.columns = $scope.fields = null;
} |
<<<<<<<
import AccountPermissionUpdateContract from './AccountPermissionUpdateContract'
=======
import VoteWitnessContract from './VoteWitnessContract'
import WitnessUpdateContract from './WitnessUpdateContract'
>>>>>>>
import AccountPermissionUpdateContract from './AccountPermissionUpdateContract'
import VoteWitnessContract from './VoteWitnessContract'
import WitnessUpdateContract from './WitnessUpdateContract' |
<<<<<<<
var IndexedArray = require('utils/indexed_array/index');
var editorHtml = require('text!components/agg_types/controls/field.html');
=======
var Registry = require('utils/registry/registry');
>>>>>>>
var IndexedArray = require('utils/indexed_array/index');
var Registry = require('utils/registry/registry'); |
<<<<<<<
<button className="btn btn-success mr-2" onClick={this.claimRewards}>
{tu("claim_rewards")}
=======
<button className="btn btn-success mr-2"
onClick={this.claimRewards}
disabled={currentWallet.representative.allowance === 0}>
Claim Rewards
>>>>>>>
<button className="btn btn-success mr-2"
onClick={this.claimRewards}
disabled={currentWallet.representative.allowance === 0}>
{tu("claim_rewards")}
<<<<<<<
<a className="btn btn-primary mr-2" target="_blank" href="https://github.com/tronscan/tronsr-template#readme">
{tu("show_more_information_publish_sr_page")}
=======
<HrefLink className="btn btn-primary mr-2" href="https://github.com/tronscan/tronsr-template#readme">
Show more Information on how to publish a page
>>>>>>>
<HrefLink className="btn btn-primary mr-2" href="https://github.com/tronscan/tronsr-template#readme">
{tu("show_more_information_publish_sr_page")} |
<<<<<<<
/*
##################################################################################
# #
# notice 2018-12-10 #
# #
##################################################################################
*/
"OthersArticle":"Articles in this group",
=======
"Favorites":"オプション",
"dex_search_dec":"取引したい通貨の略称を入力してください",
>>>>>>>
"Favorites":"オプション",
"dex_search_dec":"取引したい通貨の略称を入力してください",
/*
##################################################################################
# #
# notice 2018-12-10 #
# #
##################################################################################
*/
"OthersArticle":"Articles in this group", |
<<<<<<<
var metaFields = config.get('metaFields');
=======
var $state = $scope.state = new AppState(stateDefaults);
filterManager.init($state);
>>>>>>>
var metaFields = config.get('metaFields');
filterManager.init($state); |
<<<<<<<
var d3 = require('d3');
=======
// Dynamically adds css file
require('css!../css/k4.d3');
// adds an array to another array
function addTo(to, array) {
[].push.apply(to, array);
}
>>>>>>>
// adds an array to another array
function addTo(to, array) {
[].push.apply(to, array);
} |
<<<<<<<
// TODO: This works around an Elasticsearch bug the always casts terms agg scripts to strings
// thus causing issues with filtering. This probably causes other issues since float might not
// be able to contain the number on the elasticsearch side
if (output.params.script) {
output.params.valueType = agg.field().type === 'number' ? 'float' : agg.field().type;
}
if (orderAgg.type.name === 'count') {
=======
if (!orderAgg || orderAgg.type.name === 'count') {
>>>>>>>
// TODO: This works around an Elasticsearch bug the always casts terms agg scripts to strings
// thus causing issues with filtering. This probably causes other issues since float might not
// be able to contain the number on the elasticsearch side
if (output.params.script) {
output.params.valueType = agg.field().type === 'number' ? 'float' : agg.field().type;
}
if (!orderAgg || orderAgg.type.name === 'count') { |
<<<<<<<
var bounds = Util.extentToBounds(location.extent);
=======
bounds = Esri.Util.extentToBounds(location.extent);
>>>>>>>
bounds = Util.extentToBounds(location.extent); |
<<<<<<<
import { last } from "lodash";
import { Helpers, Log } from "victory-core";
=======
import { assign, last } from "lodash";
import { Helpers } from "victory-core";
>>>>>>>
import { assign, last } from "lodash";
import { Helpers, Log } from "victory-core";
<<<<<<<
let data = Data.getData(props);
if (data.length < 2) {
Log.warn("Area requires at least two data points.");
data = Data.generateData(props);
}
const minY = Math.min(...domain.y) > 0 ? Math.min(...domain.y) : 0;
=======
const data = Data.getData(props);
const defaultMin = Scale.getScaleType(props, "y") === "log" ? 1 / Number.MAX_SAFE_INTEGER : 0;
const minY = Math.min(...domain.y) > 0 ? Math.min(...domain.y) : defaultMin;
>>>>>>>
let data = Data.getData(props);
if (data.length < 2) {
Log.warn("Area requires at least two data points.");
data = Data.generateData(props);
}
const defaultMin = Scale.getScaleType(props, "y") === "log" ? 1 / Number.MAX_SAFE_INTEGER : 0;
const minY = Math.min(...domain.y) > 0 ? Math.min(...domain.y) : defaultMin; |
<<<<<<<
const min = Collection.containsDates(domain) ?
Helpers.retainDate(Math.min(...domain, 0)) :
Math.min(...domain, 0);
const max = Collection.containsDates(domain) ?
Helpers.retainDate(Math.max(...domain, 0)) :
Math.max(...domain, 0);
return isDependent ? [min, max] : domain;
=======
const zeroDomain = isDependent ? [Math.min(...domain, 0), Math.max(... domain, 0)]
: domain;
return this.padDomain(zeroDomain, props, axis);
>>>>>>>
const min = Collection.containsDates(domain) ?
Helpers.retainDate(Math.min(...domain, 0)) :
Math.min(...domain, 0);
const max = Collection.containsDates(domain) ?
Helpers.retainDate(Math.max(...domain, 0)) :
Math.max(...domain, 0);
const zeroDomain = isDependent ? [min, max] : domain;
return this.padDomain(zeroDomain, props, axis);
<<<<<<<
const domainMin = Collection.containsDates(domain) ?
Helpers.retainDate(Math.min(...domain)) :
Math.min(...domain);
const domainMax = Collection.containsDates(domain) ?
Helpers.retainDate(Math.max(...domain)) :
Math.max(...domain);
=======
const domainMin = Math.min(...domain);
const domainMax = Math.max(...domain);
>>>>>>>
const domainMin = Collection.containsDates(domain) ?
Helpers.retainDate(Math.min(...domain)) :
Math.min(...domain);
const domainMax = Collection.containsDates(domain) ?
Helpers.retainDate(Math.max(...domain)) :
Math.max(...domain); |
<<<<<<<
import { sortBy, defaults } from "lodash";
=======
import { defaults, last } from "lodash";
>>>>>>>
import { defaults } from "lodash";
<<<<<<<
=======
const dataSegments = this.getDataSegments(dataset);
>>>>>>>
<<<<<<<
=======
},
getDataSegments(dataset) {
const segments = [];
let segmentStartIndex = 0;
let segmentIndex = 0;
for (let index = 0, len = dataset.length; index < len; index++) {
const datum = dataset[index];
if (datum._y === null || typeof datum._y === "undefined") {
segments[segmentIndex] = dataset.slice(segmentStartIndex, index);
segmentIndex++;
segmentStartIndex = index + 1;
}
}
segments[segmentIndex] = dataset.slice(segmentStartIndex, dataset.length);
return segments.filter((segment) => {
return Array.isArray(segment) && segment.length > 0;
});
>>>>>>> |
<<<<<<<
"sign_in_with_ledger":"LEDGER",
=======
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ",
>>>>>>>
"sign_in_with_ledger":"LEDGER",
"TRC20_under_maintenance":"TRC20 under maintenance",
"transaction_fewer_than_100000":"1. When there are fewer than 100,000 (including 100,000) transaction data entries, all the data will be displayed.",
"transaction_more_than_100000":"2. When there are more than 100,000 transaction data entries, data of the latest 7 days will be displayed. ", |
<<<<<<<
const axisLabelProps = this.getAxisLabelProps(props, calculatedValues);
const parentProps = {style: style.parent, ticks, scale, width, height};
=======
const axisLabelProps = this.getAxisLabelProps(props, calculatedValues, globalTransform);
>>>>>>>
const parentProps = {style: style.parent, ticks, scale, width, height};
const axisLabelProps = this.getAxisLabelProps(props, calculatedValues, globalTransform); |
<<<<<<<
const container = modifiedProps.standalone && this.getContainer(modifiedProps, calculatedProps);
let newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
if (this.props.modifyChildren) {
newChildren = this.props.modifyChildren(newChildren, modifiedProps);
}
if (modifiedProps.events) {
=======
const newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
const group = this.renderGroup(newChildren, calculatedProps.style.parent);
const container = standalone ? this.getContainer(modifiedProps, calculatedProps) : group;
if (events) {
>>>>>>>
let newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
if (this.props.modifyChildren) {
newChildren = this.props.modifyChildren(newChildren, modifiedProps);
}
const group = this.renderGroup(newChildren, calculatedProps.style.parent);
const container = standalone ? this.getContainer(modifiedProps, calculatedProps) : group;
if (events) { |
<<<<<<<
this.baseProps = LineHelpers.getBaseProps(this.props,
defaultStyles, defaultWidthHeight);
=======
this.setupEvents(this.props);
>>>>>>>
this.setupEvents(this.props);
<<<<<<<
this.baseProps = LineHelpers.getBaseProps(newProps,
defaultStyles, defaultWidthHeight);
=======
this.setupEvents(newProps);
}
setupEvents(props) {
const { sharedEvents } = props;
this.baseProps = LineHelpers.getBaseProps(props, defaultStyles);
this.getSharedEventState = sharedEvents && isFunction(sharedEvents.getEventState) ?
sharedEvents.getEventState : () => undefined;
>>>>>>>
this.setupEvents(newProps);
}
setupEvents(props) {
const { sharedEvents } = props;
this.baseProps = LineHelpers.getBaseProps(props, defaultStyles, defaultWidthHeight);
this.getSharedEventState = sharedEvents && isFunction(sharedEvents.getEventState) ?
sharedEvents.getEventState : () => undefined;
<<<<<<<
this.props = Object.assign({}, this.props, Size.getWidthHeight(this.props,
defaultWidthHeight));
const { animate, style, standalone, width, height, containerComponent } = this.props;
=======
const { animate, style, standalone } = this.props;
>>>>>>>
this.props = Object.assign({}, this.props, Size.getWidthHeight(this.props,
defaultWidthHeight));
const { animate, style, standalone } = this.props; |
<<<<<<<
padding: PropTypes.oneOfType([
PropTypes.number,
PropTypes.shape({
top: PropTypes.number,
bottom: PropTypes.number,
left: PropTypes.number,
right: PropTypes.number
})
])
=======
padding: PropTypes.shape({
top: PropTypes.number,
bottom: PropTypes.number,
left: PropTypes.number,
right: PropTypes.number
}),
/**
* The barWidth props specifies the barWidth of the bars this should be given when the
* component is using in bar type charts
*/
barWidth: PropTypes.number,
/**
* The translateX props specifies the x-axis translation of the clipPath
*/
translateX: PropTypes.number
>>>>>>>
padding: PropTypes.oneOfType([
PropTypes.number,
PropTypes.shape({
top: PropTypes.number,
bottom: PropTypes.number,
left: PropTypes.number,
right: PropTypes.number
})
]),
/**
* The translateX props specifies the x-axis translation of the clipPath
*/
translateX: PropTypes.number
<<<<<<<
clipWidth,
clipHeight,
=======
translateX,
width,
height,
barWidth,
>>>>>>>
clipWidth,
clipHeight,
translateX, |
<<<<<<<
const container = standalone && this.getContainer(modifiedProps, calculatedProps);
let newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
if (this.props.modifyChildren) {
newChildren = this.props.modifyChildren(newChildren, modifiedProps);
}
if (modifiedProps.events) {
=======
const newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
const group = this.renderGroup(newChildren, style.parent);
const container = standalone ?
this.getContainer(modifiedProps, calculatedProps) : group;
if (events) {
>>>>>>>
let newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
if (this.props.modifyChildren) {
newChildren = this.props.modifyChildren(newChildren, modifiedProps);
}
const group = this.renderGroup(newChildren, style.parent);
const container = standalone ?
this.getContainer(modifiedProps, calculatedProps) : group;
if (events) { |
<<<<<<<
=======
import PolarDemo from "./components/victory-polar-chart-demo";
import { Router, Route, Link, hashHistory } from "react-router";
import { startCase } from "lodash";
const content = document.getElementById("content");
>>>>>>>
import PolarDemo from "./components/victory-polar-chart-demo";
<<<<<<<
<li><a href="#/chart">Victory Chart Demo</a></li>
<li><a href="#/axis">Victory Axis Demo</a></li>
<li><a href="#/area">Victory Area Demo</a></li>
<li><a href="#/bar">Victory Bar Demo</a></li>
<li><a href="#/line">Victory Line Demo</a></li>
<li><a href="#/scatter">Victory Scatter Demo</a></li>
<li><a href="#/errorbar">Victory Error Bar Demo</a></li>
<li><a href="#/candlestick">Victory Candlestick Demo</a></li>
<li><a href="#/events">Events Demo</a></li>
<li><a href="#/group">Group Demo</a></li>
<li><a href="#/voronoi">Victory Voronoi Demo</a></li>
<li><a href="#/tooltip">Victory Tooltip Demo</a></li>
<li><a href="#/zoom-container">Victory Zoom Container Demo</a></li>
<li><a href="#/voronoi-container">Victory Voronoi Container Demo</a></li>
<li><a href="#/brush-container">Victory Brush Container Demo</a></li>
<li><a href="#/animation">Animation Demo</a></li>
<li><a href="#/selection-container">Victory Selection Container Demo</a></li>
<li><a href="#/create-container">createContainer Demo</a></li>
=======
<li><Link to="/chart">Victory Chart Demo</Link></li>
<li><Link to="/axis">Victory Axis Demo</Link></li>
<li><Link to="/area">Victory Area Demo</Link></li>
<li><Link to="/bar">Victory Bar Demo</Link></li>
<li><Link to="/line">Victory Line Demo</Link></li>
<li><Link to="/scatter">Victory Scatter Demo</Link></li>
<li><Link to="/errorbar">Victory Error Bar Demo</Link></li>
<li><Link to="/candlestick">Victory Candlestick Demo</Link></li>
<li><Link to="/events">Events Demo</Link></li>
<li><Link to="/group">Group Demo</Link></li>
<li><Link to="/voronoi">Victory Voronoi Demo</Link></li>
<li><Link to="/tooltip">Victory Tooltip Demo</Link></li>
<li><Link to="/zoom-container">Victory Zoom Container Demo</Link></li>
<li><Link to="/voronoi-container">Victory Voronoi Container Demo</Link></li>
<li><Link to="/brush-container">Victory Brush Container Demo</Link></li>
<li><Link to="/animation">Animation Demo</Link></li>
<li><Link to="/selection-container">Victory Selection Container Demo</Link></li>
<li><Link to="/create-container">createContainer Demo</Link></li>
<li><Link to="/polar">Polar Demo</Link></li>
>>>>>>>
<li><a href="#/chart">Victory Chart Demo</a></li>
<li><a href="#/axis">Victory Axis Demo</a></li>
<li><a href="#/area">Victory Area Demo</a></li>
<li><a href="#/bar">Victory Bar Demo</a></li>
<li><a href="#/line">Victory Line Demo</a></li>
<li><a href="#/scatter">Victory Scatter Demo</a></li>
<li><a href="#/errorbar">Victory Error Bar Demo</a></li>
<li><a href="#/candlestick">Victory Candlestick Demo</a></li>
<li><a href="#/events">Events Demo</a></li>
<li><a href="#/group">Group Demo</a></li>
<li><a href="#/voronoi">Victory Voronoi Demo</a></li>
<li><a href="#/tooltip">Victory Tooltip Demo</a></li>
<li><a href="#/zoom-container">Victory Zoom Container Demo</a></li>
<li><a href="#/voronoi-container">Victory Voronoi Container Demo</a></li>
<li><a href="#/brush-container">Victory Brush Container Demo</a></li>
<li><a href="#/animation">Animation Demo</a></li>
<li><a href="#/selection-container">Victory Selection Container Demo</a></li>
<li><a href="#/create-container">createContainer Demo</a></li>
<li><a href="#/polar">Polar Demo</a></li>
<<<<<<<
ReactDOM.render(<App/>, document.getElementById("content"));
=======
ReactDOM.render((
<Router history={hashHistory}>
<Route path="/" component={App}>
<Route path="axis" component={AxisDemo}/>
<Route path="area" component={AreaDemo}/>
<Route path="bar" component={BarDemo}/>
<Route path="chart" component={ChartDemo}/>
<Route path="line" component={LineDemo}/>
<Route path="scatter" component={ScatterDemo}/>
<Route path="errorbar" component={ErrorBarDemo}/>
<Route path="candlestick" component={CandlestickDemo}/>
<Route path="events" component={EventsDemo}/>
<Route path="group" component={GroupDemo}/>
<Route path="voronoi" component={VoronoiDemo}/>
<Route path="tooltip" component={TooltipDemo}/>
<Route path="zoom-container" component={ZoomContainerDemo}/>
<Route path="voronoi-container" component={VoronoiContainerDemo}/>
<Route path="brush-container" component={BrushContainerDemo}/>
<Route path="animation" component={AnimationDemo}/>
<Route path="selection-container" component={SelectionDemo}/>
<Route path="create-container" component={CreateContainerDemo}/>
<Route path="polar" component={PolarDemo}/>
</Route>
</Router>
), content);
>>>>>>>
ReactDOM.render(<App/>, document.getElementById("content")); |
<<<<<<<
/* 136 */ if ((spaces.length === 0)) {
/* 137 */ log.help("You must create your first web site online.");
/* 138 */ log.help("Launching portal.");
/* 139 */ href = "https://windows.azure-test.net/";
/* 140 */ common.launchBrowser(href);
=======
/* 137 */ if ((spaces.length === 0)) {
/* 138 */ log.help("You must create your first web site online.");
/* 139 */ log.help("Launching portal.");
/* 140 */ href = "https://commonuxfx-bvt01.cloudapp.net/";
/* 141 */ common.launchBrowser(href);
>>>>>>>
/* 137 */ if ((spaces.length === 0)) {
/* 138 */ log.help("You must create your first web site online.");
/* 139 */ log.help("Launching portal.");
/* 140 */ href = "https://windows.azure-test.net/";
/* 141 */ common.launchBrowser(href);
<<<<<<<
/* 198 */ href = "https://windows.azure-test.net/";
/* 199 */ if (name) {
/* 200 */ href = (((href + "#Workspaces/WebsiteExtension/Website/") + name) + "/dashboard");
=======
/* 219 */ href = "https://commonuxfx-bvt01.cloudapp.net/";
/* 220 */ if (name) {
/* 221 */ href = (((href + "#Workspaces/WebsiteExtension/Website/") + name) + "/dashboard");
>>>>>>>
/* 219 */ href = "https://windows.azure-test.net/";
/* 220 */ if (name) {
/* 221 */ href = (((href + "#Workspaces/WebsiteExtension/Website/") + name) + "/dashboard");
<<<<<<<
/* 323 */ return lookupSiteName(context, __cb(_, __frame, 8, 12, function __$__7() {
/* 324 */ return lookupSiteWebSpace(context, __cb(_, __frame, 9, 12, function __$__7() {
/* 326 */ log.info("Starting site", context.site.name);
/* 335 */ return getChannel().path(context.subscription).path("services/webspaces").path(context.site.webspace).path("sites").path(context.site.name).header("Content-Type", "application/xml").PUT(function(req) {
/* 336 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 337 */ req.write("<HostNames>");
/* 338 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 339 */ req.write((context.site.name + ".antdf0.antares-test.windows-int.net"));
/* 340 */ req.write("</string>");
/* 341 */ req.write("</HostNames>");
/* 342 */ req.write("<Name>");
/* 343 */ req.write(context.site.name);
/* 344 */ req.write("</Name>");
/* 345 */ req.write("<State>");
/* 346 */ req.write("Running");
/* 347 */ req.write("</State>");
/* 348 */ req.write("</Site>");
/* 350 */ req.end();
=======
/* 344 */ return lookupSiteName(context, __cb(_, __frame, 8, 12, function __$__7() {
/* 345 */ return lookupSiteWebSpace(context, __cb(_, __frame, 9, 12, function __$__7() {
/* 347 */ log.info("Starting site", context.site.name);
/* 356 */ return getChannel().path(context.subscription).path("services/webspaces").path(context.site.webspace).path("sites").path(context.site.name).header("Content-Type", "application/xml").PUT(function(req) {
/* 357 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 358 */ req.write("<HostNames>");
/* 359 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 360 */ req.write((context.site.name + ".antdir0.antares-test.windows-int.net"));
/* 361 */ req.write("</string>");
/* 362 */ req.write("</HostNames>");
/* 363 */ req.write("<Name>");
/* 364 */ req.write(context.site.name);
/* 365 */ req.write("</Name>");
/* 366 */ req.write("<State>");
/* 367 */ req.write("Running");
/* 368 */ req.write("</State>");
/* 369 */ req.write("</Site>");
/* 371 */ req.end();
>>>>>>>
/* 344 */ return lookupSiteName(context, __cb(_, __frame, 8, 12, function __$__7() {
/* 345 */ return lookupSiteWebSpace(context, __cb(_, __frame, 9, 12, function __$__7() {
/* 347 */ log.info("Starting site", context.site.name);
/* 356 */ return getChannel().path(context.subscription).path("services/webspaces").path(context.site.webspace).path("sites").path(context.site.name).header("Content-Type", "application/xml").PUT(function(req) {
/* 357 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 358 */ req.write("<HostNames>");
/* 359 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 360 */ req.write((context.site.name + ".antdf0.antares-test.windows-int.net"));
/* 361 */ req.write("</string>");
/* 362 */ req.write("</HostNames>");
/* 363 */ req.write("<Name>");
/* 364 */ req.write(context.site.name);
/* 365 */ req.write("</Name>");
/* 366 */ req.write("<State>");
/* 367 */ req.write("Running");
/* 368 */ req.write("</State>");
/* 369 */ req.write("</Site>");
/* 371 */ req.end();
<<<<<<<
/* 367 */ return lookupSiteName(context, __cb(_, __frame, 8, 12, function __$__8() {
/* 368 */ return lookupSiteWebSpace(context, __cb(_, __frame, 9, 12, function __$__8() {
/* 370 */ log.info("Stopping site", context.site.name);
/* 379 */ return getChannel().path(context.subscription).path("services/webspaces").path(context.site.webspace).path("sites").path(context.site.name).header("Content-Type", "application/xml").PUT(function(req) {
/* 380 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 381 */ req.write("<HostNames>");
/* 382 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 383 */ req.write((context.site.name + ".antdf0.antares-test.windows-int.net"));
/* 384 */ req.write("</string>");
/* 385 */ req.write("</HostNames>");
/* 386 */ req.write("<Name>");
/* 387 */ req.write(context.site.name);
/* 388 */ req.write("</Name>");
/* 389 */ req.write("<State>");
/* 390 */ req.write("Stopped");
/* 391 */ req.write("</State>");
/* 392 */ req.write("</Site>");
/* 394 */ req.end();
=======
/* 388 */ return lookupSiteName(context, __cb(_, __frame, 8, 12, function __$__8() {
/* 389 */ return lookupSiteWebSpace(context, __cb(_, __frame, 9, 12, function __$__8() {
/* 391 */ log.info("Stopping site", context.site.name);
/* 400 */ return getChannel().path(context.subscription).path("services/webspaces").path(context.site.webspace).path("sites").path(context.site.name).header("Content-Type", "application/xml").PUT(function(req) {
/* 401 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 402 */ req.write("<HostNames>");
/* 403 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 404 */ req.write((context.site.name + ".antdir0.antares-test.windows-int.net"));
/* 405 */ req.write("</string>");
/* 406 */ req.write("</HostNames>");
/* 407 */ req.write("<Name>");
/* 408 */ req.write(context.site.name);
/* 409 */ req.write("</Name>");
/* 410 */ req.write("<State>");
/* 411 */ req.write("Stopped");
/* 412 */ req.write("</State>");
/* 413 */ req.write("</Site>");
/* 415 */ req.end();
>>>>>>>
/* 388 */ return lookupSiteName(context, __cb(_, __frame, 8, 12, function __$__8() {
/* 389 */ return lookupSiteWebSpace(context, __cb(_, __frame, 9, 12, function __$__8() {
/* 391 */ log.info("Stopping site", context.site.name);
/* 400 */ return getChannel().path(context.subscription).path("services/webspaces").path(context.site.webspace).path("sites").path(context.site.name).header("Content-Type", "application/xml").PUT(function(req) {
/* 401 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 402 */ req.write("<HostNames>");
/* 403 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 404 */ req.write((context.site.name + ".antdf0.antares-test.windows-int.net"));
/* 405 */ req.write("</string>");
/* 406 */ req.write("</HostNames>");
/* 407 */ req.write("<Name>");
/* 408 */ req.write(context.site.name);
/* 409 */ req.write("</Name>");
/* 410 */ req.write("<State>");
/* 411 */ req.write("Stopped");
/* 412 */ req.write("</State>");
/* 413 */ req.write("</Site>");
/* 415 */ req.end();
<<<<<<<
/* 649 */ var writers = {
/* 650 */ Site: {
/* 651 */ xml: function(site) {
/* 652 */ return function(req) {
/* 653 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 654 */ req.write("<HostNames>");
/* 655 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 656 */ req.write((site.name + ".antdf0.antares-test.windows-int.net"));
/* 657 */ req.write("</string>");
/* 659 */ if (site.hostname) {
/* 660 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 661 */ req.write(site.hostname);
/* 662 */ req.write("</string>");
=======
/* 670 */ var writers = {
/* 671 */ Site: {
/* 672 */ xml: function(site) {
/* 673 */ return function(req) {
/* 674 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 675 */ req.write("<HostNames>");
/* 676 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 677 */ req.write((site.name + ".antdir0.antares-test.windows-int.net"));
/* 678 */ req.write("</string>");
/* 680 */ if (site.hostname) {
/* 681 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 682 */ req.write(site.hostname);
/* 683 */ req.write("</string>");
>>>>>>>
/* 670 */ var writers = {
/* 671 */ Site: {
/* 672 */ xml: function(site) {
/* 673 */ return function(req) {
/* 674 */ req.write("<Site xmlns=\"http://schemas.microsoft.com/windowsazure\">");
/* 675 */ req.write("<HostNames>");
/* 676 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 677 */ req.write((site.name + ".antdf0.antares-test.windows-int.net"));
/* 678 */ req.write("</string>");
/* 680 */ if (site.hostname) {
/* 681 */ req.write("<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">");
/* 682 */ req.write(site.hostname);
/* 683 */ req.write("</string>"); |
<<<<<<<
},
'Microsoft.Azure.Policy.Specification.dll': {
clientType: 'Microsoft.Azure.Policy.PolicyManagementClient',
destDir: 'lib/services/policy/lib',
output: 'policyManagementClient.js'
},
'Microsoft.Azure.Graph.RBAC.Specification.dll': {
clientType: 'Microsoft.Azure.Graph.RBAC.GraphRbacManagementClient',
destDir: 'lib/services/graph.rbac/lib',
output: 'graphRbacManagementClient.js'
=======
},
'Microsoft.Azure.Management.WebSites.Specification.dll': {
clientType: 'Microsoft.Azure.Management.WebSites.WebSiteManagementClient',
destDir: 'lib/services/webSiteManagement2/lib',
output: 'webSiteManagementClient.js'
>>>>>>>
},
'Microsoft.Azure.Policy.Specification.dll': {
clientType: 'Microsoft.Azure.Policy.PolicyManagementClient',
destDir: 'lib/services/policy/lib',
output: 'policyManagementClient.js'
},
'Microsoft.Azure.Graph.RBAC.Specification.dll': {
clientType: 'Microsoft.Azure.Graph.RBAC.GraphRbacManagementClient',
destDir: 'lib/services/graph.rbac/lib',
output: 'graphRbacManagementClient.js'
},
'Microsoft.Azure.Management.WebSites.Specification.dll': {
clientType: 'Microsoft.Azure.Management.WebSites.WebSiteManagementClient',
destDir: 'lib/services/webSiteManagement2/lib',
output: 'webSiteManagementClient.js'
<<<<<<<
"lib/services/webSiteManagement/lib/webSiteExtensionsClient.js",
"lib/services/policy/lib/policyManagementClient.js",
"lib/services/graph.rbac/lib/graphRbacManagementClient.js"
=======
"lib/services/webSiteManagement/lib/webSiteExtensionsClient.js",
"lib/services/webSiteManagement2/lib/webSiteManagementClient.js"
>>>>>>>
"lib/services/webSiteManagement/lib/webSiteExtensionsClient.js",
"lib/services/policy/lib/policyManagementClient.js",
"lib/services/graph.rbac/lib/graphRbacManagementClient.js",
"lib/services/webSiteManagement2/lib/webSiteManagementClient.js" |
<<<<<<<
.usage('<name> <value>')
=======
.whiteListPowershell()
>>>>>>>
.usage('<name> <value>')
.whiteListPowershell() |
<<<<<<<
var ProxyFilter = require('../core/filters/proxyfilter');
var Constants = require('../../util/constants');
var ServiceClientConstants = require('./serviceclientconstants');
=======
var SigningFilter = require('../core/filters/signingfilter');
>>>>>>>
var ProxyFilter = require('../core/filters/proxyfilter');
var SigningFilter = require('../core/filters/signingfilter');
var Constants = require('../../util/constants');
var ServiceClientConstants = require('./serviceclientconstants'); |
<<<<<<<
data_resource_table_title: "الحد الأقصى لاستهلاك الطاقة",
data_resource_table_rank: "المرتبة ",
data_resource_table_account: "الحسابات",
data_resource_table_freezingTRX_energy: "إستهلاك الطاقة لتجميد TRX",
data_resource_table_burningTRX_energy: "إستهلاك الطاقة لحرق TRX",
data_resource_table_energy_consumed: "إجمالي الطاقة المستهلكة",
data_resource_table_percentage: "النسبة المئوية",
data_resource_table_percentage_tips: "الطاقة التي يستهلكها المستخدم الحالي / الطاقة التي يستهلكها جميع المستخدمين عبر الشبكة",
data_resource_table_bandwidth_title: "الحد الأقصى لاستهلاك عرض النطاق الترددي",
data_resource_table_total: "المجموع",
}
=======
data_title: "أفضل البيانات",
data_overview: "نظرة عامة",
data_account: "الحسابات",
data_token: "الرموز",
data_contract: "العقود",
data_recourse: "المصادر",
data_time1: "ساعة واحدة",
data_time2: "يوم واحد",
data_time3: "أسبوع واحد",
data_account_top: "最佳账户",
data_account_send_Trx: "أفضل الحسابات - إجمالي TRX المرسلة",
data_account_send_Trx_items: "أفضل الحسابات - عدد مرات TRX المرسلة",
data_account_receive_Trx: "أفضل الحسابات - إجمالي TRX المستلمة",
data_account_receive_Trx_items: "أفضل الحسابات - عدد مرات TRX المستلمة",
data_account_freeze: "أفضل الحسابات - كمية TRX المجمدة",
data_account_vote: "أفضل الحسابات - عدد الاصوات",
data_range: "المرتبة",
data_number: "كمية (TRX)",
data_per: "النسبة المئوية",
data_total: "المجموع",
data_items: "عدد المرات",
data_unit_bi: "笔",
data_piao: "الأصوات",
data_token_top: "最佳通证",
data_token_holders: "أفضل الرموز - الحسابات الحاملة للرمز",
data_token_holder: "عدد الحاملين للرموز",
data_token_transcation_account: "عدد حسابات التداول",
data_token_transcation_accounts: "أفضل الرموز - عدد حسابات التداول",
data_token_transcation_items: "交易笔数",
data_token_transcation_items_total: "أفضل الرموز - إجمالي عدد المعاملات",
data_token_transcation_numbers: "أفضل الرموز - مجموع المعاملات",
data_token_circle_per: "على أساس شهري",
data_contract_top: "最佳合约",
data_contract_trx_number: "أفضل العقود - إجمالي رصيد TRX",
data_contract_accounts: "أفضل العقود - عدد دعوات الحسابات",
data_contract_numbers: "مجموع رصيد (TRX)",
data_contract_times: "أفضل العقود - عدد الدعوات",
data_real_time: "الوقت الحقيقي",
data_resource_table_title: "الحد الأقصى لاستهلاك الطاقة",
data_resource_table_rank: "排序",
data_resource_table_account: "账户",
data_resource_table_freezingTRX_energy: "إستهلاك الطاقة لتجميد TRX",
data_resource_table_burningTRX_energy: "إستهلاك الطاقة لحرق TRX"
};
>>>>>>>
data_title: "أفضل البيانات",
data_overview: "نظرة عامة",
data_account: "الحسابات",
data_token: "الرموز",
data_contract: "العقود",
data_recourse: "المصادر",
data_time1: "ساعة واحدة",
data_time2: "يوم واحد",
data_time3: "أسبوع واحد",
data_account_top: "最佳账户",
data_account_send_Trx: "أفضل الحسابات - إجمالي TRX المرسلة",
data_account_send_Trx_items: "أفضل الحسابات - عدد مرات TRX المرسلة",
data_account_receive_Trx: "أفضل الحسابات - إجمالي TRX المستلمة",
data_account_receive_Trx_items: "أفضل الحسابات - عدد مرات TRX المستلمة",
data_account_freeze: "أفضل الحسابات - كمية TRX المجمدة",
data_account_vote: "أفضل الحسابات - عدد الاصوات",
data_range: "المرتبة",
data_number: "كمية (TRX)",
data_per: "النسبة المئوية",
data_total: "المجموع",
data_items: "عدد المرات",
data_unit_bi: "笔",
data_piao: "الأصوات",
data_token_top: "最佳通证",
data_token_holders: "أفضل الرموز - الحسابات الحاملة للرمز",
data_token_holder: "عدد الحاملين للرموز",
data_token_transcation_account: "عدد حسابات التداول",
data_token_transcation_accounts: "أفضل الرموز - عدد حسابات التداول",
data_token_transcation_items: "交易笔数",
data_token_transcation_items_total: "أفضل الرموز - إجمالي عدد المعاملات",
data_token_transcation_numbers: "أفضل الرموز - مجموع المعاملات",
data_token_circle_per: "على أساس شهري",
data_contract_top: "最佳合约",
data_contract_trx_number: "أفضل العقود - إجمالي رصيد TRX",
data_contract_accounts: "أفضل العقود - عدد دعوات الحسابات",
data_contract_numbers: "مجموع رصيد (TRX)",
data_contract_times: "أفضل العقود - عدد الدعوات",
data_real_time: "الوقت الحقيقي",
data_resource_table_title: "الحد الأقصى لاستهلاك الطاقة",
data_resource_table_rank: "المرتبة ",
data_resource_table_account: "الحسابات",
data_resource_table_freezingTRX_energy: "إستهلاك الطاقة لتجميد TRX",
data_resource_table_burningTRX_energy: "إستهلاك الطاقة لحرق TRX",
data_resource_table_energy_consumed: "إجمالي الطاقة المستهلكة",
data_resource_table_percentage: "النسبة المئوية",
data_resource_table_percentage_tips: "الطاقة التي يستهلكها المستخدم الحالي / الطاقة التي يستهلكها جميع المستخدمين عبر الشبكة",
data_resource_table_bandwidth_title: "الحد الأقصى لاستهلاك عرض النطاق الترددي",
data_resource_table_total: "المجموع",
}; |
<<<<<<<
// 03-09 tron account transfers transactions internal-transactions
address_account_table_filter_all: "полный",
address_account_table_filter_transfers: "Перевод ",
address_account_table_filter_freeze: "Заморозить TRX",
address_account_table_filter_unfreeze: "Разморозить TRX",
address_account_table_filter_trigger_smartContracts: "Запустить Смарт Контракт",
address_account_table_filter_vote: "Голосовать",
address_account_table_filter_other: "other",
address_account_table_filter_token_tips: "The token is not included in TRONSCAN",
=======
// 2020-03-03
account_resource_last: "Последний раунд",
account_resource_realTime: "Текущий раунд",
account_resource_remain: "剩余",
account_resource_last_tip: "Подсчет голосов и рейтинг последнего раунда",
account_resource_realTime_tip: "Подсчет голосов и рейтинг текущего раунда",
account_representative_block_ratio: "Эффективность производства блоков",
account_representative_block_ratio_tip: "Изготовленные блоки / Производимые блоки",
account_representative_block_prize: "Накопительный блок вознаграждений",
account_representative_vote_prize: "Накопительные вознаграждения избирателей",
account_representative_split_ratio: "Коэффициент распределения вознаграждений",
account_representative_split_ratio_tip:
"Всего наград состоит из наград избирателей и наград SR",
account_representative_voter: "Награды избирателям",
account_representative_owner: "SR награды",
account_representative_block_table_res: "资源消耗",
account_representative_block_table_prize: "出块收益",
account_representative_block_desc:
"{trx} TRX заработано на {block} произведенных блоках",
account_representative_voters_per_tip: "Голоса, поданные избирателем / всего голосов",
account_representative_transfer_tip: "Количество переводов токенов TRX/TRC10/TRC20, связанных с этим аккаунтом",
account_representative_unit:'{number} голосов от {votes} избирателей',
account_piechart_title:'Распределение активов',
>>>>>>>
// 2020-03-03
account_resource_last: "Последний раунд",
account_resource_realTime: "Текущий раунд",
account_resource_remain: "剩余",
account_resource_last_tip: "Подсчет голосов и рейтинг последнего раунда",
account_resource_realTime_tip: "Подсчет голосов и рейтинг текущего раунда",
account_representative_block_ratio: "Эффективность производства блоков",
account_representative_block_ratio_tip: "Изготовленные блоки / Производимые блоки",
account_representative_block_prize: "Накопительный блок вознаграждений",
account_representative_vote_prize: "Накопительные вознаграждения избирателей",
account_representative_split_ratio: "Коэффициент распределения вознаграждений",
account_representative_split_ratio_tip:
"Всего наград состоит из наград избирателей и наград SR",
account_representative_voter: "Награды избирателям",
account_representative_owner: "SR награды",
account_representative_block_table_res: "资源消耗",
account_representative_block_table_prize: "出块收益",
account_representative_block_desc:
"{trx} TRX заработано на {block} произведенных блоках",
account_representative_voters_per_tip: "Голоса, поданные избирателем / всего голосов",
account_representative_transfer_tip: "Количество переводов токенов TRX/TRC10/TRC20, связанных с этим аккаунтом",
account_representative_unit:'{number} голосов от {votes} избирателей',
account_piechart_title:'Распределение активов',
// 03-09 tron account transfers transactions internal-transactions
address_account_table_filter_all: "полный",
address_account_table_filter_transfers: "Перевод ",
address_account_table_filter_freeze: "Заморозить TRX",
address_account_table_filter_unfreeze: "Разморозить TRX",
address_account_table_filter_trigger_smartContracts: "Запустить Смарт Контракт",
address_account_table_filter_vote: "Голосовать",
address_account_table_filter_other: "other",
address_account_table_filter_token_tips: "The token is not included in TRONSCAN", |
<<<<<<<
vm.command('create <dns-prefix> <image> <user-name> [password]')
.whiteListPowershell()
.usage('<dns-prefix> <image> <userName> [password]')
=======
vm.command('create <dns-name> <image> <user-name> [password]')
.usage('<dns-name> <image> <userName> [password]')
>>>>>>>
vm.command('create <dns-name> <image> <user-name> [password]')
.whiteListPowershell()
.usage('<dns-name> <image> <userName> [password]')
<<<<<<<
vm.command('create-from <dns-prefix> <role-file>')
.whiteListPowershell()
.usage('<dns-prefix> <role-file>')
=======
vm.command('create-from <dns-name> <role-file>')
.usage('<dns-name> <role-file>')
>>>>>>>
vm.command('create-from <dns-name> <role-file>')
.whiteListPowershell()
.usage('<dns-name> <role-file>')
<<<<<<<
datadisk.command('attach <vm-name> <disk-image-name>')
.whiteListPowershell()
=======
disk.command('delete <name>')
.description('Delete Azure disk image from personal repository')
.option('-i, --subscription <id>', 'use the subscription id')
.option('-b, --blob-delete', 'delete underlying blob from storage')
.execute(image.imageDelete(image.DISK, cli));
disk.command('create <name> [source-path]')
.usage('<name> [source-path]')
.description('Upload and register Azure disk image')
.option('-u, --blob-url <url>', 'target image blob url')
.option('-l, --location <name>', 'location of the data center')
.option('-a, --affinity-group <name>', 'affinity group')
.option('-i, --subscription <id>', 'use the subscription id')
.option('-o, --os [type]', 'operating system if any [linux|windows|none]')
.option('-p, --parallel <number>', 'maximum number of parallel uploads [128]', 128)
.option('-m, --md5-skip', 'skip MD5 hash computation')
.option('-f, --force-overwrite', 'force overwrite of prior uploads')
.option('-e, --label <about>', 'image label')
.option('-d, --description <about>', 'image description')
.option('-b, --base-vhd <blob>', 'base vhd blob url')
.execute(image.create(image.DISK, cli));
disk.command('attach <vm-name> <disk-image-name>')
>>>>>>>
disk.command('delete <name>')
.description('Delete Azure disk image from personal repository')
.option('-i, --subscription <id>', 'use the subscription id')
.option('-b, --blob-delete', 'delete underlying blob from storage')
.execute(image.imageDelete(image.DISK, cli));
disk.command('create <name> [source-path]')
.usage('<name> [source-path]')
.description('Upload and register Azure disk image')
.option('-u, --blob-url <url>', 'target image blob url')
.option('-l, --location <name>', 'location of the data center')
.option('-a, --affinity-group <name>', 'affinity group')
.option('-i, --subscription <id>', 'use the subscription id')
.option('-o, --os [type]', 'operating system if any [linux|windows|none]')
.option('-p, --parallel <number>', 'maximum number of parallel uploads [128]', 128)
.option('-m, --md5-skip', 'skip MD5 hash computation')
.option('-f, --force-overwrite', 'force overwrite of prior uploads')
.option('-e, --label <about>', 'image label')
.option('-d, --description <about>', 'image description')
.option('-b, --base-vhd <blob>', 'base vhd blob url')
.execute(image.create(image.DISK, cli));
disk.command('attach <vm-name> <disk-image-name>')
.whiteListPowershell()
<<<<<<<
datadisk.command('attach-new <vm-name> <size-in-gb> [blob-url]')
.whiteListPowershell()
=======
disk.command('attach-new <vm-name> <size-in-gb> [blob-url]')
>>>>>>>
disk.command('attach-new <vm-name> <size-in-gb> [blob-url]')
.whiteListPowershell()
<<<<<<<
datadisk.command('detach <vm-name> <lun>')
.whiteListPowershell()
=======
disk.command('detach <vm-name> <lun>')
>>>>>>>
disk.command('detach <vm-name> <lun>')
.whiteListPowershell()
<<<<<<<
datadisk.command('list <vm-name>')
.whiteListPowershell()
.usage('<vm-name>')
.description('Lists data-disks attached to an Azure VM')
.option('-i, --subscription <id>', 'use the subscription id')
.option('-d, --dns-prefix <name>', 'only show VMs for this DNS prefix')
.execute(function(name, options, callback) {
listDataDisks({
subscription: options.subscription,
name: name.toLowerCase(),
dnsPrefix: options.dnsPrefix
}, callback);
});
=======
>>>>>>> |
<<<<<<<
* @property {boolean} validateEDITypes The value indicating whether to
* Whether to validate EDI types.
* @property {boolean} validateXSDTypes The value indicating whether to
* Whether to validate XSD types.
* @property {boolean} allowLeadingAndTrailingSpacesAndZeroes The value
=======
* @property {boolean} validateEdiTypes The value indicating whether to
* Whether to validate EDI types.
* @property {boolean} validateXsdTypes The value indicating whether to
* Whether to validate XSD types.
* @property {boolean} allowLeadingAndTrailingSpacesAndZeroes The value
>>>>>>>
* @property {boolean} validateEdiTypes The value indicating whether to
* Whether to validate EDI types.
* @property {boolean} validateXsdTypes The value indicating whether to |
<<<<<<<
ALL_PROXY: 'ALL_PROXY',
EMULATED: 'EMULATED',
AZURE_CERTFILE: 'AZURE_CERTFILE',
AZURE_KEYFILE: 'AZURE_KEYFILE'
=======
EMULATED: 'EMULATED'
>>>>>>>
EMULATED: 'EMULATED',
AZURE_CERTFILE: 'AZURE_CERTFILE',
AZURE_KEYFILE: 'AZURE_KEYFILE'
<<<<<<<
* Returns the environment values ALL_PROXY, HTTPS_PROXY and HTTP_PROXY
=======
* Loads the fields "useProxy" and respective protocol, port and url
* from the environment values HTTPS_PROXY and HTTP_PROXY
>>>>>>>
* Loads the fields "useProxy" and respective protocol, port and url
* from the environment values HTTPS_PROXY and HTTP_PROXY
<<<<<<<
if (process.env[ServiceClient.EnvironmentVariables.ALL_PROXY]) {
proxyUrl = process.env[ServiceClient.EnvironmentVariables.ALL_PROXY];
} else if (process.env[ServiceClient.EnvironmentVariables.ALL_PROXY.toLowerCase()]) {
proxyUrl = process.env[ServiceClient.EnvironmentVariables.ALL_PROXY.toLowerCase()];
} else if (process.env[ServiceClient.EnvironmentVariables.HTTPS_PROXY]) {
=======
if (process.env[ServiceClient.EnvironmentVariables.HTTPS_PROXY]) {
>>>>>>>
if (process.env[ServiceClient.EnvironmentVariables.HTTPS_PROXY]) { |
<<<<<<<
/*
##################################################################################
# #
# notice 2018-12-10 #
# #
##################################################################################
*/
"OthersArticle":"Articles in this group",
=======
"TRC20_exchange_online":"TRC20 exchange is online now",
"Trade_on_TRXMarket":"Trade on TRXMarket",
>>>>>>>
"TRC20_exchange_online":"TRC20 exchange is online now",
"Trade_on_TRXMarket":"Trade on TRXMarket",
/*
##################################################################################
# #
# notice 2018-12-10 #
# #
##################################################################################
*/
"OthersArticle":"Articles in this group", |
<<<<<<<
aria-label="Add a new to-do item"
placeholder="Add a to-do..."
=======
id="new-todo"
>>>>>>>
aria-label="Add a new to-do item"
placeholder="Add a to-do..."
id="new-todo" |
<<<<<<<
handleInput: function() {\n\
=======
handleChange: React.autoBind(function() {\n\
>>>>>>>
handleChange: function() {\n\ |
<<<<<<<
const queryRuntimeCredentials = new msRest.ApiKeyCredentials({ inHeader: { 'Ocp-Apim-Subscription-Key': primaryQueryRuntimeKey } });
const runtimeClient = new qnamaker_runtime.QnAMakerRuntimeClient(queryRuntimeCredentials, queryingURL);
=======
const queryRutimeCredentials = new msRest.ApiKeyCredentials({ inHeader: { 'Authorization': 'EndpointKey ' + primaryQueryRuntimeKey } });
const runtimeClient = new qnamaker_runtime.QnAMakerRuntimeClient(queryRutimeCredentials, runtime_endpoint);
>>>>>>>
const queryRuntimeCredentials = new msRest.ApiKeyCredentials({ inHeader: { 'Authorization': 'EndpointKey ' + primaryQueryRuntimeKey } });
const runtimeClient = new qnamaker_runtime.QnAMakerRuntimeClient(queryRuntimeCredentials, runtime_endpoint); |
<<<<<<<
url: ajaxurl,
type: 'post',
data: {
action: 'stream_notification_endpoint',
q : val,
single: 1,
type : type,
args : $(this).attr('data-args')
},
dataType: 'json',
success: function(j){
$this.select2( 'data', j.data );
}
});
=======
url: ajaxurl,
type: 'post',
data: {
action: 'stream_notification_endpoint',
q : val,
single: 1,
type : type,
args: $(this).attr("data-args")
},
dataType: "json",
success: function(j){
$this.select2( 'data', j.data );
}
})
>>>>>>>
url: ajaxurl,
type: 'post',
data: {
action: 'stream_notification_endpoint',
q : val,
single: 1,
type : type,
args : $(this).attr('data-args')
},
dataType: 'json',
success: function(j){
$this.select2( 'data', j.data );
}
});
<<<<<<<
divTriggers
// Add new rule
.on( 'click.sn', btns.add_trigger, function(e) {
e.preventDefault();
var $this = $(this),
index = 0,
lastItem = null,
group = divTriggers.find('.group[rel=' + $this.data('group') + ']' ),
i = null,
type = null,
types = {},
connectors = {}
;
=======
add_trigger = function (group_index) {
var index = 0,
lastItem = null,
group = divTriggers.find('.group[rel=' + group_index + ']' );
>>>>>>>
add_trigger = function (group_index) {
var index = 0,
lastItem = null,
group = divTriggers.find('.group[rel=' + group_index + ']' ),
i = null,
type = null,
types = {},
connectors = {}
;
<<<<<<<
{ index: index, group: $this.data('group') },
stream_notifications,
{ types: $.extend( {}, stream_notifications.types, types ) }
=======
{ index: index, group: group_index },
stream_notifications
>>>>>>>
{ index: index, group: group_index },
stream_notifications,
{ types: $.extend( {}, stream_notifications.types, types ) }
<<<<<<<
// Do not submit if no triggers exist
$('#rule-form').submit(function(){
=======
$('#rule-form').submit(function(e){
// Do not submit if no triggers exist
>>>>>>>
$('#rule-form').submit(function(){
// Do not submit if no triggers exist
<<<<<<<
$('body,html').scrollTop(0);
$('.wrap > h2')
.after('<div class="updated error fade" style="display:none"><p>'+stream_notifications.i18n.empty_triggers+'</p></div>')
.next('.updated')
.slideDown('fast')
.delay(3000)
.slideUp('slow');
=======
display_error('empty_triggers');
return false;
}
// Do not submit if no working triggers exist
if ( $('.trigger-type:first').select2('data') === null ) {
display_error('invalid_first_trigger');
>>>>>>>
display_error('empty_triggers');
return false;
}
// Do not submit if no working triggers exist
if ( $('.trigger-type:first').select2('data') === null ) {
display_error('invalid_first_trigger');
<<<<<<<
// Data tags accordion
$('#data-tag-glossary').attr('data-theme', 'none').attr('data-role', 'none').accordion({
header: 'header',
collapsible: true,
heightStyle: 'content',
active: false,
icons: { 'header': '', 'activeHeader': 'activeHeader' }
});
=======
>>>>>>>
<<<<<<<
} );
});
=======
} )
});
// Add empty trigger if no triggers are visible
if ( $( '.trigger' ).length === 0 ) {
add_trigger( 0 );
}
>>>>>>>
} );
});
// Add empty trigger if no triggers are visible
if ( $( '.trigger' ).length === 0 ) {
add_trigger( 0 );
} |
<<<<<<<
/*
##################################################################################
# #
# 191230 page index optimization #
# #
##################################################################################
*/
"index_page_menu_more_dev_resources":"Ресурсы развития",
"index_page_search_placeholder":"Поиск по Адресу/Хэшу Транзакции/Токену/Блоку",
"index_page_footer_team_info":"Информация о команде",
"index_page_footer_feedback":"Обратная связь",
"index_page_footer_expand":"Расширить",
"index_page_footer_donate_address":"Адрес принадлежит TRON. Ваш донат помогает построить лучшую экосистему TRON.",
"index_page_confirmed_blocks":"Подтвержденные блоки",
"index_page_confirmed_blocks_tips":"Блоки подтверждены более чем 19 SR",
"index_page_switch_tokens":"Поменять токены",
"index_page_tronscan_info":"TRONSCAN, лучший blockchain explorer Tron.",
"index_page_down_excel_tips":"Измените десятичные дроби вручную при открытии файла в Excel.",
=======
/*
##################################################################################
# #
# Charts 2019-12-30 #
# #
##################################################################################
*/
"account_details_contracts":"Contracts Published",
"account_details_contracts_no":"No contracts found",
>>>>>>>
/*
##################################################################################
# #
# 191230 page index optimization #
# #
##################################################################################
*/
"index_page_menu_more_dev_resources":"Ресурсы развития",
"index_page_search_placeholder":"Поиск по Адресу/Хэшу Транзакции/Токену/Блоку",
"index_page_footer_team_info":"Информация о команде",
"index_page_footer_feedback":"Обратная связь",
"index_page_footer_expand":"Расширить",
"index_page_footer_donate_address":"Адрес принадлежит TRON. Ваш донат помогает построить лучшую экосистему TRON.",
"index_page_confirmed_blocks":"Подтвержденные блоки",
"index_page_confirmed_blocks_tips":"Блоки подтверждены более чем 19 SR",
"index_page_switch_tokens":"Поменять токены",
"index_page_tronscan_info":"TRONSCAN, лучший blockchain explorer Tron.",
"index_page_down_excel_tips":"Измените десятичные дроби вручную при открытии файла в Excel.",
/*
##################################################################################
# #
# Charts 2019-12-30 #
# #
##################################################################################
*/
"account_details_contracts":"Contracts Published",
"account_details_contracts_no":"No contracts found", |
<<<<<<<
export const VALIDATE_CONNECTION_CREDENTIALS =
NAME + '/VALIDATE_CONNECTION_CREDENTIALS'
export const USE_DB = NAME + '/USE_DB'
export const USING_DB = NAME + '/USING_DB'
=======
export const VERIFY_CREDENTIALS = NAME + '/VERIFY_CREDENTIALS'
>>>>>>>
export const VALIDATE_CONNECTION_CREDENTIALS =
NAME + '/VALIDATE_CONNECTION_CREDENTIALS'
export const USE_DB = NAME + '/USE_DB'
export const USING_DB = NAME + '/USING_DB'
<<<<<<<
export const validateConnectionCredentials = (action$, store) => {
return action$.ofType(VALIDATE_CONNECTION_CREDENTIALS).mergeMap(action => {
if (!action.$$responseChannel) return Rx.Observable.of(null)
return bolt
.directConnect(action, {
encrypted: getEncryptionMode(action),
connectionTimeout: getConnectionTimeout(store.getState())
})
.then(driver => {
driver.close()
return { type: action.$$responseChannel, success: true }
})
.catch(e => {
return {
type: action.$$responseChannel,
success: false,
error: e
}
})
})
}
=======
export const verifyConnectionCredentialsEpic = (action$, store) => {
return action$.ofType(VERIFY_CREDENTIALS).mergeMap(action => {
if (!action.$$responseChannel) return Rx.Observable.of(null)
return bolt
.directConnect(
action,
{ encrypted: getEncryptionMode(action) },
undefined
)
.then(driver => {
return { type: action.$$responseChannel, success: true }
})
.catch(e => {
return { type: action.$$responseChannel, success: false, error: e }
})
})
}
>>>>>>>
export const validateConnectionCredentials = (action$, store) => {
return action$.ofType(VALIDATE_CONNECTION_CREDENTIALS).mergeMap(action => {
if (!action.$$responseChannel) return Rx.Observable.of(null)
return bolt
.directConnect(action, {
action,
encrypted: getEncryptionMode(action),
connectionTimeout: getConnectionTimeout(store.getState())
})
.then(driver => {
driver.close()
return { type: action.$$responseChannel, success: true }
})
.catch(e => {
return {
type: action.$$responseChannel,
success: false,
error: e
}
})
})
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.