aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-mqg734-master' into LineInCanvasNivesh Rajbhandari2012-08-07
|\
| * Fix: Replacing deprecated blobBuilderJose Antonio Marquez Russo2012-07-31
| * Fix: Making correct check, was checking wrong objectJose Antonio Marquez2012-07-31
| * Fix: Enabling preview from code viewJose Antonio Marquez2012-07-31
| * Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-25
| |\
| | * fixing uppercase name.Valerio Virgillito2012-07-25
| * | adding null check for currentDocument to prevent errorAnanya Sen2012-07-25
| * | fixing code editor double vertical scrollbar bugAnanya Sen2012-07-25
| * | added save for code view, fixed code view editor bug, reuse code editor optio...Ananya Sen2012-07-25
| * | added save for code view, fixed code view editor bug, reuse code editor optio...Ananya Sen2012-07-25
| * | design/code view switching for stage and menuValerio Virgillito2012-07-25
| * | Merge branch 'refs/heads/Ninja-master' into DocumentJose Antonio Marquez Russo2012-07-24
| |\|
| * | adding a viewIdentifier to the model to enable design/code switchValerio Virgillito2012-07-24
| * | Update: Copying libraries to disk on switching viewsJose Antonio Marquez2012-07-24
| * | New: Adding logic to insert code view save method(s)Jose Antonio Marquez2012-07-24
| * | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
| |\ \
| * | | New: Adding method to switch from code to design viewJose Antonio Marquez2012-07-24
| * | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
| |\ \ \ \
| * | | | | New: Adding method to display document in code viewJose Antonio Marquez Russo2012-07-23
| * | | | | In Progress: Cleaning up mergeJose Antonio Marquez Russo2012-07-23
| * | | | | Merge pull request #44 from ananyasen/DocumentJose Antonio Marquez Russo2012-07-23
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/Jose-Document' into DocumentAnanya Sen2012-07-23
| | |\ \ \ \ \
| | * | | | | | show design code editor - first cutAnanya Sen2012-07-23
| | * | | | | | parameterize the parentContainer for text documentAnanya Sen2012-07-18
| * | | | | | | Merge branch 'refs/heads/Ninja-master' into DocumentJose Antonio Marquez Russo2012-07-23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Preview button: enabling the entire button to handle a mouse clickValerio Virgillito2012-07-18
| * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | New: Adding re-render method to switching viewJose Antonio Marquez2012-07-17
| * | | | | | | | | | | | | | | | | New: Added switching view functionality to document UIJose Antonio Marquez2012-07-16
| * | | | | | | | | | | | | | | | | New: Adding switch view methodJose Antonio Marquez2012-07-16
* | | | | | | | | | | | | | | | | | Support line shape drawing inside existing canvases.Nivesh Rajbhandari2012-07-25
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninjaValerio Virgillito2012-07-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Updated manifest.json, page title, about box and splash screen to indicate th...John Mayhew2012-07-24
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'IKNinja_1980' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | IKNinja-1980 - [Shape] changing the stroke size of the object doesn't update ...Nivesh Rajbhandari2012-07-24
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'IKNinja_1974' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | IKNinja-1974 - Bounding box gets separated from elements when zooming in/out ...Nivesh Rajbhandari2012-07-24
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | removing console logValerio Virgillito2012-07-24