aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-19
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Tests and clean-upJose Antonio Marquez2012-03-18
| | * | | | | | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-18
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
| | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe...Eric Guzman2012-03-20
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Presets - Animation updateEric Guzman2012-03-20
| * | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| * | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| * | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Maps - Apply default width and height styles to components if specified. Chan...Nivesh Rajbhandari2012-03-19
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | looping through both branches of the components treeValerio Virgillito2012-03-18
| * | | | | | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| * | | | | | | | | | Youtube video is droppableFrançois Frisch2012-03-17
| * | | | | | | | | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
| * | | | | | | | | | 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
| * | | | | | | | | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| * | | | | | | | | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
| * | | | | | | | | | Adding components to PIFrançois Frisch2012-03-17
| * | | | | | | | | | Deleting unecessary propertyFrançois Frisch2012-03-17
| * | | | | | | | | | Getting ownerComponent bindingsFrançois Frisch2012-03-17
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal int...Jonathan Duran2012-03-27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Timeline : Zoom Slider StylingKruti Shah2012-03-27
| * | | | | | | | | | Timeline : Breadcrumb FixKruti Shah2012-03-26
| * | | | | | | | | | Timeline : Adding Zoom SliderKruti Shah2012-03-26
* | | | | | | | | | | Timeline: Change dragIcon to be a data-uri.Jon Reid2012-03-26
* | | | | | | | | | | Timeline: Drag and Drop of layers.Jon Reid2012-03-26
* | | | | | | | | | | Remove console logsJonathan Duran2012-03-26
* | | | | | | | | | | Fix bug with track properties getting over writtenJonathan Duran2012-03-26
|/ / / / / / / / / /
* | | | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
* | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Timeline: First integration of drag and drop of layers.Jon Reid2012-03-21
| * | | | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed conso...Jon Reid2012-03-21
| * | | | | | | | | | Fix: Change click handler to mousedown for better responsiveness in layer sel...Jon Reid2012-03-21
| * | | | | | | | | | Timeline: fix layer and style select problems.Jon Reid2012-03-20
| * | | | | | | | | | Timeline: Re-enable adding/removing styles to layers. New methods in Timeline...Jon Reid2012-03-19
* | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-21
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ...Ananya Sen2012-03-16
| | |/ / / / / / /