aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
* Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
|\
| * 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
| |\ \ \ | | |/ / | |/| / | | |/
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\ \
| * \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \
| * | | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| * | | | | Updated ink bottle tool to use new setColor routine in the mediator and contr...Nivesh Rajbhandari2012-02-13
* | | | | | local storage integration and versioningValerio Virgillito2012-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
|\| | | |
| * | | | Chrome PreviewJose Antonio Marquez2012-02-17
* | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-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
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-14
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into in...Valerio Virgillito2012-02-14
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into int...Valerio Virgillito2012-02-14
| | |\ \ \ \ \ \
| * | | | | | | | Adding more components piValerio Virgillito2012-02-15
| * | | | | | | | fixing the controller to handle all propertiesValerio Virgillito2012-02-14
| * | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-14
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Setting defaults and more cleanupValerio Virgillito2012-02-09
| * | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-09
| |\ \ \ \ \ \ \