| Commit message (Collapse) | Author | Age |
|\ |
|
| |
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\ |
|
| | |\
| | | |
| | | |
| | | | |
https://github.com/mencio/ninja-internal into integration-candidate
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
panels are in
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |\ |
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- Fixed the splitters
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
https://github.com/joseeight/ninja-internal into integration-candidate
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Also cleaned up URL getter for app in cleaning string code.
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This is a possible set of methods to be used to prettify code. Added temporarily until approved.
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | | |
FileIO branch pull request
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
- minor bug fixes
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
- added switchDocument event for timeline
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | |\ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
a document and while switching documents
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |\ \ \ \ \ \ \
| | | | | |_|_|_|_|/
| | | | |/| | | | | |
|
| | | | |_|_|/ / /
| | | |/| | | | |
| | | | | | | | |
| | | | | | | | | |
This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated.
|
| | | |\ \ \ \ \ \
| | | | | |_|_|_|/
| | | | |/| | | | |
|
| | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | | |
Integration
|
| | | | |\ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | |\ \ \ \ \ \ \ |
|
| | | | |\ \ \ \ \ \ \ \
| | | | | | |_|_|_|_|_|/
| | | | | |/| | | | | |
| | | | | | | | | | | | |
integration
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
integration
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|/ / / / /
| | | | |/| | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
Conflicts:
js/controllers/document-controller.js
|
| | | | |_|_|_|_|_|_|_|_|/
| | |