aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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 eventEric Guzman2012-05-01
* | | some code cleanupValerio Virgillito2012-05-09
|/ /
* | Squashed commit of google-components into masterValerio Virgillito2012-05-09
* | Merge pull request #201 from ericmueller/SnappingValerio Virgillito2012-05-08
|\ \
| * | 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 Sna...hwc4872012-05-08
| |\ \ | |/ / |/| |
* | | Merge pull request #197 from ananyasen/code-editor-patchValerio Virgillito2012-05-08
|\ \ \
| * | | IKNINJA-1603Ananya Sen2012-05-08
| * | | fixed javascript errorsAnanya Sen2012-05-07
| * | | removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
|/ / /
| * / fixes for 2D and 3D translation.hwc4872012-05-07
|/ /
* | reverting to v0.8 flow component for the picasa carouselValerio Virgillito2012-05-04
* | Fixing the color popupValerio Virgillito2012-05-04
* | Fixing the tools list separators and document bar disabled stateValerio Virgillito2012-05-04
* | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
* | fixing the currentContainerValerio Virgillito2012-05-03
* | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
|\ \
| * \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \
| * \ \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ \
| * | | | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| * | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ \ \
| * | | | | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| * | | | | code cleanupValerio Virgillito2012-05-02
| | |_|_|/ | |/| | |
* | | | | integrating the latest montage versionValerio Virgillito2012-05-03
* | | | | Removing unused components referencesValerio Virgillito2012-05-03
* | | | | Fixing the lock button cssValerio Virgillito2012-05-03
* | | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
* | | | | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
* | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Code reformattingValerio Virgillito2012-05-03
| * | | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
| |\ \ \ \
| | * | | | using prototype in the serializationAnanya Sen2012-05-03
| | * | | | 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
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-02
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | removing format button for now until fully implementedAnanya Sen2012-05-02
| | * | | | disable format button for nowAnanya Sen2012-05-01
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | added copyrightsAnanya Sen2012-05-01
| | * | | | set up different activeline colors for different themesAnanya Sen2012-04-30
| | * | | | added shortkeys for commenting and uncommentAnanya Sen2012-04-30
| | * | | | IKNINJA-1562 : override font-size for some themes to allow xoomingAnanya Sen2012-04-30
| | * | | | IKNINJA-1537 - don't show code hinting for ctrl+SAnanya Sen2012-04-30
| | * | | | added key shortcuts' list dropdown in view option barAnanya Sen2012-04-27
| | * | | | increasing z-indem of code hinting dropdown to appear above the disabled panelsAnanya Sen2012-04-26
| | * | | | IKNINJA-1534: don't show code hinting automatically, when word removed via ba...Ananya Sen2012-04-26
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | |\ \ \ \
| | * | | | | removing debuggerAnanya Sen2012-04-26