aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Squashed commit of the following:Jonathan Duran2012-03-14
* Fix unassigned track element on document switchJonathan Duran2012-03-13
* Timeline : Fixing deleting the layers and hash table and removing while loops...Jonathan Duran2012-03-12
* Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-12
|\
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-09
| |\
| * | Timeline: new enablePanel() method on TimelinePanel class.Jon Reid2012-03-09
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-12
|\ \ \ | |_|/ |/| |
| * | Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| * | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| * | reverting old pi dataValerio Virgillito2012-03-09
| * | Merge pull request #106 from joseeight/ColorValerio Virgillito2012-03-09
| |\ \
| | * | Temp Gradient FixJose Antonio Marquez2012-03-09
| | * | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-09
| |\ \ \
| | * \ \ Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| | |\ \ \
| | | * | | Disabled State is now darkerArmen Kesablyan2012-03-08
| | | * | | Z-Index issue of disabled state with file open dialogArmen Kesablyan2012-03-08
| | | * | | Disabled state for panelsArmen Kesablyan2012-03-07
| | | * | | Reordering and resizing now worksArmen Kesablyan2012-03-07
| | | * | | Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | | * | | Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| * | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-08
| |\| | | |
| | * | | | Merge pull request #104 from ananyasen/integration-candidateValerio Virgillito2012-03-08
| | |\ \ \ \
| | | * | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-08
| | |/ / / /
| | * | | | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #103 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-07
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Image data fix on OpenJose Antonio Marquez2012-03-07
| | | * | | | Adding To-do comments for CDN stylesheetsJose Antonio Marquez2012-03-07
| | | * | | | Removing temp viewing of CDN stylesJose Antonio Marquez2012-03-07
| | |/ / / /
| * / / / / integrating v0.7 montage into ninjaValerio Virgillito2012-03-08
| |/ / / /
| * | | | Merge pull request #99 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-06
| |\ \ \ \
| | * \ \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| | |\ \ \ \
| | | * | | | Adding CDN support for URLs in linked CSSJose Antonio Marquez2012-03-06
| | | * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | | * | | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | | * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | | |\ \ \ \
| | * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| | |\| | | | |
| | | * | | | | Changing length of characters per line (pretty function)Jose Antonio Marquez2012-03-06
| | * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | |\| | | | |
| | | * | | | | CSS on CDN preview fixJose Antonio Marquez2012-03-05
| | * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | |\| | | | |
| | | * | | | | Temp support for CDN CSSJose Antonio Marquez2012-03-05
| | * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | |\| | | | |
| | | * | | | | Minor FixJose Antonio Marquez2012-03-05
| | * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | |\| | | | |
| | | * | | | | Fixed URL parsing issue on actual opened documentJose Antonio Marquez2012-03-05
| | * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | |\| | | | |
| | | * | | | | Resolved URL path issues in document and CSSJose Antonio Marquez2012-03-05
| | | * | | | | Setting up document level URL parsingJose Antonio Marquez2012-03-04
| | | * | | | | Improved CSS URL cleanedJose Antonio Marquez2012-03-04