| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Fix unassigned track element on document switch | Jonathan Duran | 2012-03-13 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline : Fixing deleting the layers and hash table and removing while ↵ | Jonathan Duran | 2012-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 TimelineUber | Jonathan Duran | 2012-03-12 |
| |\ | |||
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-09 |
| | |\ | |||
| | * | | Timeline: new enablePanel() method on TimelinePanel class. | Jon Reid | 2012-03-09 |
| | | | | |||
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-12 |
| |\ \ \ | |_|/ |/| | | |||
| | * | | Merge dhg637 DisabledState into master. | Valerio Virgillito | 2012-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, breadcrumb | Armen Kesablyan | 2012-03-12 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | reverting old pi data | Valerio Virgillito | 2012-03-09 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge pull request #106 from joseeight/Color | Valerio Virgillito | 2012-03-09 |
| | |\ \ | | | | | | | | | Color Gradient Fix | ||
| | | * | | Temp Gradient Fix | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | | | | | | | | | | | | Temporary fix for getting gradient mode. | ||
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-09 |
| | | |\ \ | | |/ / | |/| | | |||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-09 |
| | |\ \ \ | |||
| | | * \ \ | Merge pull request #102 from dhg637/Panels | Valerio Virgillito | 2012-03-08 |
| | | |\ \ \ | | | | | | | | | | | | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist | ||
| | | | * | | | Disabled State is now darker | Armen Kesablyan | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Z-Index issue of disabled state with file open dialog | Armen Kesablyan | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Disabled state for panels | Armen Kesablyan | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Reordering and resizing now works | Armen Kesablyan | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Fixed: Collapsed panels would collapse panels below | Armen Kesablyan | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Fixed Collapsing and resizing window with panels | Armen Kesablyan | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-08 |
| | |\| | | | | |||
| | | * | | | | Merge pull request #104 from ananyasen/integration-candidate | Valerio Virgillito | 2012-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 Sen | 2012-03-08 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | Merge pull request #100 from imix23ways/TimelineUber | Valerio Virgillito | 2012-03-08 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Timeline uber | ||
| | | * \ \ \ \ | Merge pull request #103 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-03-07 |
| | | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | File I/O Fixed | ||
| | | | * | | | | Image data fix on Open | Jose Antonio Marquez | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug with data-uris not opening correctly. | ||
| | | | * | | | | Adding To-do comments for CDN stylesheets | Jose Antonio Marquez | 2012-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 styles | Jose Antonio Marquez | 2012-03-07 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | It's not done correctly, we really need the proxy for this. | ||
| | * / / / / | integrating v0.7 montage into ninja | Valerio Virgillito | 2012-03-08 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge pull request #99 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-03-06 |
| | |\ \ \ \ | | | | | | | | | | | | | File IO Updates | ||
| | | * \ \ \ | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-06 |
| | | |\ \ \ \ | |||
| | | | * | | | | Adding CDN support for URLs in linked CSS | Jose Antonio Marquez | 2012-03-06 |
| | | | | | | | | |||
| | | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-06 |
| | | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js | ||
| | | | * | | | | Fixing WebGL not available bug | Jose Antonio Marquez | 2012-03-06 |
| | | | | | | | | |||
| | | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-06 |
| | | | |\ \ \ \ | |||
| | | * | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-06 |
| | | |\| | | | | | |||
| | | | * | | | | | Changing length of characters per line (pretty function) | Jose Antonio Marquez | 2012-03-06 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | |\| | | | | | |||
| | | | * | | | | | CSS on CDN preview fix | Jose Antonio Marquez | 2012-03-05 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | |\| | | | | | |||
| | | | * | | | | | Temp support for CDN CSS | Jose Antonio Marquez | 2012-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-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | |\| | | | | | |||
| | | | * | | | | | Minor Fix | Jose Antonio Marquez | 2012-03-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to comment out the return, therefore preventing to save. | ||
| | | * | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | |\| | | | | | |||
| | | | * | | | | | Fixed URL parsing issue on actual opened document | Jose Antonio Marquez | 2012-03-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to implement CSS loaded from a CDN, currently this would break Ninja. | ||
| | | * | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-05 |
| | | |\| | | | | | |||
| | | | * | | | | | Resolved URL path issues in document and CSS | Jose Antonio Marquez | 2012-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 parsing | Jose Antonio Marquez | 2012-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. | ||
| | | | * | | | | | Improved CSS URL cleaned | Jose Antonio Marquez | 2012-03-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to accommodate any URLs in a CSS file inside the opened document root. Need to add logic for handling linked references above the root. Also need to reformat into a reusable method as it might be needed besides CSS. | ||
| | | | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-02 |
| | | | |\ \ \ \ \ | |||