aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into minorFixes_7.1Eric Guzman2012-08-20
|\
| * fixing the panels being disabled when going from code to design view in multi...Valerio Virgillito2012-08-01
* | CSS Panel - Add some padding to editable valuesEric Guzman2012-08-15
* | CSS Panel - Fix layout when editing long CSS values.Eric Guzman2012-08-15
|/
* Merge branch 'TimelineUber' of https://github.com/imix23ways/ninjaValerio Virgillito2012-07-24
|\
| * Remove console logsJonathan Duran2012-07-24
| * FIX IK-1485Jonathan Duran2012-07-24
* | Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninjaValerio Virgillito2012-07-23
|\ \ | |/ |/|
| * Merge branch 'refs/heads/master' into fixes_7.1Eric Guzman2012-07-20
| |\
| * | CSS Panel - Fix updating when media changes, sheets are deleted.Eric Guzman2012-07-20
| * | Style Sheets - Show dirty marker when editing media attributeEric Guzman2012-07-18
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1Eric Guzman2012-07-18
| |\ \
| * | | CSS Panel - Handle media attribute changesEric Guzman2012-07-17
| * | | Styles Controller - Re-add dirty event. Add data- attribute to keep created s...Eric Guzman2012-07-17
* | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-23
|\ \ \ \
| * \ \ \ Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Restrict materials popup to appear within our page.Nivesh Rajbhandari2012-07-19
* | | | | The zoom slider resets.Commented some codeKruti Shah2012-07-20
* | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
|\| | | |
| * | | | Merge branch 'timeline-play' of https://github.com/mencio/ninjaValerio Virgillito2012-07-19
| |\ \ \ \
| | * | | | Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
| | |/ / /
| * | | | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
| | * | | Re-added Radial Blur and Raiders materialshwc4872012-07-19
| * | | | Squashed commit of the following:Nivesh Rajbhandari2012-07-19
| |/ / /
* | | | Improve keyframe selection by moving playhead marker to lower z-indexJonathan Duran2012-07-19
* | | | FIx 3D animation workflowJonathan Duran2012-07-19
* | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-19
|\ \ \ \ | |/ / / |/| | |
| * | | The zoom slider position remembered between multi doc switchKruti Shah2012-07-18
* | | | fixing the copyrights on the timeline branch pull request.Valerio Virgillito2012-07-18
|/ / /
* | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-18
|\ \ \ | | |/ | |/|
| * | Fix: IKNINJA-1935 - Chips handling alpha 0 valuesJose Antonio Marquez2012-07-17
| |/
* | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-17
|\ \
| * | Multi Doc Zoom Slider HandlingKruti Shah2012-07-17
* | | Timeline: Possible fix for new file/new style crash problem.Jon Reid2012-07-17
|/ /
* | Timeline: Style zoom slider.Jon Reid2012-07-17
* | Timeline: Bug fix: Now able to add first keyframe to an element usingJon Reid2012-07-17
* | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
|\|
| * Removed the shaders that we do not have rights to.hwc4872012-07-10
| * fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| * Normalize HTML DOCTYPEKris Kowal2012-07-09
| * BSD LicenseKris Kowal2012-07-09
| * Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
| |\
| | * Normalize HTML doctypeKris Kowal2012-07-06
| | * Remove byte order markers (BOM)Kris Kowal2012-07-06
| | * Remove trailing spacesKris Kowal2012-07-06
| | * Remove trailing spacesKris Kowal2012-07-06
| | * Expand tabsKris Kowal2012-07-06
| * | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
| |\|
| * | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09