aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-mqg734-master' into LineInCanvasNivesh Rajbhandari2012-08-07
|\
| * Merge pull request #423 from joseeight/Chrome21FixesValerio Virgillito2012-07-31
| |\
| | * Fix: Replacing deprecated blobBuilderJose Antonio Marquez Russo2012-07-31
| |/
| * Merge pull request #422 from joseeight/DocumentValerio Virgillito2012-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
| | * Merge pull request #47 from ananyasen/DocumentJose Antonio Marquez Russo2012-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
| | |/
| | * Merge pull request #46 from mencio/document-switchJose Antonio Marquez Russo2012-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 pull request #45 from mencio/document-switchJose Antonio Marquez Russo2012-07-24
| | |\
| | | * Merge branch 'document-switch' of github.com:mencio/ninja into document-switchValerio Virgillito2012-07-24
| | | |\
| | | | * adding a viewIdentifier to the model to enable design/code switchValerio Virgillito2012-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
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #43 from mencio/DocumentJose Antonio Marquez Russo2012-07-18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | New: Added switching view functionality to document UIJose Antonio Marquez2012-07-16
| | * | | | | | | | | | | | | | | | | New: Adding switch view methodJose Antonio Marquez2012-07-16