aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | | prevent extremely long path rendering (temporary fix)Pushkar Joshi2012-02-29
| | | | | | | | |
| | * | | | | | | changed the registration point of the brush tool icon andPushkar Joshi2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a temporary check to prevent extremely long brush strokes
| | * | | | | | | change in comment onlyPushkar Joshi2012-02-29
| | | | | | | | |
| | * | | | | | | resample the brush stroke so we don't have gaps if the path is drawn rapidly,Pushkar Joshi2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and, allow to change the stroke color, and, more efficient stroke rendering by drawing translated radial gradients (instead of creating new gradients for each stroke sample)
| | * | | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-28
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-24
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
| | * | | | | | | | | render the brush stroke as a sequence of rectangles, with each rectangle ↵Pushkar Joshi2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | having its own linear gradient
| | * | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-02-09
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | first phase of simple resampling to prevent tiny segmentsPushkar Joshi2012-02-09
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-29
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | integration-candidate
| * | | | | | | | | | | We need to remove color buttons from the color model when updating the PI ↵Nivesh Rajbhandari2012-02-28
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for selection change. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | putting the color panel on top when opening ninjaValerio Virgillito2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration-candidate Conflicts: js/ninja.reel/ninja.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | revert changes to the timelineValerio Virgillito2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | adding some margin to the bread crumb buttonsValerio Virgillito2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | cleanup and fixing selecting each bread crumbValerio Virgillito2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | Merge pull request #81 from ananyasen/integration-candidateValerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | persist selections while switching documents
| * | | | | | | | | | | minor fix for handling selections on switch documentAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | selection controller sets _isDocument = true if number of selections are 0, ↵Ananya Sen2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on switch document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | persist selections while switching documentsAnanya Sen2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | | Merge pull request #80 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | Adding CSS <link> attributes support to I/O
| * | | | | | | | | | | Merge branch 'refs/heads/integration-candidate' into FileIO-Build-CandidateJose Antonio Marquez2012-02-28
| |\| | | | | | | | | | | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | CSS attributesJose Antonio Marquez2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting up logic to include attributes in <link> for the <style> duplicates and add attributes created in Ninja back to <link> tag on save.
| * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-28
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'integration-candidate' of ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate
| * | | | | | | | | | Merge pull request #79 from pushkarjoshi/pentoolValerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | Pentool
| | * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: manifest.json
| | * | | | | | | | | new anchor control guide rendering (smaller handles)Pushkar Joshi2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |