aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Optimize Tween component needsDraw callsJonathan Duran2012-03-14
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Squashed commit of the following:Jonathan Duran2012-03-14
| | | | | | merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix unassigned track element on document switchJonathan Duran2012-03-13
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline : Fixing deleting the layers and hash table and removing while ↵Jonathan Duran2012-03-12
| | | | | | | loops replacing with for loops Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* 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, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | reverting old pi dataValerio Virgillito2012-03-09
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #106 from joseeight/ColorValerio Virgillito2012-03-09
| |\ \ | | | | | | | | Color Gradient Fix
| | * | Temp Gradient FixJose Antonio Marquez2012-03-09
| | | | | | | | | | | | | | | | Temporary fix for getting gradient mode.
| | * | 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
| | |\ \ \ | | | | | | | | | | | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist
| | | * | | Disabled State is now darkerArmen Kesablyan2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Z-Index issue of disabled state with file open dialogArmen Kesablyan2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Disabled state for panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Reordering and resizing now worksArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | 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 a video
| | | * | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| | |\ \ \ \ | | | | | | | | | | | | | | Timeline uber
| | * \ \ \ \ Merge pull request #103 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-07
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | File I/O Fixed
| | | * | | | Image data fix on OpenJose Antonio Marquez2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug with data-uris not opening correctly.
| | | * | | | Adding To-do comments for CDN stylesheetsJose Antonio Marquez2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed inserting CDN styles into head as it was proper because the hierarchy would be lost, and there is no current fast-alternative to achieve a preview.
| | | * | | | Removing temp viewing of CDN stylesJose Antonio Marquez2012-03-07
| | |/ / / / | | | | | | | | | | | | | | | | | | It's not done correctly, we really need the proxy for this.
| * / / / / integrating v0.7 montage into ninjaValerio Virgillito2012-03-08
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #99 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-06
| |\ \ \ \ | | | | | | | | | | | | File IO Updates
| | * \ \ \ 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
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a temp fix for allow the viewing of CSS on a CDN, however, the styles should not be editable, but will allow for accurate preview of styles. Need to coordinate with the CSS panel and styles manager to insert styles in the appropriate files or tags that have write permission.
| | * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | |\| | | | |
| | | * | | | | Minor FixJose Antonio Marquez2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to comment out the return, therefore preventing to save.
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to implement CSS loaded from a CDN, currently this would break Ninja.
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to allow for files opened and assets linked in any order all under the cloud server root.
| | | * | | | | Setting up document level URL parsingJose Antonio Marquez2012-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set up logic to parse URLs document level (href, src, url) still need to add functionality to return proper value, currently only detecting current value.