aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-18
|\
| * Merge branch 'menu-fixes' of https://github.com/mencio/ninjaValerio Virgillito2012-07-18
| |\
| | * Fixed some issues with the menu-fixesValerio Virgillito2012-07-18
| * | perform clipboard operations only if selection tool is selected since other t...Ananya Sen2012-07-18
| |/
* / New: Added switching view functionality to document UIJose Antonio Marquez2012-07-16
|/
* BSD LicenseKris Kowal2012-07-09
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\
| * Remove trailing spacesKris Kowal2012-07-06
| * Expand tabsKris Kowal2012-07-06
* | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\|
| * Update copyright boilerplateKris Kowal2012-07-06
* | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
|/
* Merge pull request #363 from ericguzman/stylesControllerPatch_6_29Valerio Virgillito2012-06-29
|\
| * Another null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| * Null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| * Styles Controller - getMatchingRules - Add forgotten return statementEric Guzman2012-06-29
| * Styles controller - adding check for attached element in getMatchedCSSRulesEric Guzman2012-06-29
| * Styles Controller Patch to ignore unfound rules from getMatchedCSSRulesEric Guzman2012-06-29
* | Merge branch 'refs/heads/ninja-internal' into ColorGradientFixNivesh Rajbhandari2012-06-29
|\ \
| * \ Merge pull request #350 from ericguzman/StylesController_6_27Valerio Virgillito2012-06-29
| |\ \ | | |/ | |/|
| | * Styles Controller - removing console logsEric Guzman2012-06-29
| | * Styles Controller - Fix specificity comparison in hasGreaterSpecificity()Eric Guzman2012-06-27
| * | Merge pull request #361 from ericguzman/PresetsUpdate_6_28Valerio Virgillito2012-06-28
| |\ \
| | * | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
| * | | Merge pull request #355 from dhg637/GIO_binding-viewValerio Virgillito2012-06-28
| |\ \ \ | | |/ / | |/| |
| | * | Binding View - Multi document bug : cleared object bindings when current docu...Armen Kesablyan2012-06-28
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bin...Eric Guzman2012-06-27
| | |\|
| | * | Binding HUD - Show promoted PI properties at top of listEric Guzman2012-06-27
* | | | Need to special case linear gradient, radial gradient and uber materials when...Nivesh Rajbhandari2012-06-29
* | | | Fixed not being able to draw linear and radial gradients. Also fixed IKNINJA-...Nivesh Rajbhandari2012-06-28
|/ / /
* | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
|\ \ \ | | |/ | |/|
| * | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-27
| |\|
| * | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
| |\ \
| * | | refactored to move bindings to templateAnanya Sen2012-06-26
| * | | fixed code hinting and autocompletion bugAnanya Sen2012-06-26
* | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
|\ \ \ \ | | |_|/ | |/| |
| * | | Styles Controller - Remove debuggerEric Guzman2012-06-26
| * | | Styles Controller - Chrome 20 FixEric Guzman2012-06-26
| | |/ | |/|
* | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-26
|\| |
| * | Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ \ | | |/ | |/|
| | * Binding View - Objects Replace existing source Object if it existsArmen Kesablyan2012-06-25
| | * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| | |\
| | * | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | * | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| | |\ \
| | * \ \ Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\ \ \
| | * | | | Objects Tray - Filter list of components for those without visual representationEric Guzman2012-06-20
| | * | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-19
| | |\ \ \ \
| | | * | | | Binding View - Mouse Over Element Pop up HudArmen Kesablyan2012-06-19
| | * | | | | Objects Tray - Show only "off stage" objectsEric Guzman2012-06-19
| | |/ / / /
| | * | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| | |\ \ \ \