Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal int... | Jonathan Duran | 2012-03-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | Timeline : Zoom Slider Styling | Kruti Shah | 2012-03-27 | |
| | * | | | | | | | | | | | | Timeline : Breadcrumb Fix | Kruti Shah | 2012-03-26 | |
| | * | | | | | | | | | | | | Timeline : Adding Zoom Slider | Kruti Shah | 2012-03-26 | |
| * | | | | | | | | | | | | | Timeline: Change dragIcon to be a data-uri. | Jon Reid | 2012-03-26 | |
| * | | | | | | | | | | | | | Timeline: Drag and Drop of layers. | Jon Reid | 2012-03-26 | |
| * | | | | | | | | | | | | | Remove console logs | Jonathan Duran | 2012-03-26 | |
| * | | | | | | | | | | | | | Fix bug with track properties getting over written | Jonathan Duran | 2012-03-26 | |
| |/ / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | Timeline : Bug Fix : IKNINJA 1374 | Jonathan Duran | 2012-03-23 | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | Timeline: First integration of drag and drop of layers. | Jon Reid | 2012-03-21 | |
| | * | | | | | | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed conso... | Jon Reid | 2012-03-21 | |
| | * | | | | | | | | | | | | Fix: Change click handler to mousedown for better responsiveness in layer sel... | Jon Reid | 2012-03-21 | |
| | * | | | | | | | | | | | | Timeline: fix layer and style select problems. | Jon Reid | 2012-03-20 | |
| | * | | | | | | | | | | | | Timeline: Re-enable adding/removing styles to layers. New methods in Timeline... | Jon Reid | 2012-03-19 | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Fix layer order and selection on reopen | Jonathan Duran | 2012-03-16 | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOM | Jonathan Duran | 2012-03-16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'Timeline-local' into Timeline-local-2 | Jon Reid | 2012-03-16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-16 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | Timeline: Hook up data binding for changes on subproperties. | Jon Reid | 2012-03-16 | |
| | | * | | | | | | | | | | | | | | Timeline: remove comment. | Jon Reid | 2012-03-15 | |
| | | * | | | | | | | | | | | | | | Timeline: Remove selection timer on add new layer method. | Jon Reid | 2012-03-15 | |
| | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-15 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch. | Jon Reid | 2012-03-15 | |
| * | | | | | | | | | | | | | | | | | Consolidate conversion functions | Jonathan Duran | 2012-03-16 | |
| * | | | | | | | | | | | | | | | | | Cleanup | Jonathan Duran | 2012-03-16 | |
| |/ / / / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | | | Bug fix and cleanup | Jonathan Duran | 2012-03-16 | |
| * | | | | | | | | | | | | | | | | Fix layer select on selection change | Jonathan Duran | 2012-03-16 | |
| * | | | | | | | | | | | | | | | | Start enforcing one element per layer | Jonathan Duran | 2012-03-16 | |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 | |
| | * | | | | | | | | | | | | | | more backup fixes for the old stage | Valerio Virgillito | 2012-04-20 | |
| | * | | | | | | | | | | | | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 | |
| | * | | | | | | | | | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Fixed materials editor popup not refreshing correctly. | Nivesh Rajbhandari | 2012-04-16 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Squashed commit of the following: | Valerio Virgillito | 2012-04-18 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||
* / | | | | | | | | | | | - collapse panels for code view, restore for design view | Ananya Sen | 2012-04-18 | |
|/ / / / / / / / / / / | ||||
* | | | | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-17 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | Drag and drop of images and components should not add 3d values by default. | Nivesh Rajbhandari | 2012-04-16 | |
| |/ / / / / / / / / / | ||||
* | | | | | | | | | | | collapsing the history panel by default and commenting out the undo for the 3... | Valerio Virgillito | 2012-04-13 | |
* | | | | | | | | | | | setAttribute added to the undo/redo | Valerio Virgillito | 2012-04-09 | |
* | | | | | | | | | | | adding a history panel | Valerio Virgillito | 2012-04-09 | |
|/ / / / / / / / / / | ||||
* | | | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||
| * | | | | | | | | | Undoing bad auto-merge resize-composer.js. | Nivesh Rajbhandari | 2012-04-05 | |
| * | | | | | | | | | Undoing some minor spacing differences from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |