aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Fixing body's default styles.Nivesh Rajbhandari2012-05-04
| * | | | | | | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| |\| | | | | | | | | |
| | * | | | | | | | | | Clean up, ready for alpha check-inJose Antonio Marquez2012-05-03
| | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Full CSS support on openJose Antonio Marquez2012-05-03
| | * | | | | | | | | | | Reloading local stylesheetsJose Antonio Marquez2012-05-03
| | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-02
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Adding hack to allow for blank documents to openJose Antonio Marquez2012-05-02
| | * | | | | | | | | | | | Switching DOM Mutation Events to HTML5Jose Antonio Marquez2012-05-02
| | * | | | | | | | | | | | Partial URL parsingJose Antonio Marquez2012-05-02
| | * | | | | | | | | | | | Preliminary Open File (new template)Jose Antonio Marquez2012-05-02
| | * | | | | | | | | | | | More clean up, updating menu itemsJose Antonio Marquez2012-05-01
| | * | | | | | | | | | | | Fixing bindings to new modelJose Antonio Marquez2012-05-01
| | * | | | | | | | | | | | Cleaning up templateJose Antonio Marquez2012-05-01
| | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
| | * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Setting up new architecture for I/OJose Antonio Marquez2012-05-01
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Clean upJose Antonio Marquez2012-04-19
| * | | | | | | | | | | | | | | | | | Removed special-casing for new template workflow. Instead, we will enforce a...Nivesh Rajbhandari2012-05-04
| * | | | | | | | | | | | | | | | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags.Nivesh Rajbhandari2012-05-04
* | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | Add color to tag toolValerio Virgillito2012-05-15
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge pull request #219 from mqg734/TreeFixValerio Virgillito2012-05-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| | | * | | | | | | | | | | | | | | | Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| | |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Converting canvas runtime to use prototypes for geom obj, rectangle, oval and...Nivesh Rajbhandari2012-05-03
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| | * | | | | | | | | | | | | | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | -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
| * | | | | | | | | | | | | | | |