aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into minorFixes_7.1Eric Guzman2012-08-20
|\
| * Allow rectangle and oval shapes to be created with 0 px stroke size. Line sha...v0.7.2Nivesh Rajbhandari2012-08-15
| * Merge branch 'IKNinja_1892' of https://github.com/mqg734/ninja into v0.7.2Valerio Virgillito2012-08-09
| |\
| | * IKNinja_1892 - [3D] Multiple objects fly off screen when translating in Z-axis.Nivesh Rajbhandari2012-08-08
| * | Merge branch 'Document' of https://github.com/joseeight/ninja into v0.7.2Valerio Virgillito2012-08-09
| |\ \
| | * | Fix: Adding browser check to implement fix for deprecated array/blob APIsJose Antonio Marquez2012-08-09
| | * | Fix: Using array buffer views for deprecated APIsJose Antonio Marquez2012-08-08
| * | | Merge pull request #426 from mqg734/LineInCanvasValerio Virgillito2012-08-07
| |\ \ \
| | * \ \ Merge branch 'refs/heads/ninja-mqg734-master' into LineInCanvasNivesh Rajbhandari2012-08-07
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Support line shape drawing inside existing canvases.Nivesh Rajbhandari2012-07-25
| * | | | Merge branch 'Document' of https://github.com/joseeight/ninja into v0.7.2Valerio Virgillito2012-08-07
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix: Added support for code/design view switching for banner templatesJose Antonio Marquez2012-08-06
| | * | | Fix: CSS issue with resizer backgroundJose Antonio Marquez Russo2012-08-02
| | | |/ | | |/|
| * | | fixing a few issues when switching between code view documentsValerio Virgillito2012-08-01
| * | | fixing the panels being disabled when going from code to design view in multi...Valerio Virgillito2012-08-01
| |/ /
* | | CSS Panel - Add some padding to editable valuesEric Guzman2012-08-15
* | | CSS Panel - Fix layout when editing long CSS values.Eric Guzman2012-08-15
|/ /
* | 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
|\|
| * 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
| | |/ /
* | | | 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
|\| | |
| * | | removing console logValerio Virgillito2012-07-24
| * | | Merge branch 'TextTool-Color' of https://github.com/dhg637/ninjaValerio Virgillito2012-07-24
| |\ \ \ | | |/ / | |/| |
| | * | Text Tool Color Change FixArmen Kesablyan2012-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 'TimelineUber' of https://github.com/imix23ways/ninjaValerio Virgillito2012-07-24
| |\ \ \
| | * | | Remove console logsJonathan Duran2012-07-24
| | * | | FIX IK-1485Jonathan Duran2012-07-24
* | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
|\| | | |
| * | | | jshint cleanup on the tools directoryValerio Virgillito2012-07-24
* | | | | New: Adding method to display document in code viewJose Antonio Marquez Russo2012-07-23