aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* CSS Panel - Rule list - remove old update codeEric Guzman2012-05-10
|
* CSS Panel - fix issue with hover/scroll to topEric Guzman2012-05-10
|
* CSS Panel - Fix errors from new Montage and remove logs.Eric Guzman2012-05-10
|
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
|\ | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-05-09
| |\
| | * Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| | |\ | | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eve...
| | | * Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| | | |
| * | | some code cleanupValerio Virgillito2012-05-09
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Squashed commit of google-components into masterValerio Virgillito2012-05-09
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-08
| |\ \ | | | | | | | | | | | | Snapping
| | * | IKNINJA-1603Ananya Sen2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | Uncaught TypeError: Cannot read property 'documentRoot' of null js/components/layout/bread-crumb.reel/bread-crumb.js:26 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | fixed javascript errorsAnanya Sen2012-05-07
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | fixes for 2D and 3D translation.hwc4872012-05-07
| |/ /
| * | Fixing the color popupValerio Virgillito2012-05-04
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing the currentContainerValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \
| | * \ \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ \
| | * | | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | code cleanupValerio Virgillito2012-05-02
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Fixing the lock button cssValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Code reformattingValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
| | |\ \ \ \ | | | | | | | | | | | | | | submitting project : Code Editor Improvements [Phase 1]
| | | * | | | using prototype in the serializationAnanya Sen2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-02
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | removing format button for now until fully implementedAnanya Sen2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | disable format button for nowAnanya Sen2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | added copyrightsAnanya Sen2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | set up different activeline colors for different themesAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | added shortkeys for commenting and uncommentAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | IKNINJA-1562 : override font-size for some themes to allow xoomingAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | IKNINJA-1537 - don't show code hinting for ctrl+SAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1568 - code hinting not supported for son files Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | added key shortcuts' list dropdown in view option barAnanya Sen2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | increasing z-indem of code hinting dropdown to appear above the disabled panelsAnanya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | IKNINJA-1534: don't show code hinting automatically, when word removed via ↵Ananya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backspaces Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | removing debuggerAnanya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | IKNINJA-1551 - added editor support for other