aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
|\
| * CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| |
* | CSS Updates - Update the shorthand map to include other orderEric Guzman2012-03-12
|/
* clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* CSSPanel - fix code indentationEric Guzman2012-02-16
|
* CSS Panel - Add Resizer to sub panelsEric Guzman2012-02-16
|
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\ | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Armen Kesablyan2012-02-07
| |\ | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
| * | Initial Text Tool ImplementationArmen Kesablyan2012-02-02
| | | | | | | | | | | | Has rich-text-editor in place need to place with finalized version when complete
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-30
|\| | | | | | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss
| * | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| |/
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>