| Commit message (Collapse) | Author | Age |
... | |
| |
| |
| |
| |
| |
| | |
- apply theme selection to all code view documents
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\| |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
assets/canvas-runtime.js
js/controllers/elements/shapes-controller.js
js/lib/drawing/world.js
js/lib/geom/geom-obj.js
js/lib/geom/line.js
js/mediators/element-mediator.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- Checkbox for user to toggle between manually triggered autocomplete and automatic autocomplete
- font zoom hottext
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- added logic to toggle between automatic code completion and manually triggered code completion [ UI pending ]
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- cleaning up
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\ \ \ \
| | |/ /
| |/| |
| | | | |
Codeview-improvements
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reworked the add and remove elements into 1 function which can take 1 or more elements.
Removed the _element from the selection array
Many other changes related to those 2 changes
Undo/Redo shortcuts are now using montage undo/redo manager.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
- changes to not show autocomplete dropdown for brackets
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
- trigger autocomplete automatically
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\| |
| | |
| | |
| | | |
Codeview-improvements
|
| |/
| |
| |
| | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|/
|
|
|
|
|
| |
- Highlight selection matched
-Highlight current line
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
|
|
| |
opened.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
|
|
| |
called when clicking on the canvas.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
|
|
|
|
|
| |
are collapsed.
Fixing the following bugs:
IKNINJA-1068
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
| |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
|
|
| |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
|
|
| |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
|
|
|
|
|
| |
- Requiring all the previously pre-loaded files
- RDGE, Codemirror and gl-matrix are not included via a script tag.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| |
| | |
https://github.com/joseeight/ninja-internal into integration-candidate
|
| |
| |
| |
| |
| |
| | |
- minor bug fixes
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |
| |
| |
| |
| |
| | |
- added switchDocument event for timeline
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
a document and while switching documents
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |/
|/|
| |
| |
| |
| | |
snapping routine when selecting only if the active tool allows snapping.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into file-io
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \ \
| | |_|/
| |/| | |
|
| | |/
| |/|
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|