ninja - [ARCHIVED 2012] An HTML5 web app content authoring tool

	Commit message (Collapse)	Author	Age
*	Fixed Collapsing and resizing window with panels	Armen Kesablyan	2012-03-07
\| \| \| \|	Signed-off-by: Armen Kesablyan <armen@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
* \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Valerio Virgillito	2012-03-06
\|\ \ \
\| * \ \	Merge pull request #98 from mencio/panels	Valerio Virgillito	2012-03-06
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Panels - removing repetition from the panel container and using a static list of panels.
\| \| * \ \	Merge branch 'refs/heads/master' into panels	Valerio Virgillito	2012-03-06
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Merge branch 'refs/heads/master' into panels	Valerio Virgillito	2012-03-06
\| \| \|\ \ \
\| \| * \| \| \|	Adding drag and drop	Valerio Virgillito	2012-03-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \|	remove console log	Valerio Virgillito	2012-03-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \|	removing repetition from the panel container and using a static list of panels.	Valerio Virgillito	2012-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 Master	Valerio Virgillito	2012-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 bug	Jose Antonio Marquez	2012-03-06
\| \|/ / / \|/\| \| \|
\| \| \| *	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
\| \| \| \|\ \| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Squashed commit of preload-fix into Master	Valerio Virgillito	2012-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>
\| * \|	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
\| \| \|\ \| \|_\|/ \|/\| \|
\| * \|	Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-03-02
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #93 from imix23ways/Timeline	Valerio Virgillito	2012-03-02
\|\ \ \ \| \| \| \| \| \| \| \|	Timeline: Critical bug fixes
\| * \| \|	Timeline Fix timing function	Jonathan Duran	2012-03-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \|	Timeline: Fix for animation iteration count	Jonathan Duran	2012-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 Timeline	Jonathan Duran	2012-03-01
\| \|\ \ \
\| * \ \ \	Merge branch 'Timeline-main' into Timeline-local	Jon Reid	2012-03-01
\| \|\ \ \ \
\| \| * \| \| \|	Set doc dirty flag when adding tweens or modifying animations	Jonathan Duran	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \|	Update master track on duration change instead of tween add.	Jonathan Duran	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds support for updating the master track duration on file open as well as when adding tweens to already opened files. Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \|	Timeline: Track Duration Fix	Jonathan Duran	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \|	Timeline: efficiency improvements to collapser. Document switching.	Jon Reid	2012-03-01
\| \| \| \| \| \|
\| * \| \| \| \|	Timeline: Merge. Set collapser heights.	Jon Reid	2012-03-01
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'Timeline-main' into Timeline-newdoc	Jon Reid	2012-03-01
\| \|\\| \| \| \|
\| \| * \| \| \|	Merge branch 'refs/heads/NINJAmaster' into Timeline	Jonathan Duran	2012-03-01
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Squashed commit of the following:	Jonathan Duran	2012-02-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|