aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
...
| * | | | more work on making subtool styling/layout consistentJohn Mayhew2012-05-07
| * | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| * | | | First round of moving color chips into the sub tools. Shape and Pen tool now ...John Mayhew2012-05-03
| | |_|/ | |/| |
* | | | Editable - remove formatting on pasteEric Guzman2012-05-17
* | | | CSS Panel - Fix errors from new Montage and remove logs.Eric Guzman2012-05-10
* | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
|\ \ \ \ | | |_|/ | |/| |
| * | | IKNINJA-1603Ananya Sen2012-05-08
| | |/ | |/|
| * | 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
| | |\ \
| | * | | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| | | |/ | | |/|
| * | | Removing unused components referencesValerio 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
| |\ \ \ | | | |/ | | |/|
| | * | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | * | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | |\|
| | * | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | |\ \
| | * \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
| | |\ \ \ \
| | * | | | | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| * | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| * | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \
| | * | | | | | Changing ID to Montage-ID for Color ComponentsJose Antonio Marquez2012-05-03
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #183 from mqg734/data-idValerio Virgillito2012-04-30
| |\ \ \ \ \ \
| | * | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ...Nivesh Rajbhandari2012-04-30
| * | | | | | | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| |/ / / / / /
| * / / / / / converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
| |/ / / / /
* | | | | | Panel Toolbar - Support hiding and showing of buttonsEric Guzman2012-05-03
* | | | | | CSS Panel - Add focus management to styles view delegateEric Guzman2012-05-02
* | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-30
|\| | | | |
| * | | | | Merge cleanupValerio Virgillito2012-04-27
| * | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja...Valerio Virgillito2012-04-26
| | |\ \ \ \ \
| | | * | | | | Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | |_|_|/ | | | |/| | |
| | * / | | | Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
| | |/ / / /
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\| | | |
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
| |\ \ \ \ \ \
| * | | | | | | Breadcrumb FixKruti Shah2012-04-20
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | BreadCrumb Bug FixKruti Shah2012-04-19
| * | | | | | | Timeline: Bug fix: problem with editing layers missing last letter in newJon Reid2012-04-13
| * | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-10
| |\ \ \ \ \ \ \
| | * | | | | | | Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should notJon Reid2012-04-09
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working"Jon Reid2012-04-05
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-04
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| * | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
| |\ \ \ \ \ \ \ \ \