Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Snap #134

Merged
merged 348 commits into from
Feb 9, 2015
Merged

Snap #134

merged 348 commits into from
Feb 9, 2015

Conversation

brollb
Copy link
Contributor

@brollb brollb commented Feb 9, 2015

Created a block editor visualizer. Disabled by default.

brollb added 30 commits July 17, 2014 12:35
@brollb
Updated syntax
0f63a2e
@brollb
Updated syntax
19b75ac
@brollb
Updated syntax
5f24bd7
@brollb
Added onFinish and misc code adjustments
8cc1b5a
@brollb
Added onFinish function
4fd1291
@brollb
Added support for editing attribute text on items
acc4cd6
@brollb
Added support for processing input fields from svg
7ed89e3
@brollb
Added svg resize on text editInPlace
46d1dcd
@brollb
turned preventDefault to false to allow for dropdown menus in items
4bec781
@brollb
Added recursive search for loading svgs
e4c0f1c
@brollb
Updated syntax for JSHint
83ed926
@brollb
Added "editable" toggle for editing node names
9c7213a
@brollb
Created more constraint svgs
043f898
@brollb
misc refactoring
c4906a3
@brollb
minor adjustments to resizing by attributes and name changes
0938870
@brollb
Combined two transactions into one
6588980 
removeExtraPointers is now part of the surrounding transaction
@brollb
Added all attributes to be passed to item (even undefined)
9964baa
@brollb
Added extra object support
c5ec838
@brollb
Added support for containing enumeration attributes
f0a59a4
@brollb
Removed action buttons
1e08cd2
@brollb
Added input field constants
a57bd79
@brollb
Added input field support
6d75742
@brollb
misc changes
f65448a
@brollb
minor bug fix
9f2931f
@brollb
Misc code refactoring
a6927be
@brollb
Merge branch 'snap' of https://github.com/webgme/webgme into snap
1c707ab 
Conflicts:
	client/assets/decoratorSVG.js
	client/decorators/SVGDecorator/Core/SVGDecorator.Connections.js
	client/decorators/SVGDecorator/Core/SVGDecorator.Connectors.js
	client/decorators/SVGDecorator/Core/SVGDecorator.Core.js
	client/decorators/SVGDecorator/Core/SVGDecorator.Ports.js
	client/decorators/SVGDecorator/Core/SVGPort.js
	client/decorators/SVGDecorator/SVGDecorator.js
	client/decorators/SVGDecorator/SnapEditor/SVGDecorator.Core.js
	client/decorators/SVGDecorator/SnapEditor/SVGDecorator.SnapEditorWidget.js
	client/js/Panels/PropertyEditor/PointerWidget.js
	client/js/Panels/SnapEditor/SnapEditorControl.WidgetEventHandlers.js
	client/js/Panels/SnapEditor/SnapEditorControl.js
	client/js/Widgets/SnapEditor/ClickableItem.js
	client/js/Widgets/SnapEditor/ItemBase.js
	client/js/Widgets/SnapEditor/SnapEditorWidget.ClickableItem.js
	client/js/Widgets/SnapEditor/SnapEditorWidget.Constants.js
	client/js/jquery.WebGME.js
	coreplugins/ConstraintPlugin/ConstraintPlugin.js
@brollb
Merge branch 'feature/74' of https://github.com/webgme/webgme into snap
3b6cab4 
Conflicts:
	client/decorators/SVGDecorator/Core/SVGDecorator.Core.js
	client/js/Panels/ModelEditor/ModelEditorControl.DiagramDesignerWidgetEventHandlers.js
	client/js/Panels/PropertyEditor/PropertyEditorPanelController.js
@brollb
Removed debug highlighting and increased dragged item buffer
509bbdc
@brollb
Merge branch 'master' of https://github.com/webgme/webgme
a907661 
Conflicts:
	client/decorators/SVGDecorator/Core/SVGDecorator.Core.js
	client/decorators/SVGDecorator/SVGDecorator.js
	client/js/WebGME.js
	client/js/Widgets/ProjectRepository/ProjectRepositoryWidget.js
	client/js/main.js
@brollb
Merge branch 'master' into snap
4604fa9 
Conflicts:
	client/decorators/SVGDecorator/Core/SVGDecorator.Core.js
	client/decorators/SVGDecorator/SVGDecorator.js
brollb and others added 26 commits January 5, 2015 10:14
@brollb
Merge branch 'snap' of https://github.com/webgme/webgme into snap
3ae2aa8
@brollb
Removed debug message
0bea1da
@brollb
Reset under item count on drop
0f797fa
@brollb
Updated naming and connections
dc01459
@brollb
Added onFinish
3b97840
@brollb
Fixed dragging cursor location with zoom
03857d5
@brollb
Fixed drag-n-drop while zoomed
6a62efe
@brollb
Removed randomness from unique id generation
4093f40
@brollb
Updated code to reflect change in draghelper
7db4d1b
@brollb
Updated 'ptrs'
9f4499d
@brollb
Fixed highlighting box
b4895ac
@brollb
Fixed minor connection highlighting accuracy issue
9cfa4a2
@brollb
Adjusted DEBUG settings in draggable
07a3d13
@brollb
Fixed _removePtr bug
83b0f76
@brollb
Fixed gap in true_next
74d7d35
@brollb
Fixed updating issue with splicing blocks
750c5ef
@brollb
misc changes
5501590
@brollb
Merge branch 'master' of https://github.com/webgme/webgme into snap
91a09d5
@brollb
Fixed regex error in formatting attributes
d7cc779
@brollb
Small changes to math svgs
3645f1c
@brollb
Added new svgs
82ef778
@brollb
Merge branch 'master' of https://github.com/webgme/webgme into snap
af02635
@brollb
Merge branch 'master' of https://github.com/webgme/webgme into snap
2f095ba
@brollb
Merge branch 'master' of https://github.com/webgme/webgme into snap
71ccf92
@brollb
Renamed Block Editor and set to debug mode
c62bc8c
Enable GraphViz visualizer by default
5c0fbe0
lattmann pushed a commit that referenced this pull request Feb 9, 2015
Merge pull request #134 from webgme/snap
9abee02 
Snap
@lattmann lattmann merged commit 9abee02 into master Feb 9, 2015
@lattmann lattmann deleted the snap branch February 9, 2015 20:29
@lattmann lattmann added this to the v0.7.0 milestone Feb 12, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v0.7.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@brollb @lattmann