aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | - fix for current line highlighting for version 2.23Ananya Sen2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - changes to not show autocomplete dropdown for brackets Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | upgrading to CodeMirror 2.23, since it has an important fix to Not close ↵Ananya Sen2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja, if backspace is pressed while autocomplete dropdown is open. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | -styled the autocomplete dropdownAnanya Sen2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - trigger autocomplete automatically Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | adding basic autocompleteAnanya Sen2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Ananya Sen2012-03-28
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Codeview-improvements
| | * | | | | | | | | | | - Highlight Matching bracketAnanya Sen2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Highlight selection matched -Highlight current line Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | | Merge pull request #191 from imix23ways/TimelineUberValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | / / | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | Timeline uber
| | * | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-01
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Timeline: bug fix: disable bread crumb setlevel.Jon Reid2012-04-30
| | | | | | | | | | | | |
| | | * | | | | | | | | | Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
| | | | | | | | | | | | |
| | | * | | | | | | | | | Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| * | | | | | | | | | | minor formattingValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | Merge branch 'Master-Dom-Manipulation' of ↵Valerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | https://github.com/ntfx47/ninja-internal
| | * | | | | | | | | | Dom ManipulationKruti Shah2012-05-03
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | | | Merge pull request #186 from mqg734/StageWebTemplateValerio Virgillito2012-05-02
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | More grid drawing fixes for new web template workflow. Also, adding back ability to draw when working plane changes.
| | * | | | | | | | | Support drawing in side and top view. Also, adding back support for drawing ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Draw a red outline around the stage for reference when rotating stage.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Offset side and top working planes by half the stage width/height.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Merge pull request #184 from mqg734/StageWebTemplateValerio Virgillito2012-05-01
| |\| | | | | | | | | | | |/ / / / / / / / | |/| | | | | | | | Get working plane grid to draw for new stage web template workflow.
| | * | | | | | | | webTemplate var gets reset to false, so must check for new stage template ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/ninja-internal' into StageWebTemplateNivesh Rajbhandari2012-05-01
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Removing some console logsValerio Virgillito2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Squashed commit of stage architectureValerio Virgillito2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Canvas interaction
| | * | | | | | | added a console.log to show the working plane during a draghwc4872012-04-27
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canvas-interaction
| | * | | | | | | | Creating shapes in a containerhwc4872012-04-27
| | | | | | | | | |
| | * | | | | | | | canvas interactionhwc4872012-04-26
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | |