aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal int...Jonathan Duran2012-03-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Timeline : Zoom Slider StylingKruti Shah2012-03-27
| | * | | | | | | | | | | | | | | | | | | Timeline : Breadcrumb FixKruti Shah2012-03-26
| | * | | | | | | | | | | | | | | | | | | Timeline : Adding Zoom SliderKruti Shah2012-03-26
| * | | | | | | | | | | | | | | | | | | | Timeline: Change dragIcon to be a data-uri.Jon Reid2012-03-26
| * | | | | | | | | | | | | | | | | | | | Timeline: Drag and Drop of layers.Jon Reid2012-03-26
| * | | | | | | | | | | | | | | | | | | | Remove console logsJonathan Duran2012-03-26
| * | | | | | | | | | | | | | | | | | | | Fix bug with track properties getting over writtenJonathan Duran2012-03-26
| |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Timeline: First integration of drag and drop of layers.Jon Reid2012-03-21
| | * | | | | | | | | | | | | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed conso...Jon Reid2012-03-21
| | * | | | | | | | | | | | | | | | | | | Fix: Change click handler to mousedown for better responsiveness in layer sel...Jon Reid2012-03-21
| | * | | | | | | | | | | | | | | | | | | Timeline: fix layer and style select problems.Jon Reid2012-03-20
| | * | | | | | | | | | | | | | | | | | | Timeline: Re-enable adding/removing styles to layers. New methods in Timeline...Jon Reid2012-03-19
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix layer order and selection on reopenJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOMJonathan Duran2012-03-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'Timeline-local' into Timeline-local-2Jon Reid2012-03-16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Timeline: Hook up data binding for changes on subproperties.Jon Reid2012-03-16
| | | * | | | | | | | | | | | | | | | | | | | | Timeline: remove comment.Jon Reid2012-03-15
| | | * | | | | | | | | | | | | | | | | | | | | Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
| | | * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch.Jon Reid2012-03-15
| * | | | | | | | | | | | | | | | | | | | | | | | Consolidate conversion functionsJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | | | | | | | | CleanupJonathan Duran2012-03-16
| |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Bug fix and cleanupJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | | | | | | | Fix layer select on selection changeJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | | | | | | | Start enforcing one element per layerJonathan Duran2012-03-16
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | added copyrightsAnanya Sen2012-05-01
* | | | | | | | | | | | | | | | | | | | | | | set up different activeline colors for different themesAnanya Sen2012-04-30
* | | | | | | | | | | | | | | | | | | | | | | added shortkeys for commenting and uncommentAnanya Sen2012-04-30
* | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1562 : override font-size for some themes to allow xoomingAnanya Sen2012-04-30
* | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1537 - don't show code hinting for ctrl+SAnanya Sen2012-04-30
* | | | | | | | | | | | | | | | | | | | | | | added key shortcuts' list dropdown in view option barAnanya Sen2012-04-27
* | | | | | | | | | | | | | | | | | | | | | | increasing z-indem of code hinting dropdown to appear above the disabled panelsAnanya Sen2012-04-26
* | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1534: don't show code hinting automatically, when word removed via ba...Ananya Sen2012-04-26
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #179 from joseeight/FileIOValerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | * | | | | | | | | | | | | | | | | | | | | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
| | | |_|_|_|_|_|