conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
? <primitive object={mesh}>
<mesh name={'cursor'} visible={false}>
=======
? <group>
<primitive object={mesh} />
<mesh name={'cursor'} visible={true/*false*/}>
>>>>>>>
? <group>
<primitive object={mesh} />
<mesh name={'cursor'} visible={false}> |
<<<<<<<
const translateTooltip = (elementName, traslationKey) => {
let element = document.querySelector(elementName)
if(!element) return
element.setAttribute("data-tooltip-title", i18n.t(`${traslationKey}.title`))
element.setAttribute("data-tooltip-description", i18n.t(`${traslationKey}.description`))
}
======... |
<<<<<<<
var EditorSidebarView = require('coreJS/editor/views/editorSidebarView');
var EditorMenuView = require('coreJS/editor/views/editorMenuView');
var EditorContentObjectsCollection = require('coreJS/editor/collections/editorContentObjectsCollection');
=======
var PageView = require('coreJS/editor/views/pa... |
<<<<<<<
const findParent = obj => {
while (obj) {
if (!obj.parent || obj.parent.type === 'Scene') {
return obj
}
obj = obj.parent
}
return null
}
const GUI = ({ aspectRatio, guiMode, addMode, currentBoard, selectedObject, hideArray, virtualCamVisible, flipHand, guiCamFOV, vrControllers }) => {... |
<<<<<<<
//console.log('weird: ', weirdFBThingie)
let bonesHelper = new BonesHelper( skeleton.bones[0].parent, object.current, { boneLengthScale } )
=======
let bonesHelper = new BonesHelper( skeleton.bones[0].parent, object.current )
bonesHelper.traverse(child => {
child.layers.... |
<<<<<<<
label: i18n.t('menu.help.bug-submit'),
=======
type: 'separator'
},
{
label: 'Found a bug? Submit an issue!!!',
>>>>>>>
type: 'separator'
},
{
label: i18n.t('menu.help.bug-submit'),
<<<<<<<
label: i18n.t('menu.file.import-image-and-replace'),
=======
label: 'Replace... |
<<<<<<<
=======
import CameraControlsComponent from './CameraControlsComponet'
>>>>>>>
import CameraControlsComponent from './CameraControlsComponet'
<<<<<<<
useMemo(() => {
if(dragTarget && dragTarget.target){
=======
useEffect(() => {
if(dragTarget){
>>>>>>>
useMemo(() => {
... |
<<<<<<<
characterIds, modelObjectIds, lightIds, virtualCameraIds
=======
characterIds, modelObjectIds, virtualCameraIds,
resources, getAsset
>>>>>>>
characterIds, modelObjectIds, lightIds, virtualCameraIds,
resources, getAsset |
<<<<<<<
const isIkCharacter = useRef(null)
=======
>>>>>>>
const isIkCharacter = useRef(null)
<<<<<<<
isIkCharacter.current = isSuitableForIk(skeleton)
=======
>>>>>>>
isIkCharacter.current = isSuitableForIk(skeleton) |
<<<<<<<
//const AttachableInfo = require('./attachables/AttachableInfo')
const AttachableInfo = require('./components/AttachableInfo').default
const HandPresetsEditor = require('./HandPresetsEditor')
=======
const AttachableInfo = require('./attachables/AttachableInfo')
const HandPresetsEditor = require('./components... |
<<<<<<<
<spotLight
ref={light_spot}
color={0xffffff}
intensity={props.intensity}
position={[0, 0, 0]}
rotation={[Math.PI / 2, 0, 0]}
angle={props.angle}
distance={props.distance}
penumbra={props.penumbra}
decay={props.decay}
/>
<m... |
<<<<<<<
import FaceMesh from "./Helpers/FaceMesh"
=======
let boneWorldPosition = new THREE.Vector3()
let worldPositionHighestBone = new THREE.Vector3()
const findHighestBone = (object) =>
{
let highestBone = null
let bones = object.skeleton.bones
for(let i = 0; i < bones.length; i ++)
{
l... |
<<<<<<<
const { useMemo, useState, useRef, useEffect } = React = require('react')
=======
const { useMemo, useRef } = React = require('react')
>>>>>>>
const { useMemo, useRef, useEffect } = React = require('react')
<<<<<<<
=======
const canUndo = useSelector(state => state.undoable.past.length > 0)
const ca... |
<<<<<<<
this.listenTo(Origin, 'assetItemView:previewUpload', this.showUploadPreview);
this.listenTo(Origin, 'assetManagement:filter', this.filterCollection);
},
setupFilteredCollection: function() {
this.filteredCollection = new Backbone.Collection(this.collection.models);
this.... |
<<<<<<<
text: calculatedName,
=======
storyboarderFilePath: meta.storyboarderFilePath,
// HACK force reset skeleton pose on Board UUID change
boardUid: _boardUid,
>>>>>>>
text: calculatedName,
storyboarderFilePath: m... |
<<<<<<<
const Character = React.memo(({ path, sceneObject, modelSettings, isSelected, selectedBone, updateCharacterSkeleton, updateCharacterIkSkeleton }) => {
const {asset: gltf, loaded} = useAsset(path)
const ref = useUpdate(
self => {
let lod = self.getObjectByProperty("type", "LOD")
lod... |
<<<<<<<
// If undefined, the path will be /tmp/
config.erizoController.recording_path = undefined;
=======
// Max processes that ErizoAgent can run
config.erizoAgent.maxProcesses = 1;
// Number of precesses that ErizoAgent runs when it starts. Always lower than or equals to maxProcesses.
config.erizoAgent.prerun... |
<<<<<<<
if ((spec.audio || spec.video) && spec.url === undefined) {
L.Logger.debug("Requested access to local media");
Erizo.GetUserMedia({video: spec.video, audio: spec.audio}, function (stream) {
=======
if (spec.audio || spec.video || spec.screen) {
... |
<<<<<<<
import moment from 'moment';
import _ from 'lodash';
import { LOAD_DATABASES_SUCCESS } from '../constants/action-types';
=======
import { LODAD_DABATASES } from '../constants/action-types';
>>>>>>>
import { LOAD_DATABASES_SUCCESS } from '../constants/action-types'; |
<<<<<<<
import { makeStyles } from '@material-ui/core/styles'
const useStyles = makeStyles(theme => ({
drawerWidth: { width: 360 },
}))
=======
import { DragDropContext } from 'react-beautiful-dnd'
import { moveFunds } from './thunks'
import MoveMoneyModal from './containers/MoveMoneyModal'
>>>>>>>
import { makeS... |
<<<<<<<
this.client.messages.push(`${chalk.gray(line)}`)
=======
this.state.messages.push(`${chalk.dim(line)}`)
>>>>>>>
this.client.messages.push(`${chalk.dim(line)}`)
<<<<<<<
self.client.scrollback = 0
self.client.messages = []
=======
self.state.scrollback = 0
self.state.messages = []
self.state... |
<<<<<<<
self.state.cabal.client.messages.push(self.formatMessage(msg))
=======
var msgDate = new Date(msg.value.timestamp)
if (strftime('%F', msgDate) > strftime('%F', self.state.latest_date)) {
self.state.latest_date = msgDate
self.state.messages.push(`${chalk.gray('day ch... |
<<<<<<<
toggleEditorTextSize,
=======
repoExportDisplayed,
repoExportNotDisplayed,
>>>>>>>
repoExportDisplayed,
repoExportNotDisplayed,
toggleEditorTextSize, |
<<<<<<<
import spinnerPageHtml from '../../../templates/project-export.html';
import generatePreview from '../../../src/util/generatePreview';
=======
import spinnerPageHtml from '../../../templates/github-export.html';
import compileProject from '../../../src/util/compileProject';
>>>>>>>
import spinnerPageHtml fro... |
<<<<<<<
getRequestedFocusedLine,
=======
isCurrentProjectSyntacticallyValid,
>>>>>>>
getRequestedFocusedLine,
isCurrentProjectSyntacticallyValid,
<<<<<<<
requestedFocusedLine: getRequestedFocusedLine(state),
=======
showingErrors: !isCurrentProjectSyntacticallyValid(state),
>>>>>>>
requestedF... |
<<<<<<<
import generatePreview from '../util/generatePreview';
import spinnerPageHtml from '../../templates/project-export.html';
=======
import compileProject from '../util/compileProject';
import spinnerPageHtml from '../../templates/github-export.html';
>>>>>>>
import spinnerPageHtml from '../../templates/project... |
<<<<<<<
// .attr("transform", function(d) {
// if (!d.children) return "rotate(" + (d.x < 180 ? d.x - 90 : d.x + 90) + ")";
// return null;
// })
// .style('fill', 'darkblue');
=======
>>>>>>>
// .attr("transform", function(d) {
// if (!d.children) return "rotate(" + (d.x <... |
<<<<<<<
html.should.equal('<p>Tobi</p>');
calls.should.equal(name === 'atpl' ? 4 : 2);
=======
html.should.match(/Tobi/);
calls.should.equal(2);
>>>>>>>
html.should.match(/Tobi/);
calls.should.equal(name === 'atpl' ? 4 : 2); |
<<<<<<<
const lib = require("../index");
const {Intersection, Point2D} = lib;
=======
let lib = require("../index"),
Intersection = lib.Intersection,
Point2D = lib.Point2D,
contours = require("kld-contours"),
CubicBezier2D = contours.CubicBezier2D;
>>>>>>>
const {Intersection, Point2D} = require("..... |
<<<<<<<
var uuid = $(e.currentTarget).data('uuid');
Workspace.openComponent({ uuid: uuid });
=======
var id = $(e.currentTarget).data('id');
var RealWorkspace = Workspace.openComponent ? Workspace : require('components/workspace/main');
RealWorkspace.openComponent({ uuid: id });
>>>>>>>
var i... |
<<<<<<<
return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
=======
if ( !relativeHierarchySelector || hasParent ) {
return makeArray( context.querySelectorAll( "#" + nid + " " + query ), extra );
}
>>>>>>>
if ( !relativeHierarchySelector || hasParent ... |
<<<<<<<
=======
baseHasDuplicate = true,
document = window.document,
docElem = document.documentElement,
dirruns = 0,
done = 0,
>>>>>>>
<<<<<<<
=======
if ( document.querySelectorAll ) {
(function() {
var disconnectedMatch,
oldSelect = select,
rescape = /'|\\/g,
rattributeQuotes = /\=[\x20\t\r\n... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
if ((course._isShared || course.createdBy == userId) && course._tenantId.toString() == tenantId) {
// Shared courses on the same tenant are open to users on the same tenant
... |
<<<<<<<
var margin = {top: 30, right: 30, bottom: 50, left: 60},
color = d3.scale.category20().range(),
width = null,
=======
var margin = {top: 30, right: 20, bottom: 50, left: 60},
color = nv.utils.getColor(),
width = null,
>>>>>>>
var margin = {top: 30, right: 30, bottom: 50, left: ... |
<<<<<<<
=======
wrapLabels: {get: function(){return wrapLabels;}, set: function(_){wrapLabels=!!_;}},
// deprecated options
tooltips: {get: function(){return tooltip.enabled();}, set: function(_){
// deprecated after 1.7.1
nv.deprecated('tooltips', 'use chart.tool... |
<<<<<<<
, xRange
, yRange
=======
, groupSpacing = 0.1
>>>>>>>
, xRange
, yRange
, groupSpacing = 0.1
<<<<<<<
x .domain(xDomain || d3.merge(seriesData).map(function(d) { return d.x }))
.rangeBands(xRange || [0, availableWidth], .1);
=======
x .domain(d3.merge(seri... |
<<<<<<<
Object.keys(uniswapMarketTvlBalances).map(address => {
if (balances[address]) {
balances[address] = BigNumber(
balances[address]
=======
Object.keys(uniswapMarketTvlBalances).forEach(address => {
if (balances[address]) {
balances[address] = BigNumber(
ba... |
<<<<<<<
addImageChoicesTo("types",typeList.slice(0,typeList.length-2));
=======
addIconChoicesTo("types", typeList.slice(0,typeList.length-2), "checkbox", "equipment");
>>>>>>>
addIconChoicesTo("types", typeList.slice(0,typeList.length-2), "checkbox", "equipment");
<<<<<<<
addImageChoicesTo("elements"... |
<<<<<<<
<Tooltip id={`${id}-selectbox-tooltip`} placement={'bottom'} tooltip={selectedItem ? selectedItem.value : ''}>
<button className={`btn btn-default dropdown-toggle ${style['dropdown-button']} ${validationClass}`} type='button' data-toggle='dropdown' id={`${id}-button-toggle`}>
... |
<<<<<<<
setOvirtApiVersion,
=======
getAllTemplates,
getAllClusters,
getAllOperatingSystems,
addClusters,
addTemplates,
addAllOS,
updateCluster,
changeCluster,
updateTemplate,
changeTemplate,
updateOperatingSystem,
updateVmMemory,
updateVmCpu,
updateVmName,
updateDialogType,
updateVm... |
<<<<<<<
], function contentDialogInit(Application, _Dispose, Promise, _Signal, _LightDismissService, _BaseUtils, _Global, _WinRT, _Base, _Events, _ErrorFromName, _Resources, _Control, _ElementUtilities, _Hoverable, _Animations) {
=======
], function contentDialogInit(Application, _Dispose, _Accents, Promise, _Sig... |
<<<<<<<
var _MSGestureEvent = global.MSGestureEvent || {
MSGESTURE_FLAG_BEGIN: 1,
MSGESTURE_FLAG_CANCEL: 4,
MSGESTURE_FLAG_END: 2,
MSGESTURE_FLAG_INERTIA: 8,
MSGESTURE_FLAG_NONE: 0
};
var _MSManipulationEvent = global.MSManipulationEvent || {
MS_MANIPULATION_... |
<<<<<<<
/**
* @notice Implements bitcoin's hash256 (double sha2)
* @param {Uint8Array} preImage The pre-image
* @returns {Uint8Array} The digest
*/
hash256: (preImage) => {
return utils.sha256(utils.sha256(preImage));
},
=======
/**
* @notice Implements bitco... |
<<<<<<<
'velocity'
], function (Origin, Router, User, SessionModel, NavigationView, GlobalMenu, Sidebar, Helpers, ContextMenu, Polyglot) {
=======
'coreJS/app/contextMenu',
'jquery-ui'
], function (Origin, Router, User, SessionModel, NavigationView, GlobalMenu, Helpers, Polyglot, Templates, ContextMenu, J... |
<<<<<<<
for (let i = 0; i <= index; i ++) {
let remaining = utils.safeSlice(vinArr, offset, vinArr.length);
=======
for (let i = 0; i <= index; i += 1) {
const remaining = utils.safeSlice(vinArr, offset, vinArr.length - 1);
>>>>>>>
for (let i = 0; i <= index; i += 1) {
const remaining =... |
<<<<<<<
const vectorObj = JSON.parse(JSON.stringify(vectors));
utils.updateJson(vectorObj);
const {
HEADER_170,
OP_RETURN_PROOF,
OP_RETURN_INDEX,
OUTPOINT,
HASH_160,
HASH_256,
SEQUENCE_WITNESS,
SEQUENCE_LEGACY,
OUTPUT,
INDEXED_INPUT,
INDEXED_OUTPUT,
LEGACY_INPUT,
INPUT_LENGTH,
SCRIPT_SIGS,
... |
<<<<<<<
res = await BTCUtilsJs.extractHash(utils.deserializeHex(opReturnOutput));
assert.isNull(res);
// TODO: What type of error should be thrown here?
// try {
// await BTCUtilsJs.extractOpReturnData(output);
// assert(false, 'expected an error');
// } catch (e) {
// assert.inclu... |
<<<<<<<
_init: function(net_speed)
{
this._net_speed = net_speed;
this.parent(0.0);
this._box = new St.BoxLayout();
this._icon_box = new St.BoxLayout();
this._icon = this._get_icon(this._net_speed.get_device_type(this._net_speed.getDevice()));
this._upicon = this.... |
<<<<<<<
var backButtonRoute = "#/editor/" + route1 + "/menu";
var backButtonText = "Back to menu";
=======
var backButtonRoute = "/#/editor/" + route1 + "/menu";
var backButtonText = Origin.l10n.t('app.backtomenu');
>>>>>>>
var backButtonRoute = "#/editor/" + route1 + "/menu"... |
<<<<<<<
name: "Serge Stinckwich",
bio: "Enseignant-chercheur, développeur",
picture: "http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/2/000/011/381/16fa99c.jpg",
websites: [
{title: "Site web", href: "http://www.d... |
<<<<<<<
, rest: {
host: 'http://localhost:3000/',
filters: {
param: [rest.RestFilters.PARAM_FILTER_PARAMS]
}
}
=======
, multilevel: {
port: process.env.LEVEL_PORT || 3000
, host: process.env.LEVEL_HOST || '127.0.0.1'
}
>>>>>>>
, multilevel: {
... |
<<<<<<<
this._lastMainModel = null;
this._rowEventName = query.model.adapter.name == 'mysql' ?
=======
this._itemBuffer = [];
this._rowEventName = query.model.getAdapter().name == 'mysql' ?
>>>>>>>
this._lastMainModel = null;
this._rowEventName = query.model.getAdapter().name == 'mysql' ? |
<<<<<<<
this.showFilterIcons(App.filter);
=======
;
>>>>>>>
this.showFilterIcons(App.filter);
<<<<<<<
var self = this;
var currentEl = this.$el;
var searchInput;
=======
>>>>>>>
var self = this;
... |
<<<<<<<
collection: qCollection,
projectId : self.id,
customerId: self.formModel.toJSON().customer._id
=======
collection: self.qCollection,
projectId : self.id
>>>>>>>
coll... |
<<<<<<<
=======
this.listenTo(Origin, 'editorSidebar:addOverviewView', this.addOverviewView);
this.listenTo(Origin, 'editorSidebar:removeEditView', this.removeEditingView);
>>>>>>>
this.listenTo(Origin, 'editorSidebar:addOverviewView', this.addOverviewView);
<<<<<<<
Origin.trigger('edi... |
<<<<<<<
date : '$date',
fileName : '$fileName',
user : '$user.login',
type : '$type',
status : '$status',
reportFile: '$reportFile'
=======
date : '$d... |
<<<<<<<
dataService.getData(CONSTANTS.URLS.EMPLOYEES_GETFORDD, {isEmployee: true, devDepartments: true}, function (employees) {
=======
dataService.getData("/employee/getForDD", {
isEmployee : true,
devDepartments: true
... |
<<<<<<<
=======
this.listenTo(Origin, 'editor:refreshPageList', this.addPageViews);
>>>>>>>
this.listenTo(Origin, 'editorView:refreshPageList', this.addPageViews);
<<<<<<<
postRender: function() {
},
// loop through the contentObject in the model and build the list in the overview side... |
<<<<<<<
=======
//var stepKey = (!this.step) ? this.stepKeys[this.step] : this.stepKeys[this.step - 1];
>>>>>>>
//var stepKey = (!this.step) ? this.stepKeys[this.step] : this.stepKeys[this.step - 1];
<<<<<<<
=======
var result;
>>>>>>>
var result;
<<<<<<<
... |
<<<<<<<
'constants',
'helpers/keyValidator'
], function (productItemTemplate, ProductInputContent, ProductItemsEditList, ItemsEditList, totalAmount, productCollection, GenerateWTrack, populate, helpers, dataService, CONSTANTS, keyValidator) {
=======
'constants'
], function (Backbone, $, _, productItemTem... |
<<<<<<<
"text!templates/Opportunities/kanban/KanbanItemTemplate.html",
'moment',
'helpers'
=======
'Backbone',
'Underscore',
'text!templates/Opportunities/kanban/KanbanItemTemplate.html',
'moment'
>>>>>>>
'Backbone',
'Underscore',
'text!... |
<<<<<<<
'Backbone',
'Underscore',
'jQuery',
'views/listViewBase',
'views/selectView/selectView',
'text!templates/wTrack/list/ListHeader.html',
'text!templates/wTrack/list/cancelEdit.html',
'text!templates/wTrack/list/forWeek.html',
'views/wTrack/CreateView',
'views/wTrack/list/Li... |
<<<<<<<
function (listTemplate, cancelEdit, createView, listItemView, editView, wTrackCreateView, currentModel, usersModel, contentCollection, EditCollection, filterView, common, dataService, populate, async, custom, moment) {
=======
function (paginationTemplate, listTemplate, cancelEdit, createView, listIte... |
<<<<<<<
showMore : function () {
=======
showMore : function (event) {
//event.preventDefault();
>>>>>>>
showMore : function () {
showMore : function (event) {
//event.preventDefault();
<<<<<<<
//... |
<<<<<<<
'views/Notes/NoteView',
=======
'text!templates/Employees/EditTransferTemplate.html',
'views/Notes/AttachView',
>>>>>>>
'text!templates/Employees/EditTransferTemplate.html',
'views/Notes/NoteView',
<<<<<<<
NoteView,
=======
EditTransferTemplate,
A... |
<<<<<<<
router.post('/create', handler.create);
router.post('/uploadFiles', accessStackMiddleware, multipartMiddleware, iHandler.uploadFile);
=======
router.post('/', handler.create);
>>>>>>>
router.post('/', handler.create);
router.post('/uploadFiles', accessStackMiddleware, multipartMiddleware... |
<<<<<<<
if (aggregatePurchase) {
aggregate = [
{
$lookup: {
from : supplier,
localField : 'supplier',
foreignField: '_id',
as ... |
<<<<<<<
DASH_VAC_WEEK_AFTER: 8,
DASH_VAC_WEEK_AFTER: 8,
COUNT_PER_PAGE: 100,
BANED_PROFILE: "1387275504000"
=======
DASH_VAC_WEEK_AFTER: 8,
HR_VAC_YEAR_BEFORE: 2,
HR_VAC_YEAR_AFTER: 1,
>>>>>>>
DASH_VAC_WEEK_AFTER: 8,
DASH_VAC_WEEK_AFTER: 8,
HR_VAC_YEAR_BEFORE: 2,
HR_VAC... |
<<<<<<<
/**
*@api {get} /opportunities/getFilterValues Request FilterValues
*
* @apiVersion 0.0.1
* @apiName getFilterValues
* @apiGroup Opportunity
*
* @apiSuccess {Object} FilterValues
* @apiSuccessExample Success-Response:
HTTP/1.1 200 OK
[
{
"_id": null,
... |
<<<<<<<
if (!this.filter) {
this.filter = {};
}
this.filter['letter'] = {
key : 'letter',
value: selectedLetter,
type : null
};
=======
>>>... |
<<<<<<<
var access = require('../Modules/additions/access.js')(models);
var ProjectSchema = mongoose.Schemas.Project;
var wTrackSchema = mongoose.Schemas.wTrack;
var MonthHoursSchema = mongoose.Schemas.MonthHours;
var EmployeeSchema = mongoose.Schemas.Employee;
var jobsSchema = mongoose.Schemas.... |
<<<<<<<
//require('./monthHours.js');
=======
require('./monthHours.js');
require('./holiday.js');
>>>>>>>
//require('./monthHours.js');
require('./holiday.js'); |
<<<<<<<
var sendData = function (url, data, method, callback, contentType) {
=======
var sendData = function (url, data, method, contentType, callback) {
var ajaxObject;
>>>>>>>
var sendData = function (url, data, method, callback, contentType) {
var ajaxObject;
<<<<<<<
//... |
<<<<<<<
router.get('/writeOff', _journalHandler.getWriteOff);
=======
router.get('/getByAccount', _journalHandler.getByAccount);
>>>>>>>
router.get('/writeOff', _journalHandler.getWriteOff);
router.get('/getByAccount', _journalHandler.getByAccount); |
<<<<<<<
chooseOption: function (e) {
var holder = $(e.target).parents('dd').find('.current-selected');
holder.text($(e.target).text()).attr('data-id', $(e.target).attr('id'));
$(e.target).closest('td').removeClass('errorContent');
},
=======
chooseOption: f... |
<<<<<<<
'jQuery',
'Underscore',
'views/listViewBase',
'text!templates/Companies/list/ListHeader.html',
'views/Companies/CreateView',
'views/Companies/list/ListItemView',
'collections/Companies/filterCollection',
'views/Filter/FilterView',
'common',... |
<<<<<<<
function (Backbone, $, _, ProjectsFormTemplate, DetailsTemplate, ProformRevenueTemplate, jobsWTracksTemplate, invoiceStats, ReportView, selectView, EditViewOrder, editViewQuotation, editViewInvoice, EditView, noteView, attachView, AssigneesView, BonusView, wTrackView, PaymentView, InvoiceView, QuotationView... |
<<<<<<<
'text!templates/Notes/importTemplate.html',
'views/Notes/AttachView',
=======
'views/Import/mappingContentView',
>>>>>>>
'text!templates/Notes/importTemplate.html',
'views/Notes/AttachView',
'views/Import/mappingContentView',
<<<<<<<
], function (Backbone, $, _, ContentTemplate, Impo... |
<<<<<<<
year = year.slice(0, 4);
=======
if (!isOvertime && holiday){
App.render({
type : 'error',
message: 'Please create Overtime tCard'
});
return false;
}... |
<<<<<<<
this.listenTo(Origin, 'editorSidebar:removeEditView', this.remove);
=======
this.listenTo(Origin, 'editor:removeSubViews', this.remove);
this.model.set('ancestors', this.model.getPossibleAncestors().toJSON());
>>>>>>>
this.listenTo(Origin, 'editorSidebarView:removeEditView', this.remo... |
<<<<<<<
'views/Filter/FilterValuesView',
'collections/Filter/filterCollection',
=======
'views/Filter/savedFiltersView',
>>>>>>>
'views/Filter/FilterValuesView',
'collections/Filter/filterCollection',
'views/Filter/savedFiltersView',
<<<<<<<
'common',
... |
<<<<<<<
INVOICE_PARTIALY_PAID : '55647d952e4aa3804a765eca',
INVOICE_PAID : '55647d982e4aa3804a765ecb',
MOBILE_DEFAULT_COUNT_PER_LIST: 50,
=======
>>>>>>>
INVOICE_PARTIALY_PAID : '55647d952e4aa3804a765eca',
INVOICE_PAID : '55647d982e4aa3804a765ecb',
... |
<<<<<<<
var journalRouter = require('./journal')(models, event);
=======
var prPositionRouter = require('./projectPosition')(models);
var journalRouter = require('./journal')(models);
>>>>>>>
var prPositionRouter = require('./projectPosition')(models);
var journalRouter = require('./journal')(mod... |
<<<<<<<
var holidayRouter = require('./holiday')(models);
=======
var opportunityRouter = require('./opportunity')(models);
>>>>>>>
var opportunityRouter = require('./opportunity')(models);
var holidayRouter = require('./holiday')(models);
<<<<<<<
app.use('/holiday', holidayRouter);
=======
... |
<<<<<<<
'editorCommon:preview': function(event) {
var previewWindow = window.open('loading', 'preview');
=======
'editorCommon:preview': function(isForceRebuild) {
var previewWindow = window.open('/loading', 'preview');
>>>>>>>
'editorCommon:preview': function(isForceRebui... |
<<<<<<<
router.get('/getEmployeesCountForDashboard', handler.getEmployeesCountForDashboard);
=======
/**
*@api {get} /employees/EmployeesForChart/ Request EmployeesForChart
*
* @apiVersion 0.0.1
* @apiName getEmployeesForChart
* @apiGroup Employee
*
* @apiSuccess {Object} E... |
<<<<<<<
/*function getVac ationFilter(req, res, next) {
if (req.session && req.session.loggedIn && req.session.lastDb) {
access.getReadAccess(req, req.session.uId, 70, function (access) {
if (access) {
var Vacation = models.get(req.session.lastDb, 'Vacation', VacationSchema);
var options ... |
<<<<<<<
"backButtonText": "Back to course structure",
"backButtonRoute": "#/editor/" + Origin.location.route1 + "/menu"
=======
backButtonText: Origin.l10n.t('app.backtomenu'),
backButtonRoute: "/#/editor/" + Origin.location.route1 + "/menu"
>>>>>>>
backButtonText: Origin.l10n.t('app.ba... |
<<<<<<<
function (KanbanItemTemplate, common, moment) {
=======
function (Backbone, $, _, KanbanItemTemplate, common) {
'use strict';
>>>>>>>
function (Backbone, $, _, KanbanItemTemplate, common, moment) {
'use strict'; |
<<<<<<<
Employee.aggregate([{
$match: matchObjectForDash
}, {
$lookup: {
from : 'Department',
localField : 'department',
foreignField: '_id',
as : 'department'
... |
<<<<<<<
var JournalEntryHandler = require('./journalEntry');
var journalEntry = new JournalEntryHandler(models);
//
//exportDecorator.addExportFunctionsToHandler(this, function (req) {
// return models.get(req.session.lastDb, 'wTrack', wTrackSchema);
//}, exportMap, "wTrack");
=======
e... |
<<<<<<<
'text!templates/salesOrder/EditTemplate.html',
'text!templates/salesOrder/ViewTemplate.html',
=======
'Backbone',
'jQuery',
'Underscore',
"text!templates/salesOrder/EditTemplate.html",
"text!templates/salesOrder/ViewTemplate.html",
>>>>>>>
'Back... |
<<<<<<<
'custom',
'constants'
=======
'custom',
'constants'
>>>>>>>
"populate",
'custom',
'constants'
<<<<<<<
function (CreateTemplate, ProjectModel, populate, attachView, AssigneesView, BonusView, selectView, customFile, constants) {
=======
function ... |
<<<<<<<
'text!templates/monthHours/list/cancelEdit.html',
'helpers'
], function (listViewBase, listTemplate, createView, listItemView, editView, currentModel, contentCollection, EditCollection, common, dataService, populate, async, CONSTANTS, cancelEdit, helpers) {
=======
'text!templates/monthHours/list/... |
<<<<<<<
"common",
"populate",
"custom",
'constants'
], function (Backbone, $, _, EditTemplate, selectView, attachView, AssigneesView, common, populate, custom, CONSTANTS) {
=======
'common',
'populate',
'custom',
'constants'
], function (Backbone, $, _, EditTemplate, SelectView, Attach... |
<<<<<<<
var JournalEntryHandler = require('./journalEntry');
var _journalEntryHandler = new JournalEntryHandler(models);
function checkDb(db) {
var validDbs = ["weTrack", "production", "development"];
return validDbs.indexOf(db) !== -1;
}
=======
>>>>>>>
var JournalEntryHandler... |
<<<<<<<
app.use('/payroll', payRollRouter);
=======
app.use('/jobs', jobsRouter);
>>>>>>>
app.use('/payroll', payRollRouter);
app.use('/jobs', jobsRouter); |
<<<<<<<
"mouseover .search-content" : 'showSearchContent',
"click .search-content" : 'showSearchContent',
=======
"mouseover .search-content" : 'showSearchContent',
"click .search-content" : 'showSearchContent',
>... |
<<<<<<<
this.salesManager = options.salesManager;
this.filter = options.filter ? options.filter : {};
=======
this.projectManager = options.projectManager;
this.filter = options.filter || {};
>>>>>>>
this.salesManager = options.salesManager;
thi... |
<<<<<<<
}
=======
},
gotoForm: function (e) {
var id = $(e.target).closest('tr').data('id');
var page = this.collection.currentPage;
var countPerPage = this.collection.pageSize;
var url = this.formUrl + id + '/p=' + page + '/c=' + countPerPage;... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.