aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
|\
| * Timeline: bug fix: command-click now works for multi selecting layers on Macs...Jon Reid2012-06-25
| * Timeline: Bug fix IKNINJA-1812, "Easing option switches to NoneJon Reid2012-06-25
| * Timeline: CSS fixes.Jon Reid2012-06-25
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
|\ \
| * \ Merge pull request #326 from mqg734/ReclaimStagePaddingValerio Virgillito2012-06-25
| |\ \
| | * | When reclaiming stage's negative scroll padding, we need to use the template'...Nivesh Rajbhandari2012-06-25
| | * | Reclaim negative padding when moving items back into positive direction.Nivesh Rajbhandari2012-06-21
| * | | Merge pull request #333 from mencio/IKNINJA-1394Valerio Virgillito2012-06-25
| |\ \ \
| | * | | Fixing our textfield component to support binding. Fix for IKNINJA-1394Valerio Virgillito2012-06-22
| * | | | Merge pull request #332 from mqg734/ViewPortHackValerio Virgillito2012-06-25
| |\ \ \ \
| | * | | | Make stage transparent when rotating/zooming templates and draw an outline ar...Nivesh Rajbhandari2012-06-22
| * | | | | Merge pull request #334 from joseeight/FileIOValerio Virgillito2012-06-25
| |\ \ \ \ \
| | * | | | | Support for browser escaped file paths (CSS)Jose Antonio Marquez2012-06-23
| | * | | | | Adding soft resetJose Antonio Marquez2012-06-23
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-22
| | |\| | | |
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-22
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-21
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-21
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-20
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-20
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-19
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-15
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-15
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #330 from ericmueller/MaterialBugFixesValerio Virgillito2012-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | fixed a small startup issue with the RDGE library.hwc4872012-06-22
| | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Timeline Bug fixesJonathan Duran2012-06-26
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-25
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #331 from mencio/picasa-fixValerio Virgillito2012-06-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | fixing the size of the picasa imagesValerio Virgillito2012-06-22
| | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge pull request #324 from mqg734/StageGuidesValerio Virgillito2012-06-22
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Display "(0, 0)" where the origin is.Nivesh Rajbhandari2012-06-22
| | | * | | | | | | | | | Have to guard against cases when stage lines are parallel to the canvas and t...Nivesh Rajbhandari2012-06-22
| | | * | | | | | | | | | IKNINJA-1720 - Object in a document erases 3D grid in other document when swi...Nivesh Rajbhandari2012-06-21
| | | * | | | | | | | | | Draw stage left and top references lines.Nivesh Rajbhandari2012-06-21
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Merge pull request #327 from mencio/component-fixesValerio Virgillito2012-06-22
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fixed issue with Youtube not updating after save and Picasa bacgroundValerio Virgillito2012-06-21
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| * | | | | | | | | | Timeline Fix - reopen subprop keyframes for Position and Size correctlyJonathan Duran2012-06-25
| * | | | | | | | | | Timeline fix - remove unneeded bindingJonathan Duran2012-06-22
| * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefixJonathan Duran2012-06-22
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #320 from ananyasen/cut-copy-pasteValerio Virgillito2012-06-21
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | removed some redundantsAnanya Sen2012-06-21
| | | * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
| | | |\| | | | | | |
| | | * | | | | | | | - added io api to generate file from binaryAnanya Sen2012-06-21
| | | * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Notify for adding multiple elements together, to fix IKNINJA-1775 [Drawing a ...Ananya Sen2012-06-20
| | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | adding some error handlingAnanya Sen2012-06-19