aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
|\
| * Fixing bindings to new modelJose Antonio Marquez2012-05-01
* | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
|\|
| * Merge cleanupValerio Virgillito2012-04-27
| * Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
| |\
| | * Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja...Valerio Virgillito2012-04-26
| | |\
| | | * Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | * | Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
| | |/
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
| |\ \
| * | | Breadcrumb FixKruti Shah2012-04-20
| * | | BreadCrumb Bug FixKruti Shah2012-04-19
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
| |\ \ \ \
| * | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
* | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | * | | | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | * | | | initial stage web templateValerio Virgillito2012-04-18
| | | |_|/ | | |/| |
| * / | | Fixing translate handles to draw without zoom value. Also fixed some typos i...Nivesh Rajbhandari2012-04-20
| |/ / /
* | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
|\| | |
| * | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| |\ \ \ | | | |/ | | |/|
| * | | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ...Nivesh Rajbhandari2012-03-27
| | |/ | |/|
* | | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| |/ |/|
* | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
|\ \
| * | IKNINJA-1364 : fixed css so that white spaces are not collapsed while renderingAnanya Sen2012-03-22
| * | IKNINJA-1266 : restrict tab size for long file names and resize tabs on windo...Ananya Sen2012-03-22
| |/
* / Resizers updatedArmen Kesablyan2012-03-23
|/
* Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
* Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
* Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
* adding some margin to the bread crumb buttonsValerio Virgillito2012-02-28
* cleanup and fixing selecting each bread crumbValerio Virgillito2012-02-28
* breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
* Adding some missing copyrightsValerio Virgillito2012-02-24
* Fixing the breadcrumb button - removing toolbutton class since it is not a to...Valerio Virgillito2012-02-23
* Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
|\
| * Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-21
| |\
| | * cleanup of the breadcrumbValerio Virgillito2012-02-20
| * | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| |/
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\
| * | fixed undo/redo for each code view document, changed new file integration wit...Ananya Sen2012-02-08
| * | changes to show document dirty indicator on editing code view, and to remove ...Ananya Sen2012-02-05
| * | added editor tab save while switching code view tabs,Ananya Sen2012-02-03
| * | refactoring some file names and locations,Ananya Sen2012-02-02
| * | changes to open multiple code view tabs and switch between the code views, ad...Ananya Sen2012-02-02
| * | 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