aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Adding url clean up to HTML on saveJose Antonio Marquez2012-02-23
|
* Merge pull request #18 from mencio/file-ioJose Antonio Marquez Russo2012-02-23
|\ | | | | File io - drawing the layout on open and make models
| * Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-ioValerio Virgillito2012-02-23
| |\ | |/ |/|
* | Temp fix for CSS url dataJose Antonio Marquez2012-02-22
| | | | | | | | Added a temp fix to parse out the app url that is placed in the CSS styles.
* | App mode checking fixJose Antonio Marquez2012-02-22
| | | | | | | | Added a way to check for the app to be served over http/https to prevent from adding webRequest events on app load.
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-22
|\ \
* | | Cleaning up and commenting CSS IOJose Antonio Marquez2012-02-22
| | |
* | | Logic to save <style> for a fileJose Antonio Marquez2012-02-22
| | | | | | | | | | | | Saving CSS in <style> tags, need to implement saving CSS to files.
* | | Merge pull request #16 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-22
|\ \ \ | | | | | | | | FileIO branch pull request
| * \ \ Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | fix bug when closing the first document tabAnanya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | edit by Eric G.: catch the error instead of doing the null check for the ↵Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stale element Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | added null check for matchedRules in styles-controller.js, to fix js error ↵Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on reopening and edited html document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | - file picker - select file on double clickAnanya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - check cloud availability before IO operations [open file, new file, Save, Save As]. Canceling operation if cloud was unavailable, as per team's agreement. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Removed css not needed in Ninja TemplateJose Antonio Marquez2012-02-22
| | | | |
* | | | | Merge pull request #15 from mencio/file-ioJose Antonio Marquez Russo2012-02-22
|\ \ \ \ \ | |_|/ / / |/| | | | moving the default folder location to the navigator to fix the ok button issue
* | | | | Improving temp CSS loading fixJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | | | | | | | | Adding logic to parse the entire DOM and insert the style tag loading the link element content directly above.
* | | | | Merge pull request #14 from mencio/file-ioJose Antonio Marquez Russo2012-02-21
|\ \ \ \ \ | | | | | | | | | | | | File io - Code cleanup and added default folder to the file new dialog.
* | | | | | Temp CSS fix (for file open)Jose Antonio Marquez2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | Implemented temporary work-around to the css-cross-origin issue on files loaded into Ninja. Fix is for open file, need to implement save functionality and integrate with CSS panel.
| | | | | * renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | * Enabling outline on open documents and parsing doom on open to create models.Valerio Virgillito2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | * Merge branch 'refs/heads/master' into file-ioValerio Virgillito2012-02-22
| | | |_|/| | | |/| |/
| | | | * Merge pull request #63 from dhg637/new-tool-iconsValerio Virgillito2012-02-22
| | | | |\ | | | | | | | | | | | | New tool icons
| | | | | * Removed Sass CacheArmen Kesablyan2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | | | * Removed Sass CacheArmen Kesablyan2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | | | * Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Merge pull request #62 from mayhewinator/WorkingBranchValerio Virgillito2012-02-22
| |_|_|/| | |/| | | | | | | | | | | Fix for bug that keeps Ninja from launching over HTTP....
| | | | * | Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ↵John Mayhew2012-02-22
| |_|_|/ / |/| | | | | | | | | | | | | | extension specific code in an if (window.chrome.app.isInstalled) check.
| | | | * Added Shape Panel IconsArmen Kesablyan2012-02-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | | * Tool Button FixesArmen Kesablyan2012-02-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | | * Tool IconsArmen Kesablyan2012-02-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | | * New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | | * Latest Montage Updates 0.6 FixesArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | | * Tool Icons : New layoutArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | moving the default folder location to the navigator to fix the ok button issueValerio Virgillito2012-02-22
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Adding some comments.Valerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Adding the default folder by default when opening a new file dialog.Valerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | Adding the default folder name in the new file dialog input field. Also some more cleanup. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | cleanup - using montage functions handlers and using the NJeventValerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | cleanup - Removing temporary div to render the popupsValerio Virgillito2012-02-21
|/ / / | | | | | | | | | | | | | | | We don't need to render the popup before opening them. Removing that hack. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | enabling nested selectionValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | formatting and removing un-used code from the stageValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Removing the log of the url requestsValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Removing the timeline selection code.Valerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/master' into nested-selectionValerio Virgillito2012-02-20
| |\ \ \
| * \ \ \ Merge branch 'nested-selection' of github.com:mencio/ninja-internal into ↵Valerio Virgillito2012-02-20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | nested-selection
| | * | | | formatting cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | formatting cleanupValerio Virgillito2012-02-20
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>