aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\
| * Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| |\ | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | * Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| |/ | | | | | | preparation for montage converting to the new "prototype" format fully
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
|\|
| * Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| |\
| * | Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | initial stage web templateValerio Virgillito2012-04-18
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Breadcrumb FixKruti Shah2012-04-20
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | BreadCrumb Bug FixKruti Shah2012-04-19
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
|\|
| * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ↵Nivesh Rajbhandari2012-03-27
| | | | | | | | | | | | | | | | | | rotate tool and 3D object translate tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
|\ \ \ | | |/ | |/|
| * | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ | | | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| | * | IKNINJA-1364 : fixed css so that white spaces are not collapsed while renderingAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | IKNINJA-1266 : restrict tab size for long file names and resize tabs on ↵Ananya Sen2012-03-22
| | |/ | | | | | | | | | | | | | | | window resize Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * / Resizers updatedArmen Kesablyan2012-03-23
| |/ | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* / Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
|/ | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* adding some margin to the bread crumb buttonsValerio Virgillito2012-02-28
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* cleanup and fixing selecting each bread crumbValerio Virgillito2012-02-28
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding some missing copyrightsValerio Virgillito2012-02-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the breadcrumb button - removing toolbutton class since it is not a ↵Valerio Virgillito2012-02-23
| | | | | | tool button Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
|\
| * Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * cleanup of the breadcrumbValerio Virgillito2012-02-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\ | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * | fixed undo/redo for each code view document, changed new file integration ↵Ananya Sen2012-02-08
| | | | | | | | | | | | | | | | | | with io mediator Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | changes to show document dirty indicator on editing code view, and to remove ↵Ananya Sen2012-02-05
| | | | | | | | | | | | | | | | | | dirty indicator on save. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | added editor tab save while switching code view tabs,Ananya Sen2012-02-03
| | | | | | | | | | | | | | | | | | integrated new file dialog with io mediator to open the new file in a new tab Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | refactoring some file names and locations,Ananya Sen2012-02-02
| | | | | | | | | | | | | | | | | | change made to maintain only one codemirror div. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | changes to open multiple code view tabs and switch between the code views, ↵Ananya Sen2012-02-02
| | | | | | | | | | | | | | | | | | added nj-skinned css class for the buttons in file picker, new file dialog and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-01
| |\ \
| | * \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-31
| | |\ \
| | | * | Fixing the bread-crumb backgroundValerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixed reference to coreioapiAnanya Sen2012-02-01
| |/ / / | | | | | | | | | | | | | | | | | | | | cleaning up opening code view tabs Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * / / Merged old FileIOJose Antonio Marquez2012-01-27
| |/ /
* | | Tool Button FixesArmen Kesablyan2012-02-16
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Tool Icons : New layoutArmen Kesablyan2012-02-15
| |/ |/| | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Integrate breadcrumb component and layer handling codeJonathan Duran2012-02-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Fixing the bread-crumb backgroundValerio Virgillito2012-02-01
|/ | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 16:42:39 +0000