aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\
| * Merge pull request #244 from joseeight/DocumentValerio Virgillito2012-05-17
| |\
| | * Sharing app data in banner and html templatesJose Antonio Marquez2012-05-17
| * | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Valerio Virgillito2012-05-17
| |\|
| | * Merge pull request #243 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-17
| | |\
| | | * Fixed chrome preview for banner templates.Nivesh Rajbhandari2012-05-17
| | | * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-17
| | | |\ | | | |/ | | |/|
| | | * Adding default padding for banner templates.Nivesh Rajbhandari2012-05-17
| * | | fixing the breadcrumbValerio Virgillito2012-05-17
| |/ /
| * | Merge pull request #242 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-17
| |\|
| | * IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into can...Nivesh Rajbhandari2012-05-17
| * | Adding a disabled property to the label-checkbox.Valerio Virgillito2012-05-17
| * | document controller and stage view code cleanupValerio Virgillito2012-05-16
| * | code cleanup and refactoring of the document controller and stage viewValerio Virgillito2012-05-16
| * | clearing the needs save flag on save.Valerio Virgillito2012-05-16
| * | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Valerio Virgillito2012-05-16
| |\ \
| | * \ Merge pull request #241 from joseeight/DocumentValerio Virgillito2012-05-16
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | | |\ | | | |/ | | |/|
| | | * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | | |\
| | | * | Fixing serialization referencing (new object per save)Jose Antonio Marquez2012-05-16
| | | * | Fixing reference to serialization tagJose Antonio Marquez2012-05-16
| | | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | | |\ \
| | | * | | Adding basic montage components I/OJose Antonio Marquez2012-05-16
| * | | | | Timeline should not select an element when a layer is selected by code.Valerio Virgillito2012-05-16
| |/ / / /
| * | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| |\ \ \ \
| | * \ \ \ Merge pull request #239 from mayhewinator/WorkingBranchValerio Virgillito2012-05-16
| | |\ \ \ \
| | | * | | | fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
| | | * | | | -added new images for the text tool optionsJohn Mayhew2012-05-15
| | | * | | | updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | | * | | | Merge pull request #1 from mencio/WorkingBranchmayhewinator2012-05-15
| | | |\ \ \ \
| | | | * | | | Add color to tag toolValerio Virgillito2012-05-15
| | | |/ / / /
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | | * | | | -changed tool options radio button class to match the styling of the shape op...John Mayhew2012-05-14
| | | * | | | -updated images for tag and zoom toolJohn Mayhew2012-05-14
| | | * | | | fixed bug introduced when we removed the color toolbar. The styling of the co...John Mayhew2012-05-11
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-10
| | | |\ \ \ \
| | | * | | | | put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
| | | * | | | | removed unnecessary css classJohn Mayhew2012-05-10
| | | * | | | | -moved sel tool images to proper folderJohn Mayhew2012-05-10
| | | * | | | | -Consolidated many redundant css classes used in the tool options barsJohn Mayhew2012-05-09
| | | * | | | | Correct layout and styling for the shape tool and its sub toolsJohn Mayhew2012-05-09
| | | * | | | | -Put new selection tool icons in the options barJohn Mayhew2012-05-09
| | | * | | | | implemented proper styling for shape, inkbottle and fill toolsJohn Mayhew2012-05-08
| | | * | | | | removed unused classes form selection properties reelJohn Mayhew2012-05-08
| | | * | | | | Moved out old select tool image css classes into the proper css file.John Mayhew2012-05-08
| | | * | | | | moved all tag tool css back into the scss fileJohn Mayhew2012-05-08
| | | * | | | | -Removed id dependence of the tag tool options CSSJohn Mayhew2012-05-08
| | | * | | | | Removed unused SubSelect ToolJohn Mayhew2012-05-08
| | | * | | | | Fixed missing quote from last mergeJohn Mayhew2012-05-07