aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
|\
| * Merge pull request #156 from mayhewinator/WorkingBranchValerio Virgillito2012-04-04
| |\
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-04-04
| | |\ | | |/ | |/|
| | * removed unnecessary call to exportMaterials from init(). this call should not...John Mayhew2012-04-04
| | * Removed the dependence on an "assets" directory for the RDGE runtime. Now Nin...John Mayhew2012-04-03
| | * removed old unused import and export functions.John Mayhew2012-04-03
| | * Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| | * updated the rdge compiled version and its runtime, incremented rdge library v...John Mayhew2012-04-03
| | * fixed remaining namespace bugs ensuring the use of the RDGE namespace everywh...John Mayhew2012-04-03
| | * removed unnecessary files from the RDGE build.John Mayhew2012-04-03
| | * added the Closure compiler to the gitignore file so we wouldn't track it in s...John Mayhew2012-04-03
| | * Made use of semicolons consistent and updated new files to use the new RDGE n...John Mayhew2012-04-03
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-04-02
| | |\
| | * | Recompiled RDGE and put index.html back to loading the compiled version of RDGEJohn Mayhew2012-04-02
| | * | Fixed compiler warningsJohn Mayhew2012-04-02
| | * | -Namespaced all RDGE javascript.John Mayhew2012-04-02
* | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
|\| | |
| * | | Merge pull request #154 from mqg734/ToolFixesValerio Virgillito2012-04-04
| |\ \ \
| | * | | Need to set elementModel.isIn2DSnapCache flag to false when removing element ...Nivesh Rajbhandari2012-04-04
| * | | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ \ \
| | * | | | Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\| | |
| | * | | | Bug #1060: Fixed CSS Lint issueArmen Kesablyan2012-03-30
| | * | | | Bug Fix: Height and width of panels not be keptArmen Kesablyan2012-03-29
| | * | | | Resizing BugsArmen Kesablyan2012-03-29
| | * | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| * | | | | Merge pull request #150 from ericguzman/PresetsPIValerio Virgillito2012-04-04
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | |_|_|/ | |/| | |
| * | | | Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ \ \ \
| | * | | | - using clipboard data directly to avoid using setTimeoutAnanya Sen2012-03-30
| | * | | | detect paste from context menu for new file and save as dialogAnanya Sen2012-03-28
| | * | | | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menuAnanya Sen2012-03-28
| | | |/ / | | |/| |
| * | | | Merge pull request #151 from ericguzman/CSSPanel_AnimationDurationFixValerio Virgillito2012-03-30
| |\ \ \ \
| | * | | | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| |/ / / /
| | | * | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| | | * | Presets Controller - Remove unused method callEric Guzman2012-03-30
| | | * | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
* | | | | removing some of the button propertiesValerio Virgillito2012-03-30
* | | | | Merge branch 'components' of github.com:mencio/ninja-internal into componentsValerio Virgillito2012-03-30
|\ \ \ \ \
| * | | | | completing the component simple piValerio Virgillito2012-03-30
* | | | | | completing the component simple piValerio Virgillito2012-03-30
|/ / / / /
* | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
* | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
|\| | | |
| * | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\ \ \
| | * | | | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \ \
| | * | | | | File IO for the brush stroke AND changing the data type of brush stroke from ...Pushkar Joshi2012-03-27
| | * | | | | add a setfillcolor to brush stroke so the default fillcolor handler does not ...Pushkar Joshi2012-03-27