aboutsummaryrefslogtreecommitdiff
path: root/js/data
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
|\
| * Removed unused SubSelect ToolJohn Mayhew2012-05-08
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-07
| |\
| * | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
|\ \ \ | | |/ | |/|
| * | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| |/
* | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-30
|\|
| * Added a body controllerValerio Virgillito2012-04-24
* | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
|\|
| * initial stage web templateValerio Virgillito2012-04-18
* | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
|\|
| * Merge pull request #164 from mqg734/ToolTipFixesValerio Virgillito2012-04-17
| |\
| | * IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ...Nivesh Rajbhandari2012-04-13
| * | Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
| |\|
| | * Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
| * | adding a history panelValerio Virgillito2012-04-09
| |/
* | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
|\|
| * Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\
| | * IKNinja-1410 - Inner Radius should be restricted to 99%.Nivesh Rajbhandari2012-04-02
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-05
|\| |
| * | Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
| |\ \
| | * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | |\|
| | * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
| | |\ \
| | * \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| | |\ \ \
| | * | | | Cleanup of the components panelValerio Virgillito2012-03-26
| * | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | |_|_|/ | |/| | |
* | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
|\| | | |
| * | | | Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menuAnanya Sen2012-03-28
| | | |/ | | |/|
| * | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\|
| | * | revert to using the angle without flipping its sign...fixing some minor bugs ...Pushkar Joshi2012-03-20
| | * | update values in the PI from values of the selected brush stroke or pen tool ...Pushkar Joshi2012-03-15
| | * | PI for pen and brush strokesPushkar Joshi2012-03-14
| * | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ | | |_|/ | |/| |
| | * | disable more menus if the active document is not in design viewAnanya Sen2012-03-22
| | * | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| * | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| * | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| |/ /
| * | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| * | Support button control in Properties Panel and use them for edit fill and str...Nivesh Rajbhandari2012-03-20
| |/
* / CSS Panel - Add new panel to panel dataEric Guzman2012-03-13
|/
* reverting old pi dataValerio Virgillito2012-03-09
* Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
|\
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
| |\
| * \ Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-02-29
| |\ \
| * \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-28
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-23
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-21
| |\ \ \ \ \ \