aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Fixing app mode check.Valerio Virgillito2012-02-23
* Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\
| * Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ex...John Mayhew2012-02-22
* | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\ \
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| |\|
| * | Fixing eyedropper tool to get color from image data. This required us to work...Nivesh Rajbhandari2012-02-22
* | | Do not use color object for stage's border since we don't allow users to modi...Nivesh Rajbhandari2012-02-22
* | | Color chips expect a color object, not a css value.Nivesh Rajbhandari2012-02-22
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\ \ \ | |/ / |/| / | |/
| * user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| * Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-21
| |\
| | * enabling nested selectionValerio Virgillito2012-02-20
| | * Removing the log of the url requestsValerio Virgillito2012-02-20
| * | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| * | Revert "check cloud availability before open file picker and new file dialogs"Ananya Sen2012-02-21
| * | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-20
| |\ \
| | * \ Merge pull request #11 from ericguzman/StylesControllerUpdatesJose Antonio Marquez Russo2012-02-20
| | |\ \
| | | * \ Merge branch 'StylesControllerUpdates' of github.com:ericguzman/ninja-interna...Eric Guzman2012-02-20
| | | |\ \
| | | | * | Styles controller - Check for element's window object before querying for mat...Eric Guzman2012-02-20
| | | | |/
| | | * / Styles Controller -Fix invalid variable reference when looking for element's ...Eric Guzman2012-02-20
| | | |/
| | * | Clean up and repairing manifestJose Antonio Marquez2012-02-19
| * | | check cloud availability before open file picker and new file dialogsAnanya Sen2012-02-20
| * | | - moved tools specific keyboard controls for desing view onlyAnanya Sen2012-02-20
| |/ /
| * | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-18
| |\|
| * | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
| |\ \
| * | | changed the document dirtying logic to be done in the feature that edits the ...Ananya Sen2012-02-17
| * | | -added keyboard control for saving documentsAnanya Sen2012-02-17
| * | | fixes to document tabbingAnanya Sen2012-02-15
| * | | Revert "Revert "Reverting text/html document classes and setting up MVC folde...Ananya Sen2012-02-15
| * | | Revert "Revert "Cleaning up""Ananya Sen2012-02-15
| * | | Revert "Revert "Merging TextDocument into BaseDocument""Ananya Sen2012-02-15
| * | | Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is break...Ananya Sen2012-02-15
| * | | merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking open...Ananya Sen2012-02-15
| * | | Revert "Merging TextDocument into BaseDocument"Ananya Sen2012-02-15
| * | | Revert "Cleaning up"Ananya Sen2012-02-15
| * | | Revert "Reverting text/html document classes and setting up MVC folder struct...Ananya Sen2012-02-15
* | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
|\ \ \ \ | | |_|/ | |/| |
| * | | Chrome PreviewJose Antonio Marquez2012-02-17
| | |/ | |/|
| * | Adding webRequest redirects for iFrame templatesJose Antonio Marquez2012-02-17
| * | Adding Chrome webRequest interceptJose Antonio Marquez2012-02-17
| * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| |\ \
| | * | Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| | * | Squashed commit of the following:Jose Antonio Marquez2012-02-16
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| | |\ \ | | | |/ | | |/|
| | * | Reverting text/html document classes and setting up MVC folder structureJose Antonio Marquez2012-02-14
| | * | Merging TextDocument into BaseDocumentJose Antonio Marquez2012-02-14
| | * | Cleaning upJose Antonio Marquez2012-02-14
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
| | |\ \
| | * | | Cleaning up mediatorJose Antonio Marquez2012-02-14
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
| | |\ \ \