aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-04
|\
| * Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\
| * | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| * | Presets Controller - Remove unused method callEric Guzman2012-03-30
| * | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\ \
| * | | Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
* | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-04
|\ \ \ \ | | |_|/ | |/| |
| * | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | |/ | |/|
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
|\| |
| * | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \
| | * \ Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\ \
| | * \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \
| | * \ \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \ \
| | * | | | | revert to using the angle without flipping its sign...fixing some minor bugs ...Pushkar Joshi2012-03-20
| | * | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| | |\ \ \ \ \
| | * | | | | | update values in the PI from values of the selected brush stroke or pen tool ...Pushkar Joshi2012-03-15
| | * | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| | |\ \ \ \ \ \
| | * | | | | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| * | | | | | | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| * | | | | | | | Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Presets Panel - Adding presets controller and removing functionality from pan...Eric Guzman2012-03-22
| | | |/ / / / | | |/| | | |
| * | | | | | Reverting change for IKNinja-1355 because it is causing line tool to fail.Nivesh Rajbhandari2012-03-27
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\ \ \ \ \
| | * | | | | Fix: IKNINJA-1355Jose Antonio Marquez2012-03-26
| | |/ / / /
| * | | | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| * | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-23
| |\ \ \ \ \
| | * | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ...Nivesh Rajbhandari2012-03-23
| | * | | | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| * | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-22
| |\| | | | |
| | * | | | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| * | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-22
| |\| | | | |
| | * | | | | Changes to the webrequest blocking and adding a google.com permission workaroundValerio Virgillito2012-03-21
| * | | | | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| |/ / / / /
| * | | | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| |\ \ \ \ \
| | * | | | | Removing usage of webRequest APIsJose Antonio Marquez2012-03-21
| | |/ / / /
| * | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-21
| |\ \ \ \ \
| | * | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| | * | | | | fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Support button control in Properties Panel and use them for edit fill and str...Nivesh Rajbhandari2012-03-20
| | * | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | | |_|/ | | |/| |
| * | | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| * | | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to "z...Valerio Virgillito2012-03-17
| * | | | fixing the map styles and temporary disabling the 3d styles for elements.Valerio Virgillito2012-03-17
| |/ / /
* | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-16
|\| | |
| * | | IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16
| * | | Removing the name attribute from the PI. Fixing the ID and Class attribute fr...Valerio Virgillito2012-03-14
| | |/ | |/|
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-14
|\| |