aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
|\ | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@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
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
| |\ \ \
| | * \ \ Merge pull request #98 from mencio/panelsValerio Virgillito2012-03-06
| | |\ \ \ | | | | | | | | | | | | Panels - removing repetition from the panel container and using a static list of panels.
| | | * \ \ Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | |\ \ \
| | | * | | | Adding drag and dropValerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | remove console logValerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | / / / Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | |/ / / | |/| | |
| | | * | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| | | |\ \
| | | * \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\ \ \
| | | * \ \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-02
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Formatting fixesJose Antonio Marquez2012-03-02
| | | | | | | | | | |
* | | | | | | | | | | removed unnecessary console logsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | updated file picker image iconsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | - detect document style edit [with Eric's input for styles-controller.js]Ananya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - integrated save as Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | IKNINJA-1256 fix - needed to convert String object to stringAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | IKNINJA-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | fixed picker address dropdown to backtrace till the logical driveAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | IKNINJA-1207: added check for design view to fix js errorAnanya Sen2012-03-06
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | | | | | | | | |
* | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
|\| | | | | | | | | | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | / Changing length of characters per line (pretty function)Jose Antonio Marquez2012-03-06
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CSS on CDN preview fixJose 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.
* | | | | Minor FixJose Antonio Marquez2012-03-05
| |_|_|/ |/| | | | | | | | | | | Forgot to comment out the return, therefore preventing to save.
* | | | 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.
* | | 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.
* | | Improved CSS URL cleanedJose Antonio Marquez2012-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 FileIOJose Antonio Marquez2012-03-02
|\| | | |/ |/|
| * Merge pull request #93 from imix23ways/TimelineValerio Virgillito2012-03-02
| |\ | | | | | | Timeline: Critical bug fixes
| | * Timeline Fix timing functionJonathan Duran2012-03-02
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | Add default webkit css properties to allow animations with integer iteration counts. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| | |\
| | * \