aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tim...Jonathan Duran2012-02-06
|\
| * Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| * TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| * Tree Components - Adding the tree componentsEric Guzman2012-02-06
| * Tree Controller - Clean out unused codeEric Guzman2012-02-06
| * Tree Controller - Initial addEric Guzman2012-02-06
| * Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| * Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| * Styles Controller - Add code to remove cache items from history (not just nul...Eric Guzman2012-02-06
| * Styles Controller - First stab at group stylingEric Guzman2012-02-06
* | Change keyframe to use element mediator when repositioning animated elements ...Jonathan Duran2012-02-06
* | Fix Timeline layer resizer from being inversedJonathan Duran2012-02-06
* | Timeline: add new layers to top of stack instead of bottom.Jonathan Duran2012-02-06
* | Fix problem with resizer set to capture all webkitTransitionEnd events. Updat...Jonathan Duran2012-02-06
* | Add back keyframe selection codeJonathan Duran2012-02-06
* | Integrate breadcrumb component and layer handling codeJonathan Duran2012-02-06
* | style controller update for CSS animationsJonathan Duran2012-02-06
* | merge new timelineJonathan Duran2012-02-06
|/
* Merge pull request #15 from mqg734/ToolFixesValerio Virgillito2012-02-06
|\
| * Fixing format of for loop.Nivesh Rajbhandari2012-02-06
| * We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| * Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| * Handle delete of multiple objects. Also, have deletion go through the mediato...Nivesh Rajbhandari2012-02-03
| * Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
| * Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
| * Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\
| | * Removed border special-casing from PI since the mediator now handles this gen...Nivesh Rajbhandari2012-02-01
| | * Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | * Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | * Merge branch 'refs/heads/Jose-Color' into NiveshColorNivesh Rajbhandari2012-01-31
| | |\
| | | * IKNINJA-1083Jose Antonio Marquez2012-01-30
| * | | Merge branch 'refs/heads/master' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ \
| * | | | Update PI when element is changed by one of the tools.Nivesh Rajbhandari2012-02-02
| * | | | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
* | | | | IKNINJA-854 - removed cons and replaced it with varValerio Virgillito2012-02-03
| |/ / / |/| | |
* | | | Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
|\ \ \ \
| * | | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| * | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| * | | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-01
| * | | | Fixes for montage integrationValerio Virgillito2012-02-01
| * | | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-01
* | | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
* | | | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-02
* | | | | Fixes for montage integrationValerio Virgillito2012-02-02
* | | | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-02
* | | | | Merge branch 'issue-codeattribution' of github.com:mencio/ninja-internal into...Valerio Virgillito2012-02-02
|\ \ \ \ \
| * | | | | Switching to alternate dashed line function. Adding code attributions.Valerio Virgillito2012-02-02
| * | | | | IKNINJA-1083Jose Antonio Marquez2012-02-02
| * | | | | Fixing the bread-crumb backgroundValerio Virgillito2012-02-02
| * | | | | Checkbox and Combobox change/changing events were not setting wasSetByCode pr...Nivesh Rajbhandari2012-02-02