| Commit message (Collapse) | Author | Age |
|\ |
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
commit 302ae3c1812086d976eb67c9cf693c43205f3904
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Thu Feb 16 11:13:05 2012 -0800
hide the rulers when no document is open
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit 2e766c9eaa98fa20f311b3eb2f892a1a240e90cf
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Thu Feb 16 06:43:33 2012 -0800
file picker:
Enable ok if user double clicks folder and enter it.
Validate path if user enter it manually in addressbar.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit 4937b39fb0cf542f57cdadc7d1e2ed9798f7ef87
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 16:09:14 2012 -0800
fixes to document tabbing
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit 56d2a8d11a73cd04c7f1bc20d1ded52b9c1242f2
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 10:54:38 2012 -0800
Revert "Revert "Creating NinjaTemplate to HTML function""
This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit e2b97c951a9a5a0c4ff831d44fdd82177cbd82ad
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 10:54:14 2012 -0800
Revert "Revert "Reverting text/html document classes and setting up MVC folder structure""
This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit aead95ce4b2571356701229567bfde73d54bed93
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 10:53:55 2012 -0800
Revert "Revert "Cleaning up""
This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit a8d1a2e1f4f4ab7b9298bfbd1b49731785c79c3a
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 10:52:56 2012 -0800
Revert "Revert "Merging TextDocument into BaseDocument""
This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit e864dc319805e259b7ae39a9d4d96fac552a1f87
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 10:52:38 2012 -0800
Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build"
This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 10:06:42 2012 -0800
merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit b8782f2e3dd106accbb0160a98e6b498f26752ea
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 10:01:59 2012 -0800
Revert "Merging TextDocument into BaseDocument"
This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed.
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 09:58:37 2012 -0800
Revert "Cleaning up"
This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da.
Conflicts:
js/controllers/document-controller.js
js/io/document/text-document.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit 9048cd50bf5e0a418d1d95498bb593961f72db36
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 09:51:12 2012 -0800
Revert "Reverting text/html document classes and setting up MVC folder structure"
This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
commit 2e308be9bec5e06d81b2905b65005a232f0a190d
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date: Wed Feb 15 09:50:20 2012 -0800
Revert "Creating NinjaTemplate to HTML function"
This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/document/html-document.js
|
| | | |\
| | | | |
| | | | |
| | | | | |
integration
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
folder structure""
This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
structure"
This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |/ /
| | |
| | |
| | | |
Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers.
|
| |\ \ |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/ninja.reel/ninja.html
js/stage/stage.reel/stage.html
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
scss/imports/scss/_Stage.scss
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |_|_|_|/
|/| | | |
| | | | |
| | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
popups.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
feature-branch
|
|\ \ \
| | | |
| | | |
| | | | |
feature-branch
|
| | |/
| |/|
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 35ad4d6d2fac4432046141c63c0209cf3d00be5c
Merge: 76377d5 88e80d5
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 20:40:50 2012 -0800
Merge pull request #24 from mencio/pi_bugs
Pi bugs
commit 88e80d512bdd125e6d604541c291f699bf5df564
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 17:49:02 2012 -0800
Correcting the PI lock for height which had a bug in the original pull request.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 76377d5378c7c23fd3c267fcab91aba39b30c555
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 17:24:46 2012 -0800
Updating the sass file.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 4ecdc52d3beb3224048726a373d454e1607ba10b
Merge: 0537f8f 3a8dc41
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 17:20:36 2012 -0800
Merge pull request #27 from ericguzman/TreeComponents
Tree Components - css fixes
commit 3a8dc4195a166478695bb286493f83258a4be49b
Author: Eric Guzman <ericg@motorola.com>
Date: Wed Feb 8 16:55:10 2012 -0800
Tree Components - css fixes
commit 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b
Merge: ab12be4 b6bc8b0
Author: mayhewinator <jcmayhew@gmail.com>
Date: Wed Feb 8 14:46:17 2012 -0800
Merge pull request #25 from mayhewinator/WorkingBranch
Adding assets required to be a packaged chrome app
commit b6bc8b0bb91382991e6e43ad341304c813124882
Merge: c7b5edf ab12be4
Author: John Mayhew <vpn847@motorola.com>
Date: Wed Feb 8 14:39:16 2012 -0800
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
commit c7b5edf0351d678d26b17eb5e2f995a140e209bb
Author: John Mayhew <vpn847@motorola.com>
Date: Wed Feb 8 14:38:25 2012 -0800
Added manifest.json, and image file required for being a packaged chrome application. Removed the old versions.json and updated the main page to detect if it is running as a chrome app and retrieve the version info from the chrome.app object. If the app is running hosted, the code will use an XHR to load the manifest.json and retrieve the version number from it directly.
commit 26c470085263ab40a30fc8095bfe3763df5be981
Merge: cd997c1 ab12be4
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 14:34:01 2012 -0800
Merge branch 'refs/heads/master' into pi_bugs
commit cd997c18bdb346ff44919880239e705df80079ea
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 14:30:56 2012 -0800
Fix for the PI Lock button.
Fixing the following JIRA bugs:
111
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit ab12be4e9a0d9fee4450795077b0107983b5682e
Merge: 10cdeb5 2e58595
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 14:03:36 2012 -0800
Merge pull request #23 from joseeight/SCSS
Changing _scss folder to scss
commit 2e58595d5c58ad9937bfc4f85ba8894970d4719f
Author: Jose Antonio Marquez <kgq387@motorola.com>
Date: Wed Feb 8 13:56:54 2012 -0800
adding new scss folder
commit 7afa8f3fb2f2cede0b227a00ccc2b84267278db6
Author: Jose Antonio Marquez <kgq387@motorola.com>
Date: Wed Feb 8 13:54:42 2012 -0800
delete _scss directory
commit 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2
Merge: 24f9717 9a404b8
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 11:33:42 2012 -0800
Merge pull request #21 from mencio/pi_bugs
Pi bugs fixes for 964, 616, 1084
commit 24f9717f2714f0497382436c4602736283247cf1
Merge: 763910b 9154cff
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 11:33:22 2012 -0800
Merge pull request #22 from e |