aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\
| * Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninjaValerio Virgillito2012-07-23
| |\
| | * CSS Panel - Remove data attribute to remove style tags from document.Eric Guzman2012-07-20
| | * Merge branch 'refs/heads/master' into fixes_7.1Eric Guzman2012-07-20
| | |\
| | * | CSS Panel - Fix updating when media changes, sheets are deleted.Eric Guzman2012-07-20
| | * | Style Sheets - Show dirty marker when editing media attributeEric Guzman2012-07-18
| | * | Styles Controller - Re-add dirty event. Add data- attribute to keep created s...Eric Guzman2012-07-17
* | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
|\| | |
| * | | Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
| |\ \ \
| | * | | If no material was defined, use Flat material when switching from 2d to WebGL...Nivesh Rajbhandari2012-07-20
| | | |/ | | |/|
* | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
|\| | |
| * | | fixing logical error which was a side-effect of SHA:819348eaf3ff6b4a8c38ecca7...Ananya Sen2012-07-20
| * | | copy/paste from external apps - removed unnecessary selection change to fix P...Ananya Sen2012-07-19
| |/ /
* | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
|\| |
| * | Squashed commit of the following:Nivesh Rajbhandari2012-07-19
* | | 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